From 6eb44e9133dc234ce48cf27454575a3cebf0376d Mon Sep 17 00:00:00 2001
From: Michael Terry <michael.terry@canonical.com>
Date: Thu, 26 May 2011 11:54:30 -0400
Subject: port to gtk3; allow building with gtk2

---
 src/Makefile.am         | 4 ++--
 src/indicator-session.c | 5 +++++
 src/session-service.c   | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 4fa43b9..0317de7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,13 +69,13 @@ users-service-marshal.c: $(srcdir)/users-service.list
 
 gen-%.xml.c: %.xml
 	@echo "Building $@ from $<"
-	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@
+	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@
 	@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
 	@echo ";" >> $@
 
 gen-%.xml.h: %.xml
 	@echo "Building $@ from $<"
-	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@
+	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@
 
 #################
 # Session Stuff
diff --git a/src/indicator-session.c b/src/indicator-session.c
index e8a2f97..c9617c4 100644
--- a/src/indicator-session.c
+++ b/src/indicator-session.c
@@ -29,7 +29,12 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <libdbusmenu-gtk3/menu.h>
+#else
 #include <libdbusmenu-gtk/menu.h>
+#endif
 
 #include <libindicator/indicator.h>
 #include <libindicator/indicator-object.h>
diff --git a/src/session-service.c b/src/session-service.c
index dc53f74..ddcb7cb 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -36,7 +36,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <libdbusmenu-glib/server.h>
 #include <libdbusmenu-glib/menuitem.h>
 #include <libdbusmenu-glib/client.h>
-#include <libdbusmenu-gtk/menuitem.h>
+#include <libdbusmenu-gtk3/menuitem.h>
 
 #include <libindicator/indicator-service.h>
 
-- 
cgit v1.2.3