libegg r891 - in trunk: . libegg/toolbareditor

[friemann svn gnome org]

Author: friemann
Date: Fri Aug  8 21:14:52 2008
New Revision: 891
URL: http://svn.gnome.org/viewvc/libegg?rev=891&view=rev

Log:
2008-08-08  Felix Riemann  <friemann svn gnome org>

	* libegg/toolbareditor/egg-editable-toolbar.c:
	* libegg/toolbareditor/egg-editable-toolbar.h:
	* libegg/toolbareditor/egg-toolbar-editor.c:
	* libegg/toolbareditor/egg-toolbar-editor.h:
	* libegg/toolbareditor/egg-toolbars-model.c:
	* libegg/toolbareditor/egg-toolbars-model.h:
	* libegg/toolbareditor/eggtreemultidnd.c:
	* libegg/toolbareditor/eggtreemultidnd.h:
	Fix GDK/GTK includes to only use top level headers. Fixes bug #546945.


Modified:
   trunk/ChangeLog
   trunk/libegg/toolbareditor/egg-editable-toolbar.c
   trunk/libegg/toolbareditor/egg-editable-toolbar.h
   trunk/libegg/toolbareditor/egg-toolbar-editor.c
   trunk/libegg/toolbareditor/egg-toolbar-editor.h
   trunk/libegg/toolbareditor/egg-toolbars-model.c
   trunk/libegg/toolbareditor/egg-toolbars-model.h
   trunk/libegg/toolbareditor/eggtreemultidnd.c
   trunk/libegg/toolbareditor/eggtreemultidnd.h

Modified: trunk/libegg/toolbareditor/egg-editable-toolbar.c
==============================================================================
--- trunk/libegg/toolbareditor/egg-editable-toolbar.c	(original)
+++ trunk/libegg/toolbareditor/egg-editable-toolbar.c	Fri Aug  8 21:14:52 2008
@@ -25,26 +25,7 @@
 #include "egg-toolbars-model.h"
 #include "egg-toolbar-editor.h"
 
-#include <gtk/gtkvseparator.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtkseparatortoolitem.h>
-#include <gtk/gtkicontheme.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>
 

Modified: trunk/libegg/toolbareditor/egg-editable-toolbar.h
==============================================================================
--- trunk/libegg/toolbareditor/egg-editable-toolbar.h	(original)
+++ trunk/libegg/toolbareditor/egg-editable-toolbar.h	Fri Aug  8 21:14:52 2008
@@ -24,12 +24,7 @@
 
 #include "egg-toolbars-model.h"
 
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libegg/toolbareditor/egg-toolbar-editor.c
==============================================================================
--- trunk/libegg/toolbareditor/egg-toolbar-editor.c	(original)
+++ trunk/libegg/toolbareditor/egg-toolbar-editor.c	Fri Aug  8 21:14:52 2008
@@ -25,14 +25,6 @@
 
 #include <string.h>
 #include <libxml/tree.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkhbox.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 

Modified: trunk/libegg/toolbareditor/egg-toolbar-editor.h
==============================================================================
--- trunk/libegg/toolbareditor/egg-toolbar-editor.h	(original)
+++ trunk/libegg/toolbareditor/egg-toolbar-editor.h	Fri Aug  8 21:14:52 2008
@@ -19,8 +19,7 @@
 #ifndef EGG_TOOLBAR_EDITOR_H
 #define EGG_TOOLBAR_EDITOR_H
 
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkuimanager.h>
+#include <gtk/gtk.h>
 
 #include "egg-toolbars-model.h"
 

Modified: trunk/libegg/toolbareditor/egg-toolbars-model.c
==============================================================================
--- trunk/libegg/toolbareditor/egg-toolbars-model.c	(original)
+++ trunk/libegg/toolbareditor/egg-toolbars-model.c	Fri Aug  8 21:14:52 2008
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <libxml/tree.h>
-#include <gdk/gdkproperty.h>
+#include <gdk/gdk.h>
 
 static void egg_toolbars_model_finalize   (GObject               *object);
 

Modified: trunk/libegg/toolbareditor/egg-toolbars-model.h
==============================================================================
--- trunk/libegg/toolbareditor/egg-toolbars-model.h	(original)
+++ trunk/libegg/toolbareditor/egg-toolbars-model.h	Fri Aug  8 21:14:52 2008
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libegg/toolbareditor/eggtreemultidnd.c
==============================================================================
--- trunk/libegg/toolbareditor/eggtreemultidnd.c	(original)
+++ trunk/libegg/toolbareditor/eggtreemultidnd.c	Fri Aug  8 21:14:52 2008
@@ -18,10 +18,7 @@
  */
 
 #include <string.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include "eggtreemultidnd.h"
 
 #define EGG_TREE_MULTI_DND_STRING "EggTreeMultiDndString"

Modified: trunk/libegg/toolbareditor/eggtreemultidnd.h
==============================================================================
--- trunk/libegg/toolbareditor/eggtreemultidnd.h	(original)
+++ trunk/libegg/toolbareditor/eggtreemultidnd.h	Fri Aug  8 21:14:52 2008
@@ -20,9 +20,7 @@
 #ifndef __EGG_TREE_MULTI_DND_H__
 #define __EGG_TREE_MULTI_DND_H__
 
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkdnd.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS