diff options
| author | Tor Lillqvist <tml@iki.fi> | 2005-01-01 03:04:17 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-01-01 03:04:17 +0000 |
| commit | 75ae663dd8f6e1b506b6209c6b63a50463626abc (patch) | |
| tree | c6724e089df16f0e27edf1d6ee281384c90dc760 /gtk/gtkrc.c | |
| parent | eb163387a2e92573b29bc1c9f8f2006c71e4bf78 (diff) | |
| download | gtk+-75ae663dd8f6e1b506b6209c6b63a50463626abc.tar.gz | |
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().
Diffstat (limited to 'gtk/gtkrc.c')
| -rw-r--r-- | gtk/gtkrc.c | 39 |
1 files changed, 0 insertions, 39 deletions
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 } /** |