Indicator Applet

Merge lp:~mterry/indicator-applet/libpanel-applet-3 into lp:indicator-applet/0.4

  1. libpanel-applet-3
  2. Merge into applet
Proposed by Michael Terry on 2010-11-10
Status: Merged
Merged at revision: 375
Proposed branch: lp:~mterry/indicator-applet/libpanel-applet-3
Merge into: lp:indicator-applet/0.4
Diff against target: 445 lines (+131/-170)
13 files modified
configure.ac (+3/-4)
data/Makefile.am (+41/-26)
data/org.ayatana.panel.FastUserSwitchApplet.panel-applet.in.in (+11/-28)
data/org.ayatana.panel.IndicatorApplet.panel-applet.in.in (+11/-28)
data/org.ayatana.panel.IndicatorAppletAppmenu.panel-applet.in.in (+11/-28)
data/org.ayatana.panel.IndicatorAppletComplete.panel-applet.in.in (+11/-28)
data/org.gnome.panel.applet.FastUserSwitchAppletFactory.service.in (+3/-0)
data/org.gnome.panel.applet.IndicatorAppletAppmenuFactory.service.in (+3/-0)
data/org.gnome.panel.applet.IndicatorAppletCompleteFactory.service.in (+3/-0)
data/org.gnome.panel.applet.IndicatorAppletFactory.service.in (+3/-0)
po/POTFILES.in (+4/-4)
po/POTFILES.skip (+4/-5)
src/applet-main.c (+23/-19)
To merge this branch: bzr merge lp:~mterry/indicator-applet/libpanel-applet-3
Reviewer Review Type Date Requested Status
Ted Gould (community) 2010-11-10 Approve on 2011-01-06
Review via email: mp+40564@code.launchpad.net
To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

the code has been uploaded to natty now for testing

Ted Gould (ted) wrote :

