Merge lp:~mterry/indicator-messages/gtk3 into lp:indicator-messages/0.5

[Michael Terry]

Builds with gtk3 by default, adds a configure flag to build with gtk2 if desired.

[Ted Gould (ted)]

Code looks fine. Worried about the dbusmenu-gtk3 includes though :-/ (see last review's comment).

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2011-04-07 17:10:43 +0000
+++ configure.ac	2011-05-26 17:27:55 +0000
@@ -36,17 +36,35 @@
 ###########################
 
 GTK_REQUIRED_VERSION=2.12
+GTK3_REQUIRED_VERSION=3.0
 GIO_UNIX_REQUIRED_VERSION=2.18
 PANEL_REQUIRED_VERSION=2.0.0
 INDICATE_REQUIRED_VERSION=0.4.90
 INDICATOR_REQUIRED_VERSION=0.3.19
 DBUSMENUGTK_REQUIRED_VERSION=0.3.94
 
-PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                          gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
-                          indicator >= $INDICATOR_REQUIRED_VERSION
-                          indicate-0.5 >= $INDICATE_REQUIRED_VERSION
-                          dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
+AC_ARG_WITH([indicator-gtk],
+  [AS_HELP_STRING([--with-indicator-gtk],
+    [Which version of gtk to use for the indicator @<:@default=3@:>@])],
+  [],
+  [with_indicator_gtk=3])
+
+AS_IF([test "x$with_indicator_gtk" = x3],
+        [PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                                   gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+                                   indicator3 >= $INDICATOR_REQUIRED_VERSION
+                                   indicate-0.5 >= $INDICATE_REQUIRED_VERSION
+                                   dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
+        ],
+      [test "x$with_indicator_gtk" = x2],
+        [PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                   gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
+                                   indicator >= $INDICATOR_REQUIRED_VERSION
+                                   indicate-0.5 >= $INDICATE_REQUIRED_VERSION
+                                   dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
+        ],
+      [AC_MSG_FAILURE([Value for --with-indicator-gtk was neither 2 nor 3])]
+)
 AC_SUBST(APPLET_CFLAGS)
 AC_SUBST(APPLET_LIBS)
 
@@ -64,9 +82,12 @@
 if test "x$with_localinstall" = "xyes"; then
 	INDICATORDIR="${libdir}/indicators/2/"
 	INDICATORICONSDIR="${datadir}/libindicate/icons/"
-else
+elif test "x$with_indicator_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 'src/indicator-messages.c'
--- src/indicator-messages.c	2011-02-17 18:04:32 +0000
+++ src/indicator-messages.c	2011-05-26 17:27:55 +0000
@@ -25,8 +25,14 @@
 #include <glib-object.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <libdbusmenu-gtk3/menu.h>
+#include <libdbusmenu-gtk3/menuitem.h>
+#else
 #include <libdbusmenu-gtk/menu.h>
 #include <libdbusmenu-gtk/menuitem.h>
+#endif
 
 #include <libindicator/indicator.h>
 #include <libindicator/indicator-object.h>