diff options
| author | Michael Natterer <mitch@gimp.org> | 2011-10-22 08:48:13 +0200 |
|---|---|---|
| committer | Michael Natterer <mitch@gimp.org> | 2011-10-22 23:53:55 +0200 |
| commit | 2688ccdbc4c8976ba4f7d681533d70ab9edc8b32 (patch) | |
| tree | ebc5503bb0dc4be70f273bde1499225feb8d0e1b /gtk/gtkimmulticontext.c | |
| parent | 88ad614c735a92f8e0b029e2b5070bf0f8db5016 (diff) | |
| download | gtk+-2688ccdbc4c8976ba4f7d681533d70ab9edc8b32.tar.gz | |
gtk: clean up the private horror
- add gtkmodulesprivate.h and move stuff there from gtkprivate.h
- add gtkprivate.c and move stuff there from gtkmain.c
- add gtkwin32.c and move stuff there from gtkmain.c
- don't redefine GTK_DATADIR and friends in gtkprivate.h
- have _gtk_get_datadir() and friends on all platforms
- remove the horrid hacks where gtkprivate.h can't be included,
or must be included later due to redefinition of the compile-time
directories
Diffstat (limited to 'gtk/gtkimmulticontext.c')
| -rw-r--r-- | gtk/gtkimmulticontext.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c index 5ad4ec670f..5d21643245 100644 --- a/gtk/gtkimmulticontext.c +++ b/gtk/gtkimmulticontext.c @@ -27,7 +27,7 @@ #include "gtkmain.h" #include "gtkradiomenuitem.h" #include "gtkintl.h" -#include "gtkprivate.h" /* To get redefinition of GTK_LOCALE_DIR on Win32 */ +#include "gtkprivate.h" /** @@ -634,7 +634,7 @@ gtk_im_multicontext_append_menuitems (GtkIMMulticontext *context, { /* Same translation domain as GTK+ */ if (!(contexts[i]->domain_dirname && contexts[i]->domain_dirname[0]) || - pathnamecmp (contexts[i]->domain_dirname, GTK_LOCALEDIR) == 0) + pathnamecmp (contexts[i]->domain_dirname, _gtk_get_localedir ()) == 0) { /* Empty or NULL, domain directory, or same as * GTK+. Input method may have a name in the GTK+ |