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/gtkimmodule.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/gtkimmodule.c')
| -rw-r--r-- | gtk/gtkimmodule.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c index 8043d2cca6..7de9133f7e 100644 --- a/gtk/gtkimmodule.c +++ b/gtk/gtkimmodule.c @@ -32,6 +32,7 @@ #include <stdlib.h> #include <string.h> +#include <glib/gstdio.h> #include <gmodule.h> #include <pango/pango-utils.h> #include "gtkalias.h" @@ -45,6 +46,10 @@ * else. */ +#ifdef __GTK_PRIVATE_H__ +#error gtkprivate.h should not be included in this file +#endif + #define SIMPLE_ID "gtk-im-context-simple" typedef struct _GtkIMModule GtkIMModule; @@ -279,7 +284,7 @@ gtk_im_module_init (void) contexts_hash = g_hash_table_new (g_str_hash, g_str_equal); - file = fopen (filename, "r"); + file = g_fopen (filename, "r"); if (!file) { /* In case someone wants only the default input method, @@ -353,7 +358,7 @@ gtk_im_module_init (void) goto context_error; info->domain_dirname = g_strdup (tmp_buf->str); #ifdef DO_CORRECT_LIBDIR_PREFIX - correct_libdir_prefix (&info->domain_dirname); + correct_libdir_prefix ((char **) &info->domain_dirname); #endif if (!pango_scan_string (&p, tmp_buf)) |