gnome-desktop r4989 - trunk/libgnome-desktop

[vuntz svn gnome org]

Author: vuntz
Date: Tue Feb  5 16:27:38 2008
New Revision: 4989
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=4989&view=rev

Log:
2008-02-05  Vincent Untz  <vuntz gnome org>

	* gnome-hint.c: don't include libgnome.h, since it includes
	gnome-i18n.h, which includes bonobo-i18n.h, which will include gi18n.h
	if there's not a defined macro. And it's a conflict with our
	gi18n-lib.h include.
	Fix bug #511905


Modified:
   trunk/libgnome-desktop/ChangeLog
   trunk/libgnome-desktop/gnome-hint.c

Modified: trunk/libgnome-desktop/gnome-hint.c
==============================================================================
--- trunk/libgnome-desktop/gnome-hint.c	(original)
+++ trunk/libgnome-desktop/gnome-hint.c	Tue Feb  5 16:27:38 2008
@@ -25,7 +25,7 @@
 #undef GTK_DISABLE_DEPRECATED
 
 #include <glib/gi18n-lib.h>
-#include <libgnome/libgnome.h>
+#include <libgnome/gnome-macros.h>
 #include <libgnomeui/libgnomeui.h>
 #include <libgnomeui/gnome-hint.h>
 #include <gconf/gconf-client.h>