libbonoboui r2668 - in trunk: . bonobo

[cosimoc svn gnome org]

Author: cosimoc
Date: Sat Oct 18 01:35:34 2008
New Revision: 2668
URL: http://svn.gnome.org/viewvc/libbonoboui?rev=2668&view=rev

Log:
2008-10-18  Cosimo Cecchi  <cosimoc gnome org>

	* bonobo/Makefile.am:
	* bonobo/bonobo-a11y.c:
	* bonobo/bonobo-canvas-component.c:
	* bonobo/bonobo-canvas-item.c:
	* bonobo/bonobo-control-frame.c:
	* bonobo/bonobo-dock-item-grip.c:
	* bonobo/bonobo-dock-item.c:
	* bonobo/bonobo-file-selector-util.c:
	* bonobo/bonobo-socket.c:
	* bonobo/bonobo-ui-engine-config.c:
	* bonobo/bonobo-ui-main.c:
	* bonobo/bonobo-ui-toolbar-popup-item.c:
	* bonobo/bonobo-ui-util.c:
	* configure.in:
	Use and enforce single GTK+/GLib includes.


Modified:
   trunk/ChangeLog
   trunk/bonobo/Makefile.am
   trunk/bonobo/bonobo-a11y.c
   trunk/bonobo/bonobo-canvas-component.c
   trunk/bonobo/bonobo-canvas-item.c
   trunk/bonobo/bonobo-control-frame.c
   trunk/bonobo/bonobo-dock-item-grip.c
   trunk/bonobo/bonobo-dock-item.c
   trunk/bonobo/bonobo-file-selector-util.c
   trunk/bonobo/bonobo-socket.c
   trunk/bonobo/bonobo-ui-engine-config.c
   trunk/bonobo/bonobo-ui-main.c
   trunk/bonobo/bonobo-ui-toolbar-popup-item.c
   trunk/bonobo/bonobo-ui-util.c
   trunk/configure.in

Modified: trunk/bonobo/Makefile.am
==============================================================================
--- trunk/bonobo/Makefile.am	(original)
+++ trunk/bonobo/Makefile.am	Sat Oct 18 01:35:34 2008
@@ -17,6 +17,7 @@
 	-DG_LOG_DOMAIN=\"Bonobo\"			\
 	-DVERSION=\"$(VERSION)\"			\
 	$(DISABLE_DEPRECATED)				\
+	$(BONOBOUI_SINGLE_INCLUDES)			\
 	-UBONOBO_DISABLE_DEPRECATED			\
 	-UBONOBO_UI_DISABLE_DEPRECATED
 

Modified: trunk/bonobo/bonobo-a11y.c
==============================================================================
--- trunk/bonobo/bonobo-a11y.c	(original)
+++ trunk/bonobo/bonobo-a11y.c	Sat Oct 18 01:35:34 2008
@@ -8,10 +8,10 @@
  * Copyright 2002 Sun Microsystems, Inc.
  */
 #include "config.h"
-#include <glib/garray.h>
+#include <glib.h>
 #include <atk/atkregistry.h>
 #include <atk/atkobjectfactory.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <bonobo-a11y.h>
 
 GType

Modified: trunk/bonobo/bonobo-canvas-component.c
==============================================================================
--- trunk/bonobo/bonobo-canvas-component.c	(original)
+++ trunk/bonobo/bonobo-canvas-component.c	Sat Oct 18 01:35:34 2008
@@ -10,7 +10,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <string.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 #include <bonobo/Bonobo.h>
 #include <libart_lgpl/art_affine.h>
 #include <libgnomecanvas/gnome-canvas.h>

Modified: trunk/bonobo/bonobo-canvas-item.c
==============================================================================
--- trunk/bonobo/bonobo-canvas-item.c	(original)
+++ trunk/bonobo/bonobo-canvas-item.c	Sat Oct 18 01:35:34 2008
@@ -30,7 +30,7 @@
 #else
 #error Port to this GDK backend
 #endif
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h>
 
 G_DEFINE_TYPE (BonoboCanvasItem, bonobo_canvas_item, GNOME_TYPE_CANVAS_ITEM)
 

Modified: trunk/bonobo/bonobo-control-frame.c
==============================================================================
--- trunk/bonobo/bonobo-control-frame.c	(original)
+++ trunk/bonobo/bonobo-control-frame.c	Sat Oct 18 01:35:34 2008
@@ -14,10 +14,6 @@
  *                 2000 Eazel, Inc.
  */
 #include <config.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmarshal.h>
