Bug 558064 – build with single includes

svn path=/trunk/; revision=3240

diff --git a/backend/djvu/djvu-document.c b/backend/djvu/djvu-document.c
index a9559c22d854583431154dd1f6156395972d55d1..3eafbfe67d64fb379acb7e47e00d7c9573985663 100644 (file)
--- a/backend/djvu/djvu-document.c
+++ b/backend/djvu/djvu-document.c
@@ -32,9 +32,9 @@
 #include "ev-selection.h"
 #include "ev-file-helpers.h"
 
-#include <gdk-pixbuf/gdk-pixbuf-core.h>
+#include <glib.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gi18n.h>
-#include <glib/gunicode.h>
 #include <string.h>
 
 #define SCALE_FACTOR 0.2

diff --git a/backend/dvi/cairo-device.c b/backend/dvi/cairo-device.c
index 992728dc4c4b49b012b8a2278840f876d864c5f9..9a42e7b5a9326874fe76db6d6848d545cc6e599a 100644 (file)
--- a/backend/dvi/cairo-device.c
+++ b/backend/dvi/cairo-device.c
@@ -19,7 +19,7 @@
 #include <config.h>
 
 #include <stdlib.h>
-#include <gdk/gdkcolor.h>
+#include <gdk/gdk.h>
 #ifdef HAVE_SPECTRE
 #include <libspectre/spectre.h>
 #endif

diff --git a/cut-n-paste/evmountoperation/ev-mount-operation.h b/cut-n-paste/evmountoperation/ev-mount-operation.h
index bfb2836a4ddf0923f43bda0eed4e00f8de49b6a0..efb933871240ed1aeb28258b3e0d13072aa3be99 100644 (file)
--- a/cut-n-paste/evmountoperation/ev-mount-operation.h
+++ b/cut-n-paste/evmountoperation/ev-mount-operation.h
@@ -29,8 +29,7 @@
 
 #include <glib.h>
 #include <gio/gio.h>
-#include <gdk/gdkscreen.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/cut-n-paste/gedit-message-area/gedit-message-area.h b/cut-n-paste/gedit-message-area/gedit-message-area.h
index c53a800a792d5b059e578ad0eb82daa1e902b5ea..711b64e2fe8238a7a6b8285dece75478d92124eb 100644 (file)
--- a/cut-n-paste/gedit-message-area/gedit-message-area.h
+++ b/cut-n-paste/gedit-message-area/gedit-message-area.h
@@ -31,7 +31,7 @@
 #ifndef __GEDIT_MESSAGE_AREA_H__
 #define __GEDIT_MESSAGE_AREA_H__
 
-#include <gtk/gtkdialog.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
index d65b7eb97086a6e2dd6c4cbbd9ea288b094620ef..95b0adddf915cdee85495d8998a40a845ddbb5f5 100644 (file)
--- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
+++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c
@@ -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>
 

diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.h b/cut-n-paste/toolbar-editor/egg-editable-toolbar.h
index 8a4e85e7114399f779fc37af082c64b39614f6ef..8537ba808106047b8761ca4f6c3633b00d8c07a5 100644 (file)
--- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.h
+++ b/cut-n-paste/toolbar-editor/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
 

diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
index 8671cd4c35ef39c3488d4b127f1a081f06adaa0c..cd5f38f2c48cf706586330696cf37b4d4e18e62f 100644 (file)
--- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
+++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c
@@ -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>
 

diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.h b/cut-n-paste/toolbar-editor/egg-toolbar-editor.h
index e29e5482bdb78440f4dc21c69bd2905620d0dcd1..b0d27aa7a4503a283b7be1cb310e6a945770f7fd 100644 (file)
--- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.h
+++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.h
@@ -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"
 

diff --git a/cut-n-paste/toolbar-editor/egg-toolbars-model.c b/cut-n-paste/toolbar-editor/egg-toolbars-model.c
index 17c6e414bd5aa7c853f59dd414e6de94f6614486..fa19ec2a0d7077dcea869adc98d5e37223488381 100644 (file)
--- a/cut-n-paste/toolbar-editor/egg-toolbars-model.c
+++ b/cut-n-paste/toolbar-editor/egg-toolbars-model.c
@@ -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);
 

