From: Christian Persch Date: Mon, 27 Oct 2008 12:17:08 +0000 (+0000) Subject: Bug 558064 – build with single includes X-Git-Tag: EVINCE_2_25_1~16 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=09d18721e3015b9e4cc448f1f3620da54784ebba;p=evince.git 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 a9559c22..3eafbfe6 100644 --- 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 +#include +#include #include -#include #include #define SCALE_FACTOR 0.2 diff --git a/backend/dvi/cairo-device.c b/backend/dvi/cairo-device.c index 992728dc..9a42e7b5 100644 --- a/backend/dvi/cairo-device.c +++ b/backend/dvi/cairo-device.c @@ -19,7 +19,7 @@ #include #include -#include +#include #ifdef HAVE_SPECTRE #include #endif diff --git a/cut-n-paste/evmountoperation/ev-mount-operation.h b/cut-n-paste/evmountoperation/ev-mount-operation.h index bfb2836a..efb93387 100644 --- a/cut-n-paste/evmountoperation/ev-mount-operation.h +++ b/cut-n-paste/evmountoperation/ev-mount-operation.h @@ -29,8 +29,7 @@ #include #include -#include -#include +#include 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 c53a800a..711b64e2 100644 --- 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 +#include 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 d65b7eb9..95b0addd 100644 --- 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.h b/cut-n-paste/toolbar-editor/egg-editable-toolbar.h index 8a4e85e7..8537ba80 100644 --- 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 -#include -#include -#include -#include -#include +#include 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 8671cd4c..cd5f38f2 100644 --- 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 #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.h b/cut-n-paste/toolbar-editor/egg-toolbar-editor.h index e29e5482..b0d27aa7 100644 --- 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 -#include +#include #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 17c6e414..fa19ec2a 100644 --- 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 #include #include -#include +#include 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 6961ee4e..c5529adc 100644 --- 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 #include -#include +#include G_BEGIN_DECLS diff --git a/cut-n-paste/toolbar-editor/eggtreemultidnd.c b/cut-n-paste/toolbar-editor/eggtreemultidnd.c index 694e0565..8fabd18b 100644 --- a/cut-n-paste/toolbar-editor/eggtreemultidnd.c +++ b/cut-n-paste/toolbar-editor/eggtreemultidnd.c @@ -19,10 +19,7 @@ #include #include -#include -#include -#include -#include +#include #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 810d48ea..3df69fba 100644 --- 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 -#include -#include +#include 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 3aadf84e..986e3ef8 100644 --- 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 #include -#include -#include -#include -#include -#include +#include #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 77f9b415..47399db9 100644 --- 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 +#include 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 2f372d90..66efbaad 100644 --- 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 -#include -#if !GTK_CHECK_VERSION (2, 11, 5) -#include -#endif #include #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 6c2f5ba8..b339a4df 100644 --- 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 +#include G_BEGIN_DECLS diff --git a/libdocument/ev-async-renderer.h b/libdocument/ev-async-renderer.h index 9aa96573..e516a053 100644 --- a/libdocument/ev-async-renderer.h +++ b/libdocument/ev-async-renderer.h @@ -23,7 +23,7 @@ #include #include -#include +#include G_BEGIN_DECLS diff --git a/libdocument/ev-document-factory.c b/libdocument/ev-document-factory.c index a920be60..12558331 100644 --- a/libdocument/ev-document-factory.c +++ b/libdocument/ev-document-factory.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #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 5fdb670f..4c31dc7f 100644 --- a/libdocument/ev-document-misc.h +++ b/libdocument/ev-document-misc.h @@ -25,7 +25,7 @@ #include #include -#include +#include G_BEGIN_DECLS diff --git a/libdocument/ev-image.h b/libdocument/ev-image.h index 8b5b595e..e603010f 100644 --- a/libdocument/ev-image.h +++ b/libdocument/ev-image.h @@ -21,7 +21,7 @@ #define __EV_IMAGE_H__ #include -#include +#include G_BEGIN_DECLS diff --git a/libdocument/ev-selection.h b/libdocument/ev-selection.h index 0b2f41be..59f731c0 100644 --- a/libdocument/ev-selection.h +++ b/libdocument/ev-selection.h @@ -23,7 +23,6 @@ #include #include -#include #include #include "ev-document.h" diff --git a/shell/ev-properties-fonts.h b/shell/ev-properties-fonts.h index 5d6bf349..f2bc2fe9 100644 --- a/shell/ev-properties-fonts.h +++ b/shell/ev-properties-fonts.h @@ -23,7 +23,7 @@ #include "ev-document.h" -#include +#include G_BEGIN_DECLS diff --git a/shell/ev-stock-icons.h b/shell/ev-stock-icons.h index b3455de5..752f1c82 100644 --- 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 +#include G_BEGIN_DECLS diff --git a/shell/ev-window.c b/shell/ev-window.c index ca4f81b5..0205bc45 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include "egg-editable-toolbar.h"