diff options
| author | Hans Breuer <hans@breuer.org> | 2007-01-13 21:13:28 +0000 |
|---|---|---|
| committer | Hans Breuer <hans@src.gnome.org> | 2007-01-13 21:13:28 +0000 |
| commit | 3f403cde24615bd460e792d81c592ef71d2f01aa (patch) | |
| tree | 6151959deed992303d3f8bc372110ae01b313042 /gtk/gtkimmulticontext.c | |
| parent | adcdfcd59f6d3dfe84a95e3d49a0b34f1c4dd4a3 (diff) | |
| download | gtk+-3f403cde24615bd460e792d81c592ef71d2f01aa.tar.gz | |
don't include "gtkprivate.h" to avoid differing definitions of
2007-01-13 Hans Breuer <hans@breuer.org>
* gtk/gtkimmulticontext.c : don't include "gtkprivate.h" to avoid
differing definitions of GTK_LOCALEDIR (bug #396175).
* gtk/gtktreeview.c : use g_snprintf instead of snprintf, which is
not available everywhere
* gtk/makefile.msc.in : updated
svn path=/trunk/; revision=17137
Diffstat (limited to 'gtk/gtkimmulticontext.c')
| -rw-r--r-- | gtk/gtkimmulticontext.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c index b1b1c913c6..7129dfe637 100644 --- a/gtk/gtkimmulticontext.c +++ b/gtk/gtkimmulticontext.c @@ -27,9 +27,17 @@ #include "gtkmain.h" #include "gtkradiomenuitem.h" #include "gtkintl.h" -#include "gtkprivate.h" #include "gtkalias.h" +/* Do *not* include "gtkprivate.h" in this file. If you do, the + * the two definitions of GTK_LOCALEDIR will trigger a wrong + * warning in gtk_im_multicontext_append_menuitems() + */ + +#ifdef __GTK_PRIVATE_H__ +#error gtkprivate.h should not be included in this file +#endif + struct _GtkIMMulticontextPrivate { GdkWindow *client_window; |