Merge lp:~ted/indicator-applet/window-menus into lp:indicator-applet/0.4

[Ted Gould]

Adds a new build target for the appmenu indicator.

[Conor Curran (cjcurran)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-04-16 18:59:21 +0000
+++ .bzrignore	2010-04-30 15:05:27 +0000
@@ -137,3 +137,7 @@
 po/stamp-it
 src/Makefile
 src/Makefile.in
+data/GNOME_IndicatorAppletAppmenu.server
+data/GNOME_IndicatorAppletAppmenu.server.in
+src/indicator-applet-appmenu
+data/GNOME_IndicatorAppletComplete.server.in

=== added file 'data/GNOME_IndicatorAppletAppmenu.server.in.in'
--- data/GNOME_IndicatorAppletAppmenu.server.in.in	1970-01-01 00:00:00 +0000
+++ data/GNOME_IndicatorAppletAppmenu.server.in.in	2010-04-30 15:05:27 +0000
@@ -0,0 +1,28 @@
+<oaf_info>
+  <oaf_server iid="OAFIID:GNOME_IndicatorAppletAppmenu_Factory" type="exe"
+              location="@LIBEXECDIR@/indicator-applet-appmenu">
+
+    <oaf_attribute name="repo_ids" type="stringv">
+      <item value="IDL:Bonobo/GenericFactory:1.0"/>
+      <item value="IDL:Bonobo/Unknown:1.0"/>
+    </oaf_attribute>
+    <oaf_attribute name="name" type="string" value="Indicator Applet Appmenu Factory"/>
+    <oaf_attribute name="description" type="string" value="Indicator Applet Appmenu Factory"/>
+    <oaf_attribute name="bonobo:environment" type="stringv">
+       <item value="DBUS_SESSION_BUS_ADDRESS"/>
+    </oaf_attribute>
+  </oaf_server>
+
+  <oaf_server iid="OAFIID:GNOME_IndicatorAppletAppmenu" type="factory"
+              location="OAFIID:GNOME_IndicatorAppletAppmenu_Factory">
+
+    <oaf_attribute name="repo_ids" type="stringv">
+      <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
+      <item value="IDL:Bonobo/Control:1.0"/>
+      <item value="IDL:Bonobo/Unknown:1.0"/>
+    </oaf_attribute>
+    <oaf_attribute name="name" type="string" _value="Indicator Applet Appmenu"/>
+    <oaf_attribute name="description" type="string" _value="A applet containing the application menus."/>
+    <oaf_attribute name="panel:icon" type="string" value="indicator-applet"/>
+  </oaf_server>
+</oaf_info>

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2010-01-04 19:26:05 +0000
+++ data/Makefile.am	2010-04-30 15:05:27 +0000
@@ -9,6 +9,7 @@
 server_in_files =				\
 	GNOME_IndicatorApplet.server.in \
 	GNOME_IndicatorAppletComplete.server.in \
+	GNOME_IndicatorAppletAppmenu.server.in \
 	GNOME_FastUserSwitchApplet.server.in
 server_DATA =					\
 	$(server_in_files:.server.in=.server)
@@ -68,9 +69,7 @@
 
 EXTRA_DIST =					\
 	$(icons_DATA) \
-	GNOME_IndicatorApplet.server.in.in	\
-	GNOME_IndicatorAppletComplete.server.in.in	\
-	GNOME_FastUserSwitchApplet.server.in.in	\
+	$(server_in_files) \
 	$(schema_in_files)
 
 MAINTAINERCLEANFILES =				\

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2010-01-04 19:34:23 +0000
+++ po/POTFILES.in	2010-04-30 15:05:27 +0000
@@ -1,6 +1,7 @@
 [encoding: UTF-8]
-data/GNOME_IndicatorApplet.server.in.in
-data/GNOME_IndicatorAppletComplete.server.in.in
-data/GNOME_FastUserSwitchApplet.server.in.in
+data/GNOME_IndicatorApplet.server.in
+data/GNOME_IndicatorAppletAppmenu.server.in
+data/GNOME_IndicatorAppletComplete.server.in
+data/GNOME_FastUserSwitchApplet.server.in
 data/indicator-applet.schemas.in
 src/applet-main.c

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2008-10-30 17:31:31 +0000
+++ po/POTFILES.skip	2010-04-30 15:05:27 +0000
@@ -1,1 +1,5 @@
-data/GNOME_IndicatorApplet.server.in
+data/GNOME_FastUserSwitchApplet.server.in.in
+data/GNOME_IndicatorApplet.server.in.in
+data/GNOME_IndicatorAppletAppmenu.server.in.in
+data/GNOME_IndicatorAppletComplete.server.in.in
+

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-03-02 22:24:00 +0000
+++ src/Makefile.am	2010-04-30 15:05:27 +0000
@@ -1,6 +1,7 @@
 
 libexec_PROGRAMS = \
 	indicator-applet \
+	indicator-applet-appmenu \
 	indicator-applet-session \
 	indicator-applet-complete
 
@@ -23,6 +24,25 @@
 indicator_applet_LDADD = \
 	$(APPLET_LIBS)
 
+indicator_applet_appmenu_CFLAGS = \
+	-DG_LOG_DOMAIN=\""Indicator-Applet-Appmenu"\" \
+	-DDATADIR=\""$(datadir)"\" \
+	-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
+	-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
+	-DINDICATOR_APPLET_APPMENU \
+	-I$(srcdir)/.. \
+	$(APPLET_CFLAGS)
+
+indicator_applet_appmenu_SOURCES = \
+	applet-main.c \
+	eggaccelerators.c \
+	eggaccelerators.h \
+	tomboykeybinder.c \
+	tomboykeybinder.h
+
+indicator_applet_appmenu_LDADD = \
+	$(APPLET_LIBS)
+
 indicator_applet_session_CFLAGS = \
 	-DG_LOG_DOMAIN=\""Indicator-Applet-Session"\" \
 	-DDATADIR=\""$(datadir)"\" \

=== modified file 'src/applet-main.c'
--- src/applet-main.c	2010-04-19 02:21:44 +0000
+++ src/applet-main.c	2010-04-30 15:05:27 +0000
@@ -76,6 +76,12 @@
                "indicator-applet-complete", "0",
                applet_fill_cb, NULL);
 #endif
+#ifdef INDICATOR_APPLET_APPMENU
+PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_IndicatorAppletAppmenu_Factory",
+               PANEL_TYPE_APPLET,
+               "indicator-applet-appmenu", "0",
+               applet_fill_cb, NULL);
+#endif
 
 /*************
  * log files
@@ -89,6 +95,9 @@
 #ifdef INDICATOR_APPLET_COMPLETE
 #define LOG_FILE_NAME  "indicator-applet-complete.log"
 #endif
+#ifdef INDICATOR_APPLET_APPMENU
+#define LOG_FILE_NAME  "indicator-applet-appmenu.log"
+#endif
 GOutputStream * log_file = NULL;
 
 /*****************
@@ -103,6 +112,9 @@
 #ifdef INDICATOR_APPLET_COMPLETE
 gchar * hotkey_keycode = "<Super>S";
 #endif
+#ifdef INDICATOR_APPLET_APPMENU
+gchar * hotkey_keycode = "<Super>F1";
+#endif
 
 /*************
  * init function
@@ -443,6 +455,9 @@
 #ifdef INDICATOR_APPLET_SESSION
 		"comments", _("A place to adjust your status, change users or exit your session."),
 #else
+#ifdef INDICATOR_APPLET_APPMENU
+		"comments", _("An applet to hold your application menus."),
+#endif
 		"comments", _("An applet to hold all of the system indicators."),
 #endif
 		"authors", authors,
@@ -625,6 +640,9 @@
 #ifdef INDICATOR_APPLET_COMPLETE
 		g_set_application_name(_("Indicator Applet Complete"));
 #endif
+#ifdef INDICATOR_APPLET_APPMENU
+		g_set_application_name(_("Indicator Applet Application Menu"));
+#endif
 		
 		g_log_set_default_handler(log_to_file, NULL);
 
@@ -648,6 +666,10 @@
 	atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
 	                     "indicator-applet-complete");
 #endif
+#ifdef INDICATOR_APPLET_APPMENU
+	atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
+	                     "indicator-applet-appmenu");
+#endif
 
 	/* Init some theme/icon stuff */
 	gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
@@ -706,6 +728,15 @@
 
 		const gchar * name;
 		while ((name = g_dir_read_name(dir)) != NULL) {
+#ifdef INDICATOR_APPLET_APPMENU
+			if (g_strcmp0(name, "libappmenu.so")) {
+				continue;
+			}
+#else
+			if (!g_strcmp0(name, "libappmenu.so")) {
+				continue;
+			}
+#endif
 #ifdef INDICATOR_APPLET
 			if (!g_strcmp0(name, "libsession.so")) {
 				continue;