evince r3240 - in trunk: backend/djvu backend/dvi cut-n-paste/evmountoperation cut-n-paste/gedit-message-area cut-n-paste/toolbar-editor cut-n-paste/zoom-control libdocument shell

[chpe svn gnome org]

Author: chpe
Date: Mon Oct 27 12:17:08 2008
New Revision: 3240
URL: http://svn.gnome.org/viewvc/evince?rev=3240&view=rev

Log:
Bug 558064 â build with single includes

Modified:
   trunk/backend/djvu/djvu-document.c
   trunk/backend/dvi/cairo-device.c
   trunk/cut-n-paste/evmountoperation/ev-mount-operation.h
   trunk/cut-n-paste/gedit-message-area/gedit-message-area.h
   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/cut-n-paste/zoom-control/ephy-zoom-action.c
   trunk/cut-n-paste/zoom-control/ephy-zoom-action.h
   trunk/cut-n-paste/zoom-control/ephy-zoom-control.c
   trunk/cut-n-paste/zoom-control/ephy-zoom-control.h
   trunk/libdocument/ev-async-renderer.h
   trunk/libdocument/ev-document-factory.c
   trunk/libdocument/ev-document-misc.h
   trunk/libdocument/ev-image.h
   trunk/libdocument/ev-selection.h
   trunk/shell/ev-properties-fonts.h
   trunk/shell/ev-stock-icons.h
   trunk/shell/ev-window.c

Modified: trunk/backend/djvu/djvu-document.c
==============================================================================
--- trunk/backend/djvu/djvu-document.c	(original)
+++ trunk/backend/djvu/djvu-document.c	Mon Oct 27 12:17:08 2008
@@ -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

Modified: trunk/backend/dvi/cairo-device.c
==============================================================================
--- trunk/backend/dvi/cairo-device.c	(original)
+++ trunk/backend/dvi/cairo-device.c	Mon Oct 27 12:17:08 2008
@@ -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

Modified: trunk/cut-n-paste/evmountoperation/ev-mount-operation.h
==============================================================================
--- trunk/cut-n-paste/evmountoperation/ev-mount-operation.h	(original)
+++ trunk/cut-n-paste/evmountoperation/ev-mount-operation.h	Mon Oct 27 12:17:08 2008
@@ -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
 

Modified: trunk/cut-n-paste/gedit-message-area/gedit-message-area.h
==============================================================================
--- trunk/cut-n-paste/gedit-message-area/gedit-message-area.h	(original)
+++ trunk/cut-n-paste/gedit-message-area/gedit-message-area.h	Mon Oct 27 12:17:08 2008
@@ -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
 

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	Mon Oct 27 12:17:08 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/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	Mon Oct 27 12:17:08 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/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	Mon Oct 27 12:17:08 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/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	Mon Oct 27 12:17:08 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	Mon Oct 27 12:17:08 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/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	Mon Oct 27 12:17:08 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/cut-n-paste/toolbar-editor/eggtreemultidnd.c
==============================================================================
--- trunk/cut-n-paste/toolbar-editor/eggtreemultidnd.c	(original)
+++ trunk/cut-n-paste/toolbar-editor/eggtreemultidnd.c	Mon Oct 27 12:17:08 2008
@@ -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"

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	Mon Oct 27 12:17:08 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/cut-n-paste/zoom-control/ephy-zoom-action.c
==============================================================================
--- trunk/cut-n-paste/zoom-control/ephy-zoom-action.c	(original)
+++ trunk/cut-n-paste/zoom-control/ephy-zoom-action.c	Mon Oct 27 12:17:08 2008
@@ -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))
 

Modified: trunk/cut-n-paste/zoom-control/ephy-zoom-action.h
==============================================================================
--- trunk/cut-n-paste/zoom-control/ephy-zoom-action.h	(original)
+++ trunk/cut-n-paste/zoom-control/ephy-zoom-action.h	Mon Oct 27 12:17:08 2008
@@ -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
 

Modified: trunk/cut-n-paste/zoom-control/ephy-zoom-control.c
==============================================================================
--- trunk/cut-n-paste/zoom-control/ephy-zoom-control.c	(original)
+++ trunk/cut-n-paste/zoom-control/ephy-zoom-control.c	Mon Oct 27 12:17:08 2008
@@ -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 @@
 					      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);

Modified: trunk/cut-n-paste/zoom-control/ephy-zoom-control.h
==============================================================================
--- trunk/cut-n-paste/zoom-control/ephy-zoom-control.h	(original)
+++ trunk/cut-n-paste/zoom-control/ephy-zoom-control.h	Mon Oct 27 12:17:08 2008
@@ -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
 

Modified: trunk/libdocument/ev-async-renderer.h
==============================================================================
--- trunk/libdocument/ev-async-renderer.h	(original)
+++ trunk/libdocument/ev-async-renderer.h	Mon Oct 27 12:17:08 2008
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 #include <glib.h>
-#include <gdk/gdkpixbuf.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libdocument/ev-document-factory.c
==============================================================================
--- trunk/libdocument/ev-document-factory.c	(original)
+++ trunk/libdocument/ev-document-factory.c	Mon Oct 27 12:17:08 2008
@@ -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"

Modified: trunk/libdocument/ev-document-misc.h
==============================================================================
--- trunk/libdocument/ev-document-misc.h	(original)
+++ trunk/libdocument/ev-document-misc.h	Mon Oct 27 12:17:08 2008
@@ -25,7 +25,7 @@
 #include <cairo.h>
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gtk/gtkstyle.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libdocument/ev-image.h
==============================================================================
--- trunk/libdocument/ev-image.h	(original)
+++ trunk/libdocument/ev-image.h	Mon Oct 27 12:17:08 2008
@@ -21,7 +21,7 @@
 #define __EV_IMAGE_H__
 
 #include <glib-object.h>
-#include <gdk/gdkpixbuf.h>
+#include <gdk/gdk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libdocument/ev-selection.h
==============================================================================
--- trunk/libdocument/ev-selection.h	(original)
+++ trunk/libdocument/ev-selection.h	Mon Oct 27 12:17:08 2008
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 #include <glib.h>
-#include <gdk/gdkpixbuf.h>
 #include <gdk/gdk.h>
 #include "ev-document.h"
 

Modified: trunk/shell/ev-properties-fonts.h
==============================================================================
--- trunk/shell/ev-properties-fonts.h	(original)
+++ trunk/shell/ev-properties-fonts.h	Mon Oct 27 12:17:08 2008
@@ -23,7 +23,7 @@
 
 #include "ev-document.h"
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/shell/ev-stock-icons.h
==============================================================================
--- trunk/shell/ev-stock-icons.h	(original)
+++ trunk/shell/ev-stock-icons.h	Mon Oct 27 12:17:08 2008
@@ -24,7 +24,7 @@
 #ifndef __EV_STOCK_ICONS_H__
 #define __EV_STOCK_ICONS_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/shell/ev-window.c
==============================================================================
--- trunk/shell/ev-window.c	(original)
+++ trunk/shell/ev-window.c	Mon Oct 27 12:17:08 2008
@@ -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"