Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/cut-n-paste
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2008-10-27 12:17:08 (GMT)
committer Christian Persch <chpe@src.gnome.org>2008-10-27 12:17:08 (GMT)
commit09d18721e3015b9e4cc448f1f3620da54784ebba (patch)
treea91e482d5a61a8bb4d5041acfd082f20fb214090 /cut-n-paste
parentedd999ae3841b9f4224ebb4dbd8ec4ce182ce0e7 (diff)
Bug 558064 – build with single includes
svn path=/trunk/; revision=3240
Diffstat (limited to 'cut-n-paste')
-rw-r--r--cut-n-paste/evmountoperation/ev-mount-operation.h3
-rw-r--r--cut-n-paste/gedit-message-area/gedit-message-area.h2
-rw-r--r--cut-n-paste/toolbar-editor/egg-editable-toolbar.c21
-rw-r--r--cut-n-paste/toolbar-editor/egg-editable-toolbar.h7
-rw-r--r--cut-n-paste/toolbar-editor/egg-toolbar-editor.c8
-rw-r--r--cut-n-paste/toolbar-editor/egg-toolbar-editor.h3
-rw-r--r--cut-n-paste/toolbar-editor/egg-toolbars-model.c2
-rw-r--r--cut-n-paste/toolbar-editor/egg-toolbars-model.h2
-rw-r--r--cut-n-paste/toolbar-editor/eggtreemultidnd.c5
-rw-r--r--cut-n-paste/toolbar-editor/eggtreemultidnd.h4
-rw-r--r--cut-n-paste/zoom-control/ephy-zoom-action.c6
-rw-r--r--cut-n-paste/zoom-control/ephy-zoom-action.h2
-rw-r--r--cut-n-paste/zoom-control/ephy-zoom-control.c7
-rw-r--r--cut-n-paste/zoom-control/ephy-zoom-control.h2
14 files changed, 13 insertions, 61 deletions
diff --git a/cut-n-paste/evmountoperation/ev-mount-operation.h b/cut-n-paste/evmountoperation/ev-mount-operation.h
index bfb2836..efb9338 100644
--- 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 c53a800..711b64e 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 <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 d65b7eb..95b0add 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 <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 8a4e85e..8537ba8 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 <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 8671cd4..cd5f38f 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 <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 e29e548..b0d27aa 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 <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 17c6e41..fa19ec2 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 <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 6961ee4..c5529ad 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 <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 694e056..8fabd18 100644
--- 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 810d48e..3df69fb 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 <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 3aadf84..986e3ef 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 <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 77f9b41..47399db 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 <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 2f372d9..66efbaa 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 <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 6c2f5ba..b339a4d 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 <gtk/gtktoolitem.h>
+#include <gtk/gtk.h>
G_BEGIN_DECLS