eog r4674 - in trunk: . cut-n-paste/toolbar-editor src

[friemann svn gnome org]

Author: friemann
Date: Fri Aug  8 21:37:53 2008
New Revision: 4674
URL: http://svn.gnome.org/viewvc/eog?rev=4674&view=rev

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

	* cut-n-paste/toolbar-editor/*.{c,h}:
	* src/eog-file-chooser.h:
	* src/eog-print-image-setup.c:
	* src/eog-sidebar.h:
	Remove GDK/GTK single includes. Use only top level includes.


Modified:
   trunk/ChangeLog
   trunk/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
   trunk/cut-n-paste/toolbar-editor/egg-editable-toolbar.h
   trunk/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
   trunk/cut-n-paste/toolbar-editor/egg-toolbar-editor.h
   trunk/cut-n-paste/toolbar-editor/egg-toolbars-model.c
   trunk/cut-n-paste/toolbar-editor/egg-toolbars-model.h
   trunk/cut-n-paste/toolbar-editor/eggtreemultidnd.c
   trunk/cut-n-paste/toolbar-editor/eggtreemultidnd.h
   trunk/src/eog-file-chooser.h
   trunk/src/eog-print-image-setup.c
   trunk/src/eog-sidebar.h

Modified: trunk/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
==============================================================================
--- trunk/cut-n-paste/toolbar-editor/egg-editable-toolbar.c	(original)
+++ trunk/cut-n-paste/toolbar-editor/egg-editable-toolbar.c	Fri Aug  8 21:37:53 2008
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- *  $Id: egg-editable-toolbar.c 826 2007-08-16 08:05:50Z carlosgc $
+ *  $Id: egg-editable-toolbar.c 891 2008-08-08 21:14:52Z friemann $
  */
 
 #include "config.h"
@@ -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/cut-n-paste/toolbar-editor/egg-editable-toolbar.h
==============================================================================
--- trunk/cut-n-paste/toolbar-editor/egg-editable-toolbar.h	(original)
+++ trunk/cut-n-paste/toolbar-editor/egg-editable-toolbar.h	Fri Aug  8 21:37:53 2008
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- *  $Id: egg-editable-toolbar.h 813 2007-07-01 12:58:48Z jhaitsma $
+ *  $Id: egg-editable-toolbar.h 891 2008-08-08 21:14:52Z friemann $
  */
 
 #ifndef EGG_EDITABLE_TOOLBAR_H
@@ -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/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
==============================================================================
--- trunk/cut-n-paste/toolbar-editor/egg-toolbar-editor.c	(original)
+++ trunk/cut-n-paste/toolbar-editor/egg-toolbar-editor.c	Fri Aug  8 21:37:53 2008
@@ -15,7 +15,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- *  $Id: egg-toolbar-editor.c 832 2007-11-03 22:14:56Z friemann $
+ *  $Id: egg-toolbar-editor.c 891 2008-08-08 21:14:52Z friemann $
  */
 
 #include "config.h"
@@ -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/cut-n-paste/toolbar-editor/egg-toolbar-editor.h
==============================================================================
--- trunk/cut-n-paste/toolbar-editor/egg-toolbar-editor.h	(original)
+++ trunk/cut-n-paste/toolbar-editor/egg-toolbar-editor.h	Fri Aug  8 21:37:53 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/cut-n-paste/toolbar-editor/egg-toolbars-model.c
==============================================================================
--- trunk/cut-n-paste/toolbar-editor/egg-toolbars-model.c	(original)
+++ trunk/cut-n-paste/toolbar-editor/egg-toolbars-model.c	Fri Aug  8 21:37:53 2008
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- *  $Id: egg-toolbars-model.c 815 2007-07-02 15:02:15Z friemann $
+ *  $Id: egg-toolbars-model.c 891 2008-08-08 21:14:52Z friemann $
  */
 
 #include "config.h"
@@ -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/cut-n-paste/toolbar-editor/egg-toolbars-model.h
==============================================================================
--- trunk/cut-n-paste/toolbar-editor/egg-toolbars-model.h	(original)
+++ trunk/cut-n-paste/toolbar-editor/egg-toolbars-model.h	Fri Aug  8 21:37:53 2008
@@ -15,7 +15,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * 
- *  $Id: egg-toolbars-model.h 813 2007-07-01 12:58:48Z jhaitsma $
+ *  $Id: egg-toolbars-model.h 891 2008-08-08 21:14:52Z friemann $
  */
 
 #ifndef EGG_TOOLBARS_MODEL_H
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/cut-n-paste/toolbar-editor/eggtreemultidnd.c
==============================================================================
--- trunk/cut-n-paste/toolbar-editor/eggtreemultidnd.c	(original)
+++ trunk/cut-n-paste/toolbar-editor/eggtreemultidnd.c	Fri Aug  8 21:37:53 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/cut-n-paste/toolbar-editor/eggtreemultidnd.h
==============================================================================
--- trunk/cut-n-paste/toolbar-editor/eggtreemultidnd.h	(original)
+++ trunk/cut-n-paste/toolbar-editor/eggtreemultidnd.h	Fri Aug  8 21:37:53 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
 

Modified: trunk/src/eog-file-chooser.h
==============================================================================
--- trunk/src/eog-file-chooser.h	(original)
+++ trunk/src/eog-file-chooser.h	Fri Aug  8 21:37:53 2008
@@ -18,7 +18,7 @@
 #ifndef _EOG_FILE_CHOOSER_H_
 #define _EOG_FILE_CHOOSER_H_
 
-#include <gtk/gtkfilechooserdialog.h>
+#include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 G_BEGIN_DECLS

Modified: trunk/src/eog-print-image-setup.c
==============================================================================
--- trunk/src/eog-print-image-setup.c	(original)
+++ trunk/src/eog-print-image-setup.c	Fri Aug  8 21:37:53 2008
@@ -24,7 +24,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtk/gtkprintunixdialog.h>
+#include <gtk/gtkunixprint.h>
 #include <glib/gi18n.h>
 #include <glib/gprintf.h>
 

Modified: trunk/src/eog-sidebar.h
==============================================================================
--- trunk/src/eog-sidebar.h	(original)
+++ trunk/src/eog-sidebar.h	Fri Aug  8 21:37:53 2008
@@ -26,7 +26,7 @@
 #ifndef __EOG_SIDEBAR_H__
 #define __EOG_SIDEBAR_H__
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS