Merge lp:~mterry/indicator-appmenu/gtk3 into lp:indicator-appmenu/0.3

[Michael Terry]

Port to gtk3 (needs bamf port merged first)

[Ted Gould (ted)]

Can't test without the BAMF update but in review this looks fine.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2011-04-14 21:09:13 +0000
+++ configure.ac	2011-06-07 19:42:23 +0000
@@ -47,16 +47,34 @@
 ###########################
 
 GTK_REQUIRED_VERSION=2.12
+GTK3_REQUIRED_VERSION=3.0
 GIO_REQUIRED_VERSION=2.26
 INDICATOR_REQUIRED_VERSION=0.3.19
 DBUSMENUGTK_REQUIRED_VERSION=0.3.3
 BAMF_REQUIRED_VERSION=0.2.53
 
-PKG_CHECK_MODULES(INDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                             gio-2.0 >= $GIO_REQUIRED_VERSION
-                             indicator >= $INDICATOR_REQUIRED_VERSION
-                             dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
-                             libbamf >= $BAMF_REQUIRED_VERSION)
+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 >= $INDICATOR_REQUIRED_VERSION
+                                       dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
+                                       libbamf3 >= $BAMF_REQUIRED_VERSION)
+        ],
+      [test "x$with_gtk" = x2],
+        [PKG_CHECK_MODULES(INDICATOR,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                       gio-2.0 >= $GIO_REQUIRED_VERSION
+                                       indicator >= $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])]
+)
 
 AC_SUBST(INDICATOR_CFLAGS)
 AC_SUBST(INDICATOR_LIBS)
@@ -94,9 +112,12 @@
 if test "x$with_localinstall" = "xyes"; then
 	INDICATORDIR="${libdir}/indicators/3/"
 	INDICATORICONSDIR="${datadir}/libindicate/icons/"
-else
+elif test "x$with_gtk" = x2; then
 	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
 	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
+else
+	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3`
+	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3`
 fi
 AC_SUBST(INDICATORDIR)
 AC_SUBST(INDICATORICONSDIR)

=== modified file 'scripts/menu-pusher.c'
--- scripts/menu-pusher.c	2011-01-12 20:08:25 +0000
+++ scripts/menu-pusher.c	2011-06-07 19:42:23 +0000
@@ -23,7 +23,11 @@
 #include <gio/gio.h>
 #include <libdbusmenu-glib/menuitem.h>
 #include <libdbusmenu-glib/server.h>
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <libdbusmenu-gtk3/menuitem.h>
+#else
 #include <libdbusmenu-gtk/menuitem.h>
+#endif
 #include "../src/dbus-shared.h"
 
 int

=== modified file 'src/indicator-appmenu.c'
--- src/indicator-appmenu.c	2011-04-07 15:43:16 +0000
+++ src/indicator-appmenu.c	2011-06-07 19:42:23 +0000
@@ -680,7 +680,11 @@
 	            SubstructureRedirectMask | SubstructureNotifyMask,
 	            &xev);
   gdk_flush ();
+#if GTK_CHECK_VERSION(3, 0, 0)
+	gdk_error_trap_pop_ignored ();
+#else
 	gdk_error_trap_pop ();
+#endif
 
 	return;
 }

=== modified file 'src/window-menus.c'
--- src/window-menus.c	2011-04-15 19:09:56 +0000
+++ src/window-menus.c	2011-06-07 19:42:23 +0000
@@ -23,7 +23,13 @@
 #include "config.h"
 #endif
 
+#include <gtk/gtk.h>
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <libdbusmenu-gtk3/menu.h>
+#else
 #include <libdbusmenu-gtk/menu.h>
+#endif
 #include <glib.h>
 #include <gio/gio.h>