callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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().
This commit is contained in:
Tor Lillqvist
2005-01-01 03:04:17 +00:00
committed by Tor Lillqvist
parent eb163387a2
commit 75ae663dd8
6 changed files with 32 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> 2004-12-31 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkkeyhash.c (_gtk_key_hash_lookup_keyval) * gtk/gtkkeyhash.c (_gtk_key_hash_lookup_keyval)

8
ChangeLog.pre-2-10
View File

@ -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> 2004-12-31 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkkeyhash.c (_gtk_key_hash_lookup_keyval) * gtk/gtkkeyhash.c (_gtk_key_hash_lookup_keyval)

8
ChangeLog.pre-2-6
View File

@ -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> 2004-12-31 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkkeyhash.c (_gtk_key_hash_lookup_keyval) * gtk/gtkkeyhash.c (_gtk_key_hash_lookup_keyval)

8
ChangeLog.pre-2-8
View File

@ -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> 2004-12-31 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkkeyhash.c (_gtk_key_hash_lookup_keyval) * gtk/gtkkeyhash.c (_gtk_key_hash_lookup_keyval)

14
gtk/gtkmodules.c
View File

@ -70,13 +70,6 @@ get_module_path (void)
module_path_env = g_getenv ("GTK_PATH"); module_path_env = g_getenv ("GTK_PATH");
exe_prefix = g_getenv ("GTK_EXE_PREFIX"); 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) if (exe_prefix)
default_dir = g_build_filename (exe_prefix, "lib", "gtk-2.0", NULL); default_dir = g_build_filename (exe_prefix, "lib", "gtk-2.0", NULL);
else else
@ -95,13 +88,6 @@ get_module_path (void)
module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S, module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
default_dir, NULL); 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 (home_gtk_dir);
g_free (default_dir); g_free (default_dir);

39
gtk/gtkrc.c
View File

@ -311,20 +311,11 @@ gtk_rc_make_default_dir (const gchar *type)
var = g_getenv ("GTK_EXE_PREFIX"); 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) if (var)
path = g_build_filename (var, "lib", "gtk-2.0", GTK_BINARY_VERSION, type, NULL); path = g_build_filename (var, "lib", "gtk-2.0", GTK_BINARY_VERSION, type, NULL);
else else
path = g_build_filename (GTK_LIBDIR, "gtk-2.0", GTK_BINARY_VERSION, type, NULL); 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; return path;
} }
@ -364,11 +355,6 @@ gtk_rc_get_im_module_file (void)
const gchar *var = g_getenv ("GTK_IM_MODULE_FILE"); const gchar *var = g_getenv ("GTK_IM_MODULE_FILE");
gchar *result = NULL; gchar *result = NULL;
#ifdef G_OS_WIN32
if (var)
var = g_locale_to_utf8 (var, -1, NULL, NULL, NULL);
#endif
if (var) if (var)
result = g_strdup (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); 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; return result;
} }
@ -396,21 +377,11 @@ gtk_rc_get_theme_dir (void)
var = g_getenv ("GTK_DATA_PREFIX"); 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) if (var)
path = g_build_filename (var, "share", "themes", NULL); path = g_build_filename (var, "share", "themes", NULL);
else else
path = g_build_filename (GTK_DATA_PREFIX, "share", "themes", NULL); path = g_build_filename (GTK_DATA_PREFIX, "share", "themes", NULL);
#ifdef G_OS_WIN32
if (var)
g_free ((void *) var);
#endif
return path; return path;
} }
@ -447,11 +418,6 @@ gtk_rc_add_initial_default_files (void)
var = g_getenv ("GTK2_RC_FILES"); 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) if (var)
{ {
files = g_strsplit (var, G_SEARCHPATH_SEPARATOR_S, 128); files = g_strsplit (var, G_SEARCHPATH_SEPARATOR_S, 128);
@ -479,11 +445,6 @@ gtk_rc_add_initial_default_files (void)
g_free (str); g_free (str);
} }
} }
#ifdef G_OS_WIN32
if (var)
g_free ((void *) var);
#endif
} }
/** /**