gossip r2866 - in trunk: . src

[mr svn gnome org]

Author: mr
Date: Tue Dec 30 02:47:14 2008
New Revision: 2866
URL: http://svn.gnome.org/viewvc/gossip?rev=2866&view=rev

Log:
	* configure.ac:
	* src/gossip-self-presence.h: Added blurb about
	http://live.gnome.org/GnomeGoals/CleanupGTKIncludes in
	configure.ac and also checked Gossip builds with those CFLAGS.
	Right now it doesn't because of the glade and panel-applet-gconf
	includes which need fixing so it is disabled for now. This fixes
	bug #564368 (PrzemysÅaw Grzegorczyk).


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/gossip-self-presence.h

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Dec 30 02:47:14 2008
@@ -422,6 +422,22 @@
    fi
 fi
 
+#
+# For more information see:
+#
+#   http://live.gnome.org/GnomeGoals/CleanupGTKIncludes
+#   http://bugzilla.gnome.org/show_bug.cgi?id=564368
+# 
+# Right now the includes which cause problems are:
+#
+#  include <panel-applet-gconf.h>
+#  include <glade/glade.h>
+#
+# These are currently broken, so this is currently disabled, the rest
+# of the build works with these exceptions.
+#
+# CFLAGS+=" -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+#
 
 AC_OUTPUT([
   Makefile

Modified: trunk/src/gossip-self-presence.h
==============================================================================
--- trunk/src/gossip-self-presence.h	(original)
+++ trunk/src/gossip-self-presence.h	Tue Dec 30 02:47:14 2008
@@ -22,7 +22,7 @@
 #define __GOSSIP_SELF_PRESENCE_H__
 
 #include <glib-object.h>
-#include <gdk/gdkpixbuf.h>
+#include <gdk/gdk.h>
 
 #include <libgossip/gossip.h>