diff options
| author | Tor Lillqvist <tml@iki.fi> | 2004-12-12 21:09:13 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2004-12-12 21:09:13 +0000 |
| commit | f3da17053918abe78db5f75e7d008e4c84c09570 (patch) | |
| tree | 8ec4255ddb86a9d13de0e6012246a64f4cc671e3 /gtk/gtkmodules.c | |
| parent | f821217218c60a96cda40844fbef300b4b3d143b (diff) | |
| download | gtk+-f3da17053918abe78db5f75e7d008e4c84c09570.tar.gz | |
gtk/gtkaccelmap.[ch] gtk/gtkfilechooser.[ch] gtk/gtkfilesel.c
2004-12-12 Tor Lillqvist <tml@iki.fi>
* gtk/gtkaccelmap.[ch]
* gtk/gtkfilechooser.[ch]
* gtk/gtkfilesel.c
* gtk/gtkfilesystemwin32.c
* gtk/gtkiconfactory.[ch]
* gtk/gtkicontheme.[ch]
* gtk/gtkimage.[ch]
* gtk/gtkimmodule.c
* gtk/gtkmodules.c
* gtk/gtkrc.[ch]
* gtk/gtkuimanager.[ch]
* gtk/gtkwindow.[ch]
* gtk/updateiconcache.c
* gtk/gtk.symbols: Use gstdio wrappers. On Windows, convert
environment variables referring to pathnames from locale encoding
to UTF-8. As in GLib, in order to preserve Windows DLL ABI
stability, add binary compatibility versions of functions that
take file names as arguments, or return file names. Add a _utf8
suffix to the "real" such functions on Windows. The ABI
compatibility versions keep the old name.
* gtk/Makefile.am: Strip PRIVATE symbols from the GNU import
library.
* gtk/gtkiconcache.c (_gtk_icon_cache_new_for_path): Implement
file mapping on Win32.
* gtk/updateiconcache.c: Don't crash if invoked without
argument. Use binary mode when opening file.
* modules/engines/ms-windows/Theme/gtk-2.0/Makefile.am: Install
gtkrc in correct place, in <datadir>/themes/MS-Windows/gtk-2.0.
Diffstat (limited to 'gtk/gtkmodules.c')
| -rw-r--r-- | gtk/gtkmodules.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c index 0bec50a574..2e73f1bfed 100644 --- a/gtk/gtkmodules.c +++ b/gtk/gtkmodules.c @@ -70,6 +70,13 @@ 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 @@ -88,6 +95,13 @@ 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); |