Hasn't broken in Natty. Distchecks for me as well now that I'm on Natty. Looks clean, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2010-10-07 16:02:37 +0000
3+++ configure.ac 2010-11-10 18:30:23 +0000
4@@ -26,13 +26,12 @@
5 ###########################
6
7 GTK_REQUIRED_VERSION=2.12
8-PANEL_REQUIRED_VERSION=2.0.0
9-DBUS_REQUIRED_VERSION=0.76
10 INDICATOR_REQUIRED_VERSION=0.3.14
11
12 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
13- libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
14- indicator >= $INDICATOR_REQUIRED_VERSION)
15+ x11
16+ libpanelapplet-3.0
17+ indicator >= $INDICATOR_REQUIRED_VERSION)
18 AC_SUBST(APPLET_CFLAGS)
19 AC_SUBST(APPLET_LIBS)
20
21
22=== modified file 'data/Makefile.am'
23--- data/Makefile.am 2010-10-07 16:02:37 +0000
24+++ data/Makefile.am 2010-11-10 18:30:23 +0000
25@@ -1,26 +1,41 @@
26 # This file will be processed with automake to create Makefile.in
27
28 ##############################
29-# Bonobo .server
30-##############################
31-
32-serverdir = \
33- $(libdir)/bonobo/servers
34-server_in_files = \
35- GNOME_IndicatorApplet.server.in \
36- GNOME_IndicatorAppletComplete.server.in \
37- GNOME_IndicatorAppletAppmenu.server.in \
38- GNOME_FastUserSwitchApplet.server.in
39-server_DATA = \
40- $(server_in_files:.server.in=.server)
41-
42-%.server.in: %.server.in.in
43- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
44-
45-server_in_in_files = \
46- $(server_in_files:.server.in=.server.in.in)
47-
48-@INTLTOOL_SERVER_RULE@
49+# Applets
50+##############################
51+
52+appletdir = $(datadir)/gnome-panel/applets
53+applet_in_files = \
54+ org.ayatana.panel.IndicatorApplet.panel-applet.in \
55+ org.ayatana.panel.IndicatorAppletComplete.panel-applet.in \
56+ org.ayatana.panel.IndicatorAppletAppmenu.panel-applet.in \
57+ org.ayatana.panel.FastUserSwitchApplet.panel-applet.in
58+applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
59+
60+%.panel-applet.in: %.panel-applet.in.in Makefile
61+ $(AM_V_GEN)sed \
62+ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
63+ $< > $@
64+
65+%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
66+
67+
68+##############################
69+# DBus Services
70+##############################
71+
72+servicedir = $(datadir)/dbus-1/services
73+service_in_files = \
74+ org.gnome.panel.applet.IndicatorAppletFactory.service.in \
75+ org.gnome.panel.applet.IndicatorAppletCompleteFactory.service.in \
76+ org.gnome.panel.applet.IndicatorAppletAppmenuFactory.service.in \
77+ org.gnome.panel.applet.FastUserSwitchAppletFactory.service.in
78+service_DATA = $(service_in_files:.service.in=.service)
79+
80+%.service: %.service.in Makefile
81+ $(AM_V_GEN)sed \
82+ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
83+ $< > $@
84
85
86 ##############################
87@@ -50,15 +65,15 @@
88 ##############################
89
90 CLEANFILES = \
91- $(server_in_files) \
92- $(server_DATA) \
93- $(schema_DATA) \
94+ $(applet_in_files) \
95+ $(applet_DATA) \
96+ $(service_DATA) \
97 *.bak
98
99 EXTRA_DIST = \
100- $(icons_DATA) \
101- $(server_in_in_files) \
102- $(schema_in_files)
103+ $(icons_DATA) \
104+ $(applet_in_files:.in=.in.in) \
105+ $(service_in_files)
106
107 MAINTAINERCLEANFILES = \
108 Makefile.in
109
110=== renamed file 'data/GNOME_FastUserSwitchApplet.server.in.in' => 'data/org.ayatana.panel.FastUserSwitchApplet.panel-applet.in.in'
111--- data/GNOME_FastUserSwitchApplet.server.in.in 2009-08-18 15:49:06 +0000
112+++ data/org.ayatana.panel.FastUserSwitchApplet.panel-applet.in.in 2010-11-10 18:30:23 +0000
113@@ -1,28 +1,11 @@
114-<oaf_info>
115- <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet_Factory" type="exe"
116- location="@LIBEXECDIR@/indicator-applet-session">
117-
118- <oaf_attribute name="repo_ids" type="stringv">
119- <item value="IDL:Bonobo/GenericFactory:1.0"/>
120- <item value="IDL:Bonobo/Unknown:1.0"/>
121- </oaf_attribute>
122- <oaf_attribute name="name" type="string" value="Indicator Applet Factory"/>
123- <oaf_attribute name="description" type="string" value="Indicator Applet Factory"/>
124- <oaf_attribute name="bonobo:environment" type="stringv">
125- <item value="DBUS_SESSION_BUS_ADDRESS"/>
126- </oaf_attribute>
127- </oaf_server>
128-
129- <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet" type="factory"
130- location="OAFIID:GNOME_FastUserSwitchApplet_Factory">
131-
132- <oaf_attribute name="repo_ids" type="stringv">
133- <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
134- <item value="IDL:Bonobo/Control:1.0"/>
135- <item value="IDL:Bonobo/Unknown:1.0"/>
136- </oaf_attribute>
137- <oaf_attribute name="name" type="string" _value="Indicator Applet Session"/>
138- <oaf_attribute name="description" type="string" _value="A place to adjust your status, change users or exit your session."/>
139- <oaf_attribute name="panel:icon" type="string" value="indicator-applet"/>
140- </oaf_server>
141-</oaf_info>
142+[Applet Factory]
143+Id=FastUserSwitchAppletFactory
144+Location=@LIBEXECDIR@/indicator-applet-session
145+Name=Indicator Applet Factory
146+Description=Indicator Applet Factory
147+
148+[FastUserSwitchApplet]
149+_Name=Indicator Applet Session
150+_Description=A place to adjust your status, change users or exit your session.
151+Icon=indicator-applet
152+BonoboId=OAFIID:GNOME_FastUserSwitchApplet
153
154=== renamed file 'data/GNOME_IndicatorApplet.server.in.in' => 'data/org.ayatana.panel.IndicatorApplet.panel-applet.in.in'
155--- data/GNOME_IndicatorApplet.server.in.in 2009-03-27 19:41:02 +0000
156+++ data/org.ayatana.panel.IndicatorApplet.panel-applet.in.in 2010-11-10 18:30:23 +0000
157@@ -1,28 +1,11 @@
158-<oaf_info>
159- <oaf_server iid="OAFIID:GNOME_IndicatorApplet_Factory" type="exe"
160- location="@LIBEXECDIR@/indicator-applet">
161-
162- <oaf_attribute name="repo_ids" type="stringv">
163- <item value="IDL:Bonobo/GenericFactory:1.0"/>
164- <item value="IDL:Bonobo/Unknown:1.0"/>
165- </oaf_attribute>
166- <oaf_attribute name="name" type="string" value="Indicator Applet Factory"/>
167- <oaf_attribute name="description" type="string" value="Indicator Applet Factory"/>
168- <oaf_attribute name="bonobo:environment" type="stringv">
169- <item value="DBUS_SESSION_BUS_ADDRESS"/>
170- </oaf_attribute>
171- </oaf_server>
172-
173- <oaf_server iid="OAFIID:GNOME_IndicatorApplet" type="factory"
174- location="OAFIID:GNOME_IndicatorApplet_Factory">
175-
176- <oaf_attribute name="repo_ids" type="stringv">
177- <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
178- <item value="IDL:Bonobo/Control:1.0"/>
179- <item value="IDL:Bonobo/Unknown:1.0"/>
180- </oaf_attribute>
181- <oaf_attribute name="name" type="string" _value="Indicator Applet"/>
182- <oaf_attribute name="description" type="string" _value="An indicator of something that needs your attention on the desktop"/>
183- <oaf_attribute name="panel:icon" type="string" value="indicator-applet"/>
184- </oaf_server>
185-</oaf_info>
186+[Applet Factory]
187+Id=IndicatorAppletFactory
188+Location=@LIBEXECDIR@/indicator-applet
189+Name=Indicator Applet Factory
190+Description=Indicator Applet Factory
191+
192+[IndicatorApplet]
193+_Name=Indicator Applet
194+_Description=An indicator of something that needs your attention on the desktop
195+Icon=indicator-applet
196+BonoboId=OAFIID:GNOME_IndicatorApplet
197
198=== renamed file 'data/GNOME_IndicatorAppletAppmenu.server.in.in' => 'data/org.ayatana.panel.IndicatorAppletAppmenu.panel-applet.in.in'
199--- data/GNOME_IndicatorAppletAppmenu.server.in.in 2010-04-26 15:51:08 +0000
200+++ data/org.ayatana.panel.IndicatorAppletAppmenu.panel-applet.in.in 2010-11-10 18:30:23 +0000
201@@ -1,28 +1,11 @@
202-<oaf_info>
203- <oaf_server iid="OAFIID:GNOME_IndicatorAppletAppmenu_Factory" type="exe"
204- location="@LIBEXECDIR@/indicator-applet-appmenu">
205-
206- <oaf_attribute name="repo_ids" type="stringv">
207- <item value="IDL:Bonobo/GenericFactory:1.0"/>
208- <item value="IDL:Bonobo/Unknown:1.0"/>
209- </oaf_attribute>
210- <oaf_attribute name="name" type="string" value="Indicator Applet Appmenu Factory"/>
211- <oaf_attribute name="description" type="string" value="Indicator Applet Appmenu Factory"/>
212- <oaf_attribute name="bonobo:environment" type="stringv">
213- <item value="DBUS_SESSION_BUS_ADDRESS"/>
214- </oaf_attribute>
215- </oaf_server>
216-
217- <oaf_server iid="OAFIID:GNOME_IndicatorAppletAppmenu" type="factory"
218- location="OAFIID:GNOME_IndicatorAppletAppmenu_Factory">
219-
220- <oaf_attribute name="repo_ids" type="stringv">
221- <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
222- <item value="IDL:Bonobo/Control:1.0"/>
223- <item value="IDL:Bonobo/Unknown:1.0"/>
224- </oaf_attribute>
225- <oaf_attribute name="name" type="string" _value="Indicator Applet Appmenu"/>
226- <oaf_attribute name="description" type="string" _value="A applet containing the application menus."/>
227- <oaf_attribute name="panel:icon" type="string" value="indicator-applet"/>
228- </oaf_server>
229-</oaf_info>
230+[Applet Factory]
231+Id=IndicatorAppletAppmenuFactory
232+Location=@LIBEXECDIR@/indicator-applet-appmenu
233+Name=Indicator Applet Appmenu Factory
234+Description=Indicator Applet Appmenu Factory
235+
236+[IndicatorAppletAppmenu]
237+_Name=Indicator Applet Appmenu
238+_Description=A applet containing the application menus.
239+Icon=indicator-applet
240+BonoboId=OAFIID:GNOME_IndicatorAppletAppmenu
241
242=== renamed file 'data/GNOME_IndicatorAppletComplete.server.in.in' => 'data/org.ayatana.panel.IndicatorAppletComplete.panel-applet.in.in'
243--- data/GNOME_IndicatorAppletComplete.server.in.in 2010-01-04 20:35:15 +0000
244+++ data/org.ayatana.panel.IndicatorAppletComplete.panel-applet.in.in 2010-11-10 18:30:23 +0000
245@@ -1,28 +1,11 @@
246-<oaf_info>
247- <oaf_server iid="OAFIID:GNOME_IndicatorAppletComplete_Factory" type="exe"
248- location="@LIBEXECDIR@/indicator-applet-complete">
249-
250- <oaf_attribute name="repo_ids" type="stringv">
251- <item value="IDL:Bonobo/GenericFactory:1.0"/>
252- <item value="IDL:Bonobo/Unknown:1.0"/>
253- </oaf_attribute>
254- <oaf_attribute name="name" type="string" value="Indicator Applet Complete Factory"/>
255- <oaf_attribute name="description" type="string" value="Indicator Applet Complete Factory"/>
256- <oaf_attribute name="bonobo:environment" type="stringv">
257- <item value="DBUS_SESSION_BUS_ADDRESS"/>
258- </oaf_attribute>
259- </oaf_server>
260-
261- <oaf_server iid="OAFIID:GNOME_IndicatorAppletComplete" type="factory"
262- location="OAFIID:GNOME_IndicatorAppletComplete_Factory">
263-
264- <oaf_attribute name="repo_ids" type="stringv">
265- <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
266- <item value="IDL:Bonobo/Control:1.0"/>
267- <item value="IDL:Bonobo/Unknown:1.0"/>
268- </oaf_attribute>
269- <oaf_attribute name="name" type="string" _value="Indicator Applet Complete"/>
270- <oaf_attribute name="description" type="string" _value="A unified applet containing all of the indicators."/>
271- <oaf_attribute name="panel:icon" type="string" value="indicator-applet"/>
272- </oaf_server>
273-</oaf_info>
274+[Applet Factory]
275+Id=IndicatorAppletCompleteFactory
276+Location=@LIBEXECDIR@/indicator-applet-complete
277+Name=Indicator Applet Complete Factory
278+Description=Indicator Applet Complete Factory
279+
280+[IndicatorAppletComplete]
281+_Name=Indicator Applet Complete
282+_Description=A unified applet containing all of the indicators.
283+Icon=indicator-applet
284+BonoboId=OAFIID:GNOME_IndicatorAppletComplete
285
286=== added file 'data/org.gnome.panel.applet.FastUserSwitchAppletFactory.service.in'
287--- data/org.gnome.panel.applet.FastUserSwitchAppletFactory.service.in 1970-01-01 00:00:00 +0000
288+++ data/org.gnome.panel.applet.FastUserSwitchAppletFactory.service.in 2010-11-10 18:30:23 +0000
289@@ -0,0 +1,3 @@
290+[D-BUS Service]
291+Name=org.gnome.panel.applet.FastUserSwitchAppletFactory
292+Exec=@LIBEXECDIR@/indicator-applet-session
293
294=== added file 'data/org.gnome.panel.applet.IndicatorAppletAppmenuFactory.service.in'
295--- data/org.gnome.panel.applet.IndicatorAppletAppmenuFactory.service.in 1970-01-01 00:00:00 +0000
296+++ data/org.gnome.panel.applet.IndicatorAppletAppmenuFactory.service.in 2010-11-10 18:30:23 +0000
297@@ -0,0 +1,3 @@
298+[D-BUS Service]
299+Name=org.gnome.panel.applet.IndicatorAppletAppmenuFactory
300+Exec=@LIBEXECDIR@/indicator-applet-appmenu
301
302=== added file 'data/org.gnome.panel.applet.IndicatorAppletCompleteFactory.service.in'
303--- data/org.gnome.panel.applet.IndicatorAppletCompleteFactory.service.in 1970-01-01 00:00:00 +0000
304+++ data/org.gnome.panel.applet.IndicatorAppletCompleteFactory.service.in 2010-11-10 18:30:23 +0000
305@@ -0,0 +1,3 @@
306+[D-BUS Service]
307+Name=org.gnome.panel.applet.IndicatorAppletCompleteFactory
308+Exec=@LIBEXECDIR@/indicator-applet-complete
309
310=== added file 'data/org.gnome.panel.applet.IndicatorAppletFactory.service.in'
311--- data/org.gnome.panel.applet.IndicatorAppletFactory.service.in 1970-01-01 00:00:00 +0000
312+++ data/org.gnome.panel.applet.IndicatorAppletFactory.service.in 2010-11-10 18:30:23 +0000
313@@ -0,0 +1,3 @@
314+[D-BUS Service]
315+Name=org.gnome.panel.applet.IndicatorAppletFactory
316+Exec=@LIBEXECDIR@/indicator-applet
317
318=== modified file 'po/POTFILES.in'
319--- po/POTFILES.in 2010-10-07 16:02:37 +0000
320+++ po/POTFILES.in 2010-11-10 18:30:23 +0000
321@@ -1,6 +1,6 @@
322 [encoding: UTF-8]
323-data/GNOME_IndicatorApplet.server.in.in
324-data/GNOME_IndicatorAppletAppmenu.server.in.in
325-data/GNOME_IndicatorAppletComplete.server.in.in
326-data/GNOME_FastUserSwitchApplet.server.in.in
327+[type: gettext/keys]data/org.ayatana.panel.IndicatorApplet.panel-applet.in.in
328+[type: gettext/keys]data/org.ayatana.panel.IndicatorAppletComplete.panel-applet.in.in
329+[type: gettext/keys]data/org.ayatana.panel.IndicatorAppletAppmenu.panel-applet.in.in
330+[type: gettext/keys]data/org.ayatana.panel.FastUserSwitchApplet.panel-applet.in.in
331 src/applet-main.c
332
333=== modified file 'po/POTFILES.skip'
334--- po/POTFILES.skip 2010-04-27 22:02:31 +0000
335+++ po/POTFILES.skip 2010-11-10 18:30:23 +0000
336@@ -1,5 +1,4 @@
337-data/GNOME_FastUserSwitchApplet.server.in.in
338-data/GNOME_IndicatorApplet.server.in.in
339-data/GNOME_IndicatorAppletAppmenu.server.in.in
340-data/GNOME_IndicatorAppletComplete.server.in.in
341-
342+data/org.ayatana.panel.IndicatorApplet.panel-applet.in
343+data/org.ayatana.panel.IndicatorAppletComplete.panel-applet.in
344+data/org.ayatana.panel.IndicatorAppletAppmenu.panel-applet.in
345+data/org.ayatana.panel.FastUserSwitchApplet.panel-applet.in
346
347=== modified file 'src/applet-main.c'
348--- src/applet-main.c 2010-09-19 18:07:34 +0000
349+++ src/applet-main.c 2010-11-10 18:30:23 +0000
350@@ -21,7 +21,9 @@
351 */
352
353 #include <stdlib.h>
354+#include <string.h>
355 #include <config.h>
356+#include <glib/gi18n.h>
357 #include <panel-applet.h>
358 #include <gdk/gdkkeysyms.h>
359
360@@ -59,27 +61,27 @@
361 * ***********/
362
363 #ifdef INDICATOR_APPLET
364-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_IndicatorApplet_Factory",
365+PANEL_APPLET_OUT_PROCESS_FACTORY ("IndicatorAppletFactory",
366 PANEL_TYPE_APPLET,
367- "indicator-applet", "0",
368+ "indicator-applet",
369 applet_fill_cb, NULL);
370 #endif
371 #ifdef INDICATOR_APPLET_SESSION
372-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FastUserSwitchApplet_Factory",
373+PANEL_APPLET_OUT_PROCESS_FACTORY ("FastUserSwitchAppletFactory",
374 PANEL_TYPE_APPLET,
375- "indicator-applet-session", "0",
376+ "indicator-applet-session",
377 applet_fill_cb, NULL);
378 #endif
379 #ifdef INDICATOR_APPLET_COMPLETE
380-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_IndicatorAppletComplete_Factory",
381+PANEL_APPLET_OUT_PROCESS_FACTORY ("IndicatorAppletCompleteFactory",
382 PANEL_TYPE_APPLET,
383- "indicator-applet-complete", "0",
384+ "indicator-applet-complete",
385 applet_fill_cb, NULL);
386 #endif
387 #ifdef INDICATOR_APPLET_APPMENU
388-PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_IndicatorAppletAppmenu_Factory",
389+PANEL_APPLET_OUT_PROCESS_FACTORY ("IndicatorAppletAppmenuFactory",
390 PANEL_TYPE_APPLET,
391- "indicator-applet-appmenu", "0",
392+ "indicator-applet-appmenu",
393 applet_fill_cb, NULL);
394 #endif
395
396@@ -504,9 +506,8 @@
397 }
398
399 static void
400-about_cb (BonoboUIComponent *ui_container G_GNUC_UNUSED,
401- gpointer data G_GNUC_UNUSED,
402- const gchar *cname G_GNUC_UNUSED)
403+about_cb (GtkAction *action G_GNUC_UNUSED,
404+ gpointer data G_GNUC_UNUSED)
405 {
406 static const gchar *authors[] = {
407 "Ted Gould <ted@canonical.com>",
408@@ -687,18 +688,15 @@
409 applet_fill_cb (PanelApplet * applet, const gchar * iid G_GNUC_UNUSED,
410 gpointer data G_GNUC_UNUSED)
411 {
412- static const BonoboUIVerb menu_verbs[] = {
413- BONOBO_UI_VERB ("IndicatorAppletAbout", about_cb),
414- BONOBO_UI_VERB_END
415+ static const GtkActionEntry menu_actions[] = {
416+ {"About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, G_CALLBACK(about_cb)}
417 };
418- static const gchar * menu_xml =
419- "<popup name=\"button3\">"
420- "<menuitem name=\"About Item\" verb=\"IndicatorAppletAbout\" _label=\"" N_("_About") "\" pixtype=\"stock\" pixname=\"gtk-about\"/>"
421- "</popup>";
422+ static const gchar *menu_xml = "<menuitem name=\"About\" action=\"About\"/>";
423
424 static gboolean first_time = FALSE;
425 GtkWidget *menubar;
426 gint indicators_loaded = 0;
427+ GtkActionGroup *action_group;
428
429 #ifdef INDICATOR_APPLET_SESSION
430 /* check if we are running stracciatella session */
431@@ -733,7 +731,13 @@
432 gtk_container_set_border_width(GTK_CONTAINER (applet), 0);
433 panel_applet_set_flags(applet, PANEL_APPLET_EXPAND_MINOR);
434 menubar = gtk_menu_bar_new();
435- panel_applet_setup_menu(applet, menu_xml, menu_verbs, menubar);
436+ action_group = gtk_action_group_new ("Indicator Applet Actions");
437+ gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
438+ gtk_action_group_add_actions (action_group, menu_actions,
439+ G_N_ELEMENTS (menu_actions),
440+ menubar);
441+ panel_applet_setup_menu(applet, menu_xml, action_group);
442+ g_object_unref(action_group);
443 #ifdef INDICATOR_APPLET
444 atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (applet)),
445 "indicator-applet");

Subscribers

People subscribed via source and target branches

to status/vote changes: