diff options
author | Christian 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) |
commit | 09d18721e3015b9e4cc448f1f3620da54784ebba (patch) | |
tree | a91e482d5a61a8bb4d5041acfd082f20fb214090 /cut-n-paste/zoom-control | |
parent | edd999ae3841b9f4224ebb4dbd8ec4ce182ce0e7 (diff) |
Bug 558064 – build with single includes
svn path=/trunk/; revision=3240
Diffstat (limited to 'cut-n-paste/zoom-control')
-rw-r--r-- | cut-n-paste/zoom-control/ephy-zoom-action.c | 6 | ||||
-rw-r--r-- | cut-n-paste/zoom-control/ephy-zoom-action.h | 2 | ||||
-rw-r--r-- | cut-n-paste/zoom-control/ephy-zoom-control.c | 7 | ||||
-rw-r--r-- | cut-n-paste/zoom-control/ephy-zoom-control.h | 2 |
4 files changed, 4 insertions, 13 deletions
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 |