gtk/gtkmodules.c (get_module_path) With g_getenv() now returning UTF-8 on

2005-01-01  Tor Lillqvist  <tml@iki.fi>

	* gtk/gtkmodules.c (get_module_path)
	* gtk/gtkrc.c (gtk_rc_make_default_dir, gtk_rc_get_im_module_file,
	gtk_rc_get_theme_dir, gtk_rc_add_initial_default_files): With
	g_getenv() now returning UTF-8 on Win32, no need to call
	g_locale_to_utf8().

6 files changed, 32 insertions, 53 deletions

diff --git a/ChangeLog b/ChangeLog
index 306bbbbe1e..c0d9171581 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-01  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/gtkmodules.c (get_module_path)
+	* gtk/gtkrc.c (gtk_rc_make_default_dir, gtk_rc_get_im_module_file,
+	gtk_rc_get_theme_dir, gtk_rc_add_initial_default_files): With
+	g_getenv() now returning UTF-8 on Win32, no need to call
+	g_locale_to_utf8().
+
 2004-12-31  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkkeyhash.c (_gtk_key_hash_lookup_keyval) 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 306bbbbe1e..c0d9171581 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2005-01-01  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/gtkmodules.c (get_module_path)
+	* gtk/gtkrc.c (gtk_rc_make_default_dir, gtk_rc_get_im_module_file,
+	gtk_rc_get_theme_dir, gtk_rc_add_initial_default_files): With
+	g_getenv() now returning UTF-8 on Win32, no need to call
+	g_locale_to_utf8().
+
 2004-12-31  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkkeyhash.c (_gtk_key_hash_lookup_keyval) 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 306bbbbe1e..c0d9171581 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2005-01-01  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/gtkmodules.c (get_module_path)
+	* gtk/gtkrc.c (gtk_rc_make_default_dir, gtk_rc_get_im_module_file,
+	gtk_rc_get_theme_dir, gtk_rc_add_initial_default_files): With
+	g_getenv() now returning UTF-8 on Win32, no need to call
+	g_locale_to_utf8().
+
 2004-12-31  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkkeyhash.c (_gtk_key_hash_lookup_keyval) 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 306bbbbe1e..c0d9171581 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2005-01-01  Tor Lillqvist  <tml@iki.fi>
+
+	* gtk/gtkmodules.c (get_module_path)
+	* gtk/gtkrc.c (gtk_rc_make_default_dir, gtk_rc_get_im_module_file,
+	gtk_rc_get_theme_dir, gtk_rc_add_initial_default_files): With
+	g_getenv() now returning UTF-8 on Win32, no need to call
+	g_locale_to_utf8().
+
 2004-12-31  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkkeyhash.c (_gtk_key_hash_lookup_keyval) 
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 2e73f1bfed..0bec50a574 100644
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -70,13 +70,6 @@ get_module_path (void)
   module_path_env = g_getenv ("GTK_PATH");
   exe_prefix = g_getenv ("GTK_EXE_PREFIX");
 
-#ifdef G_OS_WIN32
-  if (module_path_env)
-    module_path_env = g_locale_to_utf8 (module_path_env, -1, NULL, NULL, NULL);
-  if (exe_prefix)
-    exe_prefix =  g_locale_to_utf8 (exe_prefix, -1, NULL, NULL, NULL);
-#endif
-
   if (exe_prefix)
     default_dir = g_build_filename (exe_prefix, "lib", "gtk-2.0", NULL);
   else
@@ -95,13 +88,6 @@ get_module_path (void)
     module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
 				default_dir, NULL);
 
-#ifdef G_OS_WIN32
-  if (module_path_env)
-    g_free ((void *) module_path_env);
-  if (exe_prefix)
-    g_free ((void *) exe_prefix);
-#endif
-
   g_free (home_gtk_dir);
   g_free (default_dir);
 
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index ccbe5b4cba..49f05b9f7f 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -311,20 +311,11 @@ gtk_rc_make_default_dir (const gchar *type)
 
   var = g_getenv ("GTK_EXE_PREFIX");
 
-#ifdef G_OS_WIN32
-  if (var)
-    var = g_locale_to_utf8 (var, -1, NULL, NULL, NULL);
-#endif
-
   if (var)
     path = g_build_filename (var, "lib", "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
   else
     path = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
 
-#ifdef G_OS_WIN32
-  g_free ((void *) var);
-#endif
-
   return path;
 }
 
@@ -364,11 +355,6 @@ gtk_rc_get_im_module_file (void)
   const gchar *var = g_getenv ("GTK_IM_MODULE_FILE");
   gchar *result = NULL;
 
-#ifdef G_OS_WIN32
-  if (var)
-    var = g_locale_to_utf8 (var, -1, NULL, NULL, NULL);
-#endif
-
   if (var)
     result = g_strdup (var);
 
@@ -380,11 +366,6 @@ gtk_rc_get_im_module_file (void)
 	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
     }
 
-#ifdef G_OS_WIN32
-  if (var)
-    g_free ((void *) var);
-#endif
-
   return result;
 }
 
@@ -396,21 +377,11 @@ gtk_rc_get_theme_dir (void)
 
   var = g_getenv ("GTK_DATA_PREFIX");
 
-#ifdef G_OS_WIN32
-  if (var)
-    var = g_locale_to_utf8 (var, -1, NULL, NULL, NULL);
-#endif
-
   if (var)
     path = g_build_filename (var, "share", "themes", NULL);
   else
     path = g_build_filename (GTK_DATA_PREFIX, "share", "themes", NULL);
 
-#ifdef G_OS_WIN32
-  if (var)
-    g_free ((void *) var);
-#endif
-
   return path;
 }
 
@@ -447,11 +418,6 @@ gtk_rc_add_initial_default_files (void)
 
   var = g_getenv ("GTK2_RC_FILES");
 
-#ifdef G_OS_WIN32
-  if (var)
-    var = g_locale_to_utf8 (var, -1, NULL, NULL, NULL);
-#endif
-
   if (var)
     {
       files = g_strsplit (var, G_SEARCHPATH_SEPARATOR_S, 128);
@@ -479,11 +445,6 @@ gtk_rc_add_initial_default_files (void)
 	  g_free (str);
 	}
     }
-
-#ifdef G_OS_WIN32
-  if (var)
-    g_free ((void *) var);
-#endif
 }
 
 /**