Merge lp:~charlesk/indicator-appmenu/nogtk2 into lp:indicator-appmenu/12.10

[Charles Kerr]

[Lars Karlitski (larsu)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-04-05 16:04:11 +0000
+++ configure.ac	2012-05-08 00:40:26 +0000
@@ -57,39 +57,18 @@
 # Dependencies
 ###########################
 
-GTK_REQUIRED_VERSION=2.12
-GTK3_REQUIRED_VERSION=3.0
+GTK_REQUIRED_VERSION=3.0
 GIO_REQUIRED_VERSION=2.26
 INDICATOR_REQUIRED_VERSION=0.3.90
 DBUSMENUGTK_REQUIRED_VERSION=0.5.90
 BAMF_REQUIRED_VERSION=0.2.53
 
-AC_ARG_WITH([gtk],
-  [AS_HELP_STRING([--with-gtk],
-    [Which version of gtk to use @<:@default=3@:>@])],
-  [],
-  [with_gtk=3])
-
-AS_IF([test "x$with_gtk" = x3],
-        [PKG_CHECK_MODULES(INDICATOR,  gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                       gio-2.0 >= $GIO_REQUIRED_VERSION
-                                       indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
-                                       dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                       libbamf3 >= $BAMF_REQUIRED_VERSION)
-         AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
-        ],
-      [test "x$with_gtk" = x2],
-        [PKG_CHECK_MODULES(INDICATOR,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                       gio-2.0 >= $GIO_REQUIRED_VERSION
-                                       indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
-                                       dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                                       libbamf >= $BAMF_REQUIRED_VERSION)
-        ],
-      [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
-)
-
-PKG_CHECK_MODULES(gtk, gtk+-3.0 >= $GTK3_REQUIRED_VERSION)
-
+PKG_CHECK_MODULES(gtk, gtk+-3.0 >= $GTK_REQUIRED_VERSION)
+PKG_CHECK_MODULES(INDICATOR,  gtk+-3.0 >= $GTK_REQUIRED_VERSION
+                              gio-2.0 >= $GIO_REQUIRED_VERSION
+                              indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
+                              dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                              libbamf3 >= $BAMF_REQUIRED_VERSION)
 AC_SUBST(INDICATOR_CFLAGS)
 AC_SUBST(INDICATOR_LIBS)
 

=== modified file 'src/gtkmodelmenuitem.c'
--- src/gtkmodelmenuitem.c	2012-03-21 15:42:18 +0000
+++ src/gtkmodelmenuitem.c	2012-05-08 00:40:26 +0000
@@ -63,7 +63,6 @@
     *requisition = 0;
 }
 
-#if HAVE_GTK3
 static void
 gtk_model_menu_item_draw_indicator (GtkCheckMenuItem *check_item,
                                     cairo_t          *cr)
@@ -74,18 +73,6 @@
     GTK_CHECK_MENU_ITEM_CLASS (gtk_model_menu_item_parent_class)
       ->draw_indicator (check_item, cr);
 }
-#else
-static void
-gtk_model_menu_item_draw_indicator (GtkCheckMenuItem *check_item,
-                                    GdkRectangle     *area)
-{
-  GtkModelMenuItem *item = GTK_MODEL_MENU_ITEM (check_item);
-
-  if (item->has_indicator)
-    GTK_CHECK_MENU_ITEM_CLASS (gtk_model_menu_item_parent_class)
-      ->draw_indicator (check_item, area);
-}
-#endif
 
 static void
 gtk_model_menu_item_set_active (GtkModelMenuItem *item,

=== modified file 'src/indicator-appmenu.c'
--- src/indicator-appmenu.c	2012-04-04 20:23:20 +0000
+++ src/indicator-appmenu.c	2012-05-08 00:40:26 +0000
@@ -532,12 +532,8 @@
 	            False,
 	            SubstructureRedirectMask | SubstructureNotifyMask,
 	            &xev);
-  gdk_flush ();
-#if GTK_CHECK_VERSION(3, 0, 0)
+	gdk_flush ();
 	gdk_error_trap_pop_ignored ();
-#else
-	gdk_error_trap_pop ();
-#endif
 
 	return;
 }

=== modified file 'src/window-menu-model.c'
--- src/window-menu-model.c	2012-03-21 14:05:28 +0000
+++ src/window-menu-model.c	2012-05-08 00:40:26 +0000
@@ -386,9 +386,7 @@
 static void
 item_inserted_cb (GtkContainer *menu,
                   GtkWidget    *widget,
-#ifdef HAVE_GTK3
                   gint          position,
-#endif
                   gpointer      data)
 {
 	if (g_object_get_data(G_OBJECT(widget), ENTRY_DATA) == NULL) {
@@ -422,11 +420,7 @@
 	g_object_ref_sink(menu->priv->win_menu);
 
 	menu->priv->win_menu_insert = g_signal_connect(G_OBJECT (menu->priv->win_menu),
-#ifdef HAVE_GTK3
 		"insert",
-#else
-		"child-added",
-#endif
 		G_CALLBACK (item_inserted_cb),
 		menu);
 	menu->priv->win_menu_remove = g_signal_connect (G_OBJECT (menu->priv->win_menu),