diff --git a/cut-n-paste/toolbar-editor/egg-toolbars-model.h b/cut-n-paste/toolbar-editor/egg-toolbars-model.h
index 6961ee4ec0f4bd457147ea767a4cd0d56680e911..c5529adc6bf6b0b4cd8e9bdb92f807107d646178 100644 (file)
--- a/cut-n-paste/toolbar-editor/egg-toolbars-model.h
+++ b/cut-n-paste/toolbar-editor/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
 

diff --git a/cut-n-paste/toolbar-editor/eggtreemultidnd.c b/cut-n-paste/toolbar-editor/eggtreemultidnd.c
index 694e0565042ef2c5a828b1300ac2d0a9bbe8dac7..8fabd18bd07c709f447d5e2a14312b18bb88757a 100644 (file)
--- a/cut-n-paste/toolbar-editor/eggtreemultidnd.c
+++ b/cut-n-paste/toolbar-editor/eggtreemultidnd.c
@@ -19,10 +19,7 @@
 
 #include <config.h>
 #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"

diff --git a/cut-n-paste/toolbar-editor/eggtreemultidnd.h b/cut-n-paste/toolbar-editor/eggtreemultidnd.h
index 810d48ea78086a75d1aaac856c6386adebf56125..3df69fbad99e4444ff524d0127e2a635bb7143db 100644 (file)
--- a/cut-n-paste/toolbar-editor/eggtreemultidnd.h
+++ b/cut-n-paste/toolbar-editor/eggtreemultidnd.h
@@ -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
 

diff --git a/cut-n-paste/zoom-control/ephy-zoom-action.c b/cut-n-paste/zoom-control/ephy-zoom-action.c
index 3aadf84eb36bd484b152fa4eff69aa7818543d04..986e3ef8dffce7c2eb5ccce7657284d0b8d2c548 100644 (file)
--- a/cut-n-paste/zoom-control/ephy-zoom-action.c
+++ b/cut-n-paste/zoom-control/ephy-zoom-action.c
@@ -29,11 +29,7 @@
 
 #include <glib-object.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkseparatormenuitem.h>
+#include <gtk/gtk.h>
 
 #define EPHY_ZOOM_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ZOOM_ACTION, EphyZoomActionPrivate))
 

diff --git a/cut-n-paste/zoom-control/ephy-zoom-action.h b/cut-n-paste/zoom-control/ephy-zoom-action.h
index 77f9b415081e7ff21b1213444e0e9039ae9b8580..47399db9226440a8ba53bb8f98afcc831ed1036c 100644 (file)
--- a/cut-n-paste/zoom-control/ephy-zoom-action.h
+++ b/cut-n-paste/zoom-control/ephy-zoom-action.h
@@ -22,7 +22,7 @@
 #ifndef EPHY_ZOOM_ACTION_H
 #define EPHY_ZOOM_ACTION_H
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/cut-n-paste/zoom-control/ephy-zoom-control.c b/cut-n-paste/zoom-control/ephy-zoom-control.c
index 2f372d9016a00314076a297c754a97e3d27292dc..66efbaad1af8dc6a114731159dcff56648251664 100644 (file)
--- a/cut-n-paste/zoom-control/ephy-zoom-control.c
+++ b/cut-n-paste/zoom-control/ephy-zoom-control.c
@@ -26,10 +26,6 @@
 #include "ephy-zoom.h"
 
 #include <gtk/gtk.h>
-#include <gtk/gtkcombobox.h>
-#if !GTK_CHECK_VERSION (2, 11, 5)
-#include <gtk/gtktooltips.h>
-#endif
 #include <glib/gi18n.h>
 
 #define EPHY_ZOOM_CONTROL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ZOOM_CONTROL, EphyZoomControlPrivate))
@@ -177,8 +173,7 @@ ephy_zoom_control_init (EphyZoomControl *control)
                                              NULL, NULL);
 
        gtk_combo_box_set_focus_on_click (p->combo, FALSE);
-       g_object_ref (p->combo);
-       gtk_object_sink (GTK_OBJECT (p->combo));
+       g_object_ref_sink (G_OBJECT (p->combo));
        gtk_widget_show (GTK_WIDGET (p->combo));
 
        i = ephy_zoom_get_zoom_level_index (p->zoom);