-#include <gtk/gtkplug.h>
-#include <gtk/gtkbox.h>
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-control-frame.h>
@@ -30,8 +26,7 @@
 #else
 #error Port to this GDK backend
 #endif
-#include <gdk/gdktypes.h>
-#include <gtk/gtkhbox.h>
+#include <gdk/gdk.h>
 #include <bonobo/bonobo-socket.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-ui-marshal.h>

Modified: trunk/bonobo/bonobo-dock-item-grip.c
==============================================================================
--- trunk/bonobo/bonobo-dock-item-grip.c	(original)
+++ trunk/bonobo/bonobo-dock-item-grip.c	Sat Oct 18 01:35:34 2008
@@ -15,8 +15,7 @@
 #include <glib-object.h>
 #include <atk/atkstateset.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkaccessible.h>
-#include <gtk/gtkbindings.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 #include <string.h>
 

Modified: trunk/bonobo/bonobo-dock-item.c
==============================================================================
--- trunk/bonobo/bonobo-dock-item.c	(original)
+++ trunk/bonobo/bonobo-dock-item.c	Sat Oct 18 01:35:34 2008
@@ -41,10 +41,7 @@
 #include <gdk/gdkx.h>
 #endif
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 #include <glib/gi18n-lib.h>
 

Modified: trunk/bonobo/bonobo-file-selector-util.c
==============================================================================
--- trunk/bonobo/bonobo-file-selector-util.c	(original)
+++ trunk/bonobo/bonobo-file-selector-util.c	Sat Oct 18 01:35:34 2008
@@ -20,12 +20,7 @@
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-widget.h>
 
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkstock.h>
+#include <gtk/gtk.h>
 
 #include <glib.h>
 #include <glib/gi18n-lib.h>

Modified: trunk/bonobo/bonobo-socket.c
==============================================================================
--- trunk/bonobo/bonobo-socket.c	(original)
+++ trunk/bonobo/bonobo-socket.c	Sat Oct 18 01:35:34 2008
@@ -11,9 +11,7 @@
  */
 #include "config.h"
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 #include <bonobo/bonobo-socket.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-control-frame.h>

Modified: trunk/bonobo/bonobo-ui-engine-config.c
==============================================================================
--- trunk/bonobo/bonobo-ui-engine-config.c	(original)
+++ trunk/bonobo/bonobo-ui-engine-config.c	Sat Oct 18 01:35:34 2008
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 
 #include <glib/gi18n-lib.h>

Modified: trunk/bonobo/bonobo-ui-main.c
==============================================================================
--- trunk/bonobo/bonobo-ui-main.c	(original)
+++ trunk/bonobo/bonobo-ui-main.c	Sat Oct 18 01:35:34 2008
@@ -20,7 +20,7 @@
 
 #include <libgnome/gnome-init.h>
 
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #ifdef G_OS_WIN32
 #include <string.h>

Modified: trunk/bonobo/bonobo-ui-toolbar-popup-item.c
==============================================================================
--- trunk/bonobo/bonobo-ui-toolbar-popup-item.c	(original)
+++ trunk/bonobo/bonobo-ui-toolbar-popup-item.c	Sat Oct 18 01:35:34 2008
@@ -10,7 +10,7 @@
 
 #include <config.h>
 #include <bonobo/bonobo-ui-toolbar-popup-item.h>
-#include <gtk/gtkarrow.h>
+#include <gtk/gtk.h>
 
 G_DEFINE_TYPE (BonoboUIToolbarPopupItem,
 	       bonobo_ui_toolbar_popup_item,

Modified: trunk/bonobo/bonobo-ui-util.c
==============================================================================
--- trunk/bonobo/bonobo-ui-util.c	(original)
+++ trunk/bonobo/bonobo-ui-util.c	Sat Oct 18 01:35:34 2008
@@ -9,9 +9,7 @@
 #include <config.h>
 #include <string.h>
 
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 
 #include <libgnome/gnome-help.h>
 #include <libgnome/gnome-init.h>

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Oct 18 01:35:34 2008
@@ -131,6 +131,9 @@
 AC_SUBST(BONOBOUI_GLADE_CFLAGS)
 AC_SUBST(BONOBOUI_GLADE_LIBS)
 
+BONOBOUI_SINGLE_INCLUDES="-DGTK_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES"
+AC_SUBST(BONOBOUI_SINGLE_INCLUDES)
+
 # glib-genmarshal
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 # glib-mkenums