[gnome-applets] Bump gtk+ requirement to 2.20. Also removes the previous gtk version checks.



commit 1614274fcb96ed6d135c65ea3f52c9f58ea9805d
Author: Andre Klapper <a9016009 gmx de>
Date:   Fri Apr 23 16:52:45 2010 +0200

    Bump gtk+ requirement to 2.20.
    Also removes the previous gtk version checks.

 accessx-status/applet.c   |    9 +--------
 configure.in              |    2 +-
 drivemount/drive-button.c |    7 -------
 geyes/geyes.c             |    4 ----
 4 files changed, 2 insertions(+), 20 deletions(-)
---
diff --git a/accessx-status/applet.c b/accessx-status/applet.c
index 5cae700..ec62f02 100644
--- a/accessx-status/applet.c
+++ b/accessx-status/applet.c
@@ -983,11 +983,8 @@ accessx_status_applet_layout_box (AccessxStatusApplet *sapplet, GtkWidget *box,
 
 	gtk_widget_show (sapplet->box);
 	gtk_widget_show (GTK_WIDGET (sapplet->applet));
-#if GTK_CHECK_VERSION (2,20,0)
+
 	if (gtk_widget_get_realized (sapplet->box) &&
-#else
-	if (GTK_WIDGET_REALIZED (sapplet->box) &&
-#endif
             sapplet->initialized)
 		accessx_status_applet_update (sapplet, ACCESSX_STATUS_ALL, NULL);
 }
@@ -1290,11 +1287,7 @@ accessx_status_applet_fill (PanelApplet *applet)
 
 	sapplet = create_applet (applet);
 
-#if GTK_CHECK_VERSION (2,20,0)
 	if (!gtk_widget_get_realized (sapplet->box)) {
-#else
-	if (!GTK_WIDGET_REALIZED (sapplet->box)) {
-#endif
 		g_signal_connect_after (G_OBJECT (sapplet->box), 
 					"realize", G_CALLBACK (accessx_status_applet_realize), 
 					sapplet);
diff --git a/configure.in b/configure.in
index e69b921..030a31c 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ AC_CONFIG_MACRO_DIR(m4)
 dnl ***************************************************************************
 dnl *** Minimum library versions for GNOME-APPLETS                          ***
 dnl ***************************************************************************
-GTK_REQUIRED=2.18.0
+GTK_REQUIRED=2.20.0
 GLIB_REQUIRED=2.22.0
 GIO_REQUIRED=2.15.3
 GCONF_REQUIRED=2.8.0
diff --git a/drivemount/drive-button.c b/drivemount/drive-button.c
index 17d64e0..cb1a8b9 100644
--- a/drivemount/drive-button.c
+++ b/drivemount/drive-button.c
@@ -171,9 +171,7 @@ position_menu (GtkMenu *menu, gint *x, gint *y,
     GdkScreen *screen;
     gint twidth, theight, tx, ty;
     GtkAllocation allocation;
-#if GTK_CHECK_VERSION (2,20,0)
     GtkRequisition requisition;
-#endif
     GtkTextDirection direction;
     GdkRectangle monitor;
     gint monitor_num;
@@ -186,14 +184,9 @@ position_menu (GtkMenu *menu, gint *x, gint *y,
 
     direction = gtk_widget_get_direction (widget);
 
-#if GTK_CHECK_VERSION (2,20,0)
     gtk_widget_get_requisition (GTK_WIDGET (menu), &requisition);
     twidth = requisition.width;
     theight = requisition.height;
-#else
-    twidth = GTK_WIDGET (menu)->requisition.width;
-    theight = GTK_WIDGET (menu)->requisition.height;
-#endif
 
     screen = gtk_widget_get_screen (GTK_WIDGET (menu));
     monitor_num = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget));
diff --git a/geyes/geyes.c b/geyes/geyes.c
index 9e7e244..8114bce 100644
--- a/geyes/geyes.c
+++ b/geyes/geyes.c
@@ -154,11 +154,7 @@ timer_cb (EyesApplet *eyes_applet)
         gint i;
 
         for (i = 0; i < eyes_applet->num_eyes; i++) {
-#if GTK_CHECK_VERSION (2,20,0)
 		if (gtk_widget_get_realized (eyes_applet->eyes[i])) {
-#else
-		if (GTK_WIDGET_REALIZED (eyes_applet->eyes[i])) {
-#endif
 			gtk_widget_get_pointer (eyes_applet->eyes[i], 
 						&x, &y);
 			if ((x != eyes_applet->pointer_last_x[i]) || (y != eyes_applet->pointer_last_y[i])) { 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]