diff --git a/cut-n-paste/zoom-control/ephy-zoom-control.h b/cut-n-paste/zoom-control/ephy-zoom-control.h
index 6c2f5ba8efc0a436cf9529579877f0aab810815c..b339a4df722565dc2a1dd55b3631ce61e7137dde 100644 (file)
--- a/cut-n-paste/zoom-control/ephy-zoom-control.h
+++ b/cut-n-paste/zoom-control/ephy-zoom-control.h
@@ -21,7 +21,7 @@
 #ifndef EPHY_ZOOM_CONTROL_H
 #define EPHY_ZOOM_CONTROL_H
 
-#include <gtk/gtktoolitem.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/libdocument/ev-async-renderer.h b/libdocument/ev-async-renderer.h
index 9aa965730e80766e5023f6d275e8434292065b94..e516a0538130efc9a692015d4c6a03979aa3b210 100644 (file)
--- a/libdocument/ev-async-renderer.h
+++ b/libdocument/ev-async-renderer.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 #include <glib.h>
-#include <gdk/gdkpixbuf.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 

diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c
index a920be60bcfe06e2a051866700212b29160a7639..125583314fab195ff955f1158ed28ed33f71d4b7 100644 (file)
--- a/libdocument/ev-document-factory.c
+++ b/libdocument/ev-document-factory.c
@@ -27,7 +27,7 @@
 #include <gio/gio.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkfilechooserdialog.h>
+#include <gtk/gtk.h>
 
 #include "ev-backends-manager.h"
 #include "ev-document-factory.h"

diff --git a/libdocument/ev-document-misc.h b/libdocument/ev-document-misc.h
index 5fdb670f0cf69f1d41859cc34e55daa3095c5e54..4c31dc7fc96fd34b9cbc2a3ddbed629999c5781c 100644 (file)
--- a/libdocument/ev-document-misc.h
+++ b/libdocument/ev-document-misc.h
@@ -25,7 +25,7 @@
 #include <cairo.h>
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkstyle.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/libdocument/ev-image.h b/libdocument/ev-image.h
index 8b5b595edadc6feb239e8cfd15c1568030e1cbe3..e603010f1f12fb1a8ff128e1d403c6f6a741b75c 100644 (file)
--- a/libdocument/ev-image.h
+++ b/libdocument/ev-image.h
@@ -21,7 +21,7 @@
 #define __EV_IMAGE_H__
 
 #include <glib-object.h>
-#include <gdk/gdkpixbuf.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 

diff --git a/libdocument/ev-selection.h b/libdocument/ev-selection.h
index 0b2f41be7999cbcc8328182c33aac7e37ac56d6c..59f731c092814deeeea0b60e72790035bad9755c 100644 (file)
--- a/libdocument/ev-selection.h
+++ b/libdocument/ev-selection.h
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 #include <glib.h>
-#include <gdk/gdkpixbuf.h>
 #include <gdk/gdk.h>
 #include "ev-document.h"
 

diff --git a/shell/ev-properties-fonts.h b/shell/ev-properties-fonts.h
index 5d6bf349676b499c3f1666a50c2f0bf36646d9b2..f2bc2fe975b4f9070e5e707bf3c566fbe940b4fa 100644 (file)
--- a/shell/ev-properties-fonts.h
+++ b/shell/ev-properties-fonts.h
@@ -23,7 +23,7 @@
 
 #include "ev-document.h"
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

diff --git a/shell/ev-stock-icons.h b/shell/ev-stock-icons.h
index b3455de55dd42374e27e72975fc5467eeb180b32..752f1c825cd64ad2bd7b84d065e069be8d99b8a3 100644 (file)
--- a/shell/ev-stock-icons.h
+++ b/shell/ev-stock-icons.h
@@ -24,7 +24,7 @@
 #ifndef __EV_STOCK_ICONS_H__
 #define __EV_STOCK_ICONS_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

diff --git a/shell/ev-window.c b/shell/ev-window.c
index ca4f81b52c0378adfba51b14e952bc4ff04b0d5c..0205bc45b5e43faae3612d31f251d5e976e27559 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -37,7 +37,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
-#include <gtk/gtkprintunixdialog.h>
+#include <gtk/gtkunixprint.h>
 #include <gconf/gconf-client.h>
 
 #include "egg-editable-toolbar.h"