--- a/cmd.c	Sun Feb 10 19:01:35 2013 +0200
+++ b/cmd.c	Sun Feb 10 19:25:41 2013 +0200
@@ -246,7 +246,7 @@
 			
 			close (fd[0]);
 			dup2 (fd[1], STDOUT_FILENO);
-			if (settings_opt_get_int ("cmd_redirect_stderr"))
+			if (settings_opt_get_int ( OPT_CMD_REDIRECT_STDERR ))
 				dup2 (fd[1], STDERR_FILENO);
 			else
 				close (STDERR_FILENO);
@@ -254,7 +254,7 @@
 			close (fd[1]);
 
 			{
-				const char *shell = settings_opt_get ("cmd_shell");
+				const char *shell = settings_opt_get ( OPT_CMD_SHELL );
 				if (!shell)
 					shell = getenv ("SHELL");
 				if (!shell)
@@ -294,8 +294,8 @@
 		{
 			cmd_cb_t *cb = g_slice_new (cmd_cb_t);
 
-			if (settings_opt_get_int ("cmd_header")) {
-				if (settings_opt_get_int ("cmd_header_inline") || is_room (jid)) {
+			if (settings_opt_get_int ( OPT_CMD_HEADER )) {
+				if (settings_opt_get_int ( OPT_CMD_HEADER_INLINE ) || is_room (jid)) {
 					gchar *mesg = g_strdup_printf ("$ %s", arg);
 					gchar *utf  = to_utf8 (mesg);
 					g_free (mesg);