Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/cut-n-paste/zoom-control/ephy-zoom-control.c
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/zoom-control/ephy-zoom-control.c
parentedd999ae3841b9f4224ebb4dbd8ec4ce182ce0e7 (diff)
Bug 558064 – build with single includes
svn path=/trunk/; revision=3240
Diffstat (limited to 'cut-n-paste/zoom-control/ephy-zoom-control.c')
-rw-r--r--cut-n-paste/zoom-control/ephy-zoom-control.c7
1 files changed, 1 insertions, 6 deletions
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);