--- e2_cl_option.c	2006-06-11 12:02:01.000000000 -0400
+++ e2_cl_option.c	2006-08-08 01:30:37.000000000 -0400
@@ -79,7 +79,12 @@
 	e2_cl_options.pane1_path = NULL;
 	e2_cl_options.pane2_path = NULL;
+#ifdef FILES_UTF8ONLY
+	e2_cl_options.config_dir = g_build_filename (g_get_user_config_dir (), BINNAME, NULL);
+	gchar *freeme;
+#else
 	gchar *freeme = e2_utf8_filename_from_locale (g_get_user_config_dir ());
 	e2_cl_options.config_dir = g_build_filename (freeme, BINNAME, NULL);
 	g_free (freeme);
+#endif
 	const gchar **encodings;
 	g_get_filename_charsets (&encodings);
@@ -100,8 +105,11 @@
 	e2_cl_options.suppress_gtk_output = (DEBUG_LEVEL > 4) ? FALSE : TRUE;
 	e2_cl_options.ignore_problems = FALSE;
+#ifdef FILES_UTF8ONLY
+	e2_cl_options.trash_dir = g_build_filename (g_get_user_data_dir (), "Trash", "files", NULL);
+#else
 	freeme = e2_utf8_filename_from_locale (g_get_user_data_dir ());
 	e2_cl_options.trash_dir = g_build_filename (freeme, "Trash", "files", NULL);
 	g_free (freeme);
-
+#endif
 	gint c, d = 0;
 	while (1)
@@ -158,5 +166,9 @@
 					g_free (e2_cl_options.config_dir);
 					if (g_path_is_absolute (optarg))
+#ifdef FILES_UTF8ONLY
+						convert = g_strdup (optarg);
+#else
 						convert = optarg;
+#endif
 					else
 					{
@@ -165,10 +177,14 @@
 						g_free (freeme);
 					}
+#ifdef FILES_UTF8ONLY
+					e2_cl_options.config_dir = convert;
+#else
 					e2_cl_options.config_dir = e2_utf8_filename_from_locale (convert);
 					if (convert != optarg)
 						g_free (convert);
+#endif
 					printd (DEBUG, "setting config directory '%s'", e2_cl_options.config_dir);
 					break;
-	#ifdef DEBUG_MESSAGES
+#ifdef DEBUG_MESSAGES
 				case 'd':
 					printd (DEBUG, "setting debug level '%s'", optarg);
@@ -185,5 +201,5 @@
 					}
 					break;
-	#endif
+#endif
 				case 'e':
 					g_free (e2_cl_options.encoding);
@@ -205,5 +221,9 @@
 					g_free (e2_cl_options.trash_dir);
 					if (g_path_is_absolute (optarg))
+#ifdef FILES_UTF8ONLY
+						convert = g_strdup (optarg);
+#else
 						convert = optarg;
+#endif
 					else
 					{
@@ -212,7 +232,11 @@
 						g_free (freeme);
 					}
+#ifdef FILES_UTF8ONLY
+					e2_cl_options.trash_dir = convert;
+#else
 					e2_cl_options.trash_dir = e2_utf8_filename_from_locale (convert);
 					if (convert != optarg)
 						g_free (convert);
+#endif
 					printd (DEBUG, "setting trash directory '%s'", e2_cl_options.trash_dir);
 					break;