Application Menu Indicator

Merge lp:~indicator-applet-developers/indicator-appmenu/ubuntu into lp:~ubuntu-desktop/indicator-appmenu/ubuntu

  1. ubuntu
  2. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: 50
Proposed branch: lp:~indicator-applet-developers/indicator-appmenu/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-appmenu/ubuntu
Diff against target: 380 lines (+106/-15)
11 files modified
AUTHORS (+1/-0)
ChangeLog (+37/-0)
configure (+11/-11)
configure.ac (+3/-3)
debian/changelog (+8/-0)
debian/control (+1/-1)
src/indicator-appmenu-marshal.c (+2/-0)
src/indicator-appmenu-marshal.list (+1/-0)
src/indicator-appmenu.c (+20/-0)
src/window-menus.c (+20/-0)
src/window-menus.h (+2/-0)
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-appmenu/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+50226@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2011-01-20 14:47:06 +0000
3+++ AUTHORS 2011-02-17 20:33:53 +0000
4@@ -5,6 +5,7 @@
5 David Barth
6 jassmith@gmail.com
7 Ken VanDine
8+ Luke Yelavich
9 Michael Terry
10 Neil Jagdish Patel
11 Ted Gould
12
13=== modified file 'ChangeLog'
14--- ChangeLog 2011-02-11 15:59:09 +0000
15+++ ChangeLog 2011-02-17 20:33:53 +0000
16@@ -1,5 +1,42 @@
17 # Generated by Makefile. Do not edit.
18
19+2011-02-17 Ted Gould <ted@gould.cx>
20+
21+ 0.1.95
22+
23+2011-02-17 Ted Gould <ted@gould.cx>
24+
25+ Adding in support for accessible descriptions
26+
27+2011-02-17 Ted Gould <ted@gould.cx>
28+
29+ Bumping libindicator to 0.3.19
30+
31+2011-02-17 Ted Gould <ted@gould.cx>
32+
33+ Connect to the update signal in the window menus object and pass it up the indicator stack
34+
35+2011-02-17 Ted Gould <ted@gould.cx>
36+
37+ Emitting the a11y update signal when the label updates
38+
39+2011-02-17 Ted Gould <ted@gould.cx>
40+
41+ Adding a field to the WMEntry to get back to the WindowMenus object
42+
43+2011-02-17 Ted Gould <ted@gould.cx>
44+
45+ Adding a signal for when the accessible description gets updated
46+
47+2011-02-17 Luke Yelavich <luke.yelavich@canonical.com>
48+
49+ Also update the accessible description in menu_prop_changed, although I am
50+ not sure how we can signal a change from here.
51+
52+2011-02-14 Luke Yelavich <luke.yelavich@canonical.com>
53+
54+ Add accessible description support.
55+
56 2011-02-11 Ted Gould <ted@gould.cx>
57
58 0.1.94
59
60=== modified file 'configure'
61--- configure 2011-02-11 16:04:47 +0000
62+++ configure 2011-02-17 20:33:53 +0000
63@@ -1,6 +1,6 @@
64 #! /bin/sh
65 # Guess values for system-dependent variables and create Makefiles.
66-# Generated by GNU Autoconf 2.67 for indicator-appmenu 0.1.94.
67+# Generated by GNU Autoconf 2.67 for indicator-appmenu 0.1.95.
68 #
69 # Report bugs to <ted@canonical.com>.
70 #
71@@ -703,8 +703,8 @@
72 # Identity of this package.
73 PACKAGE_NAME='indicator-appmenu'
74 PACKAGE_TARNAME='indicator-appmenu'
75-PACKAGE_VERSION='0.1.94'
76-PACKAGE_STRING='indicator-appmenu 0.1.94'
77+PACKAGE_VERSION='0.1.95'
78+PACKAGE_STRING='indicator-appmenu 0.1.95'
79 PACKAGE_BUGREPORT='ted@canonical.com'
80 PACKAGE_URL=''
81
82@@ -1462,7 +1462,7 @@
83 # Omit some internal or obsolete options to make the list less imposing.
84 # This message is too long to be a string in the A/UX 3.1 sh.
85 cat <<_ACEOF
86-\`configure' configures indicator-appmenu 0.1.94 to adapt to many kinds of systems.
87+\`configure' configures indicator-appmenu 0.1.95 to adapt to many kinds of systems.
88
89 Usage: $0 [OPTION]... [VAR=VALUE]...
90
91@@ -1533,7 +1533,7 @@
92
93 if test -n "$ac_init_help"; then
94 case $ac_init_help in
95- short | recursive ) echo "Configuration of indicator-appmenu 0.1.94:";;
96+ short | recursive ) echo "Configuration of indicator-appmenu 0.1.95:";;
97 esac
98 cat <<\_ACEOF
99
100@@ -1656,7 +1656,7 @@
101 test -n "$ac_init_help" && exit $ac_status
102 if $ac_init_version; then
103 cat <<\_ACEOF
104-indicator-appmenu configure 0.1.94
105+indicator-appmenu configure 0.1.95
106 generated by GNU Autoconf 2.67
107
108 Copyright (C) 2010 Free Software Foundation, Inc.
109@@ -1936,7 +1936,7 @@
110 This file contains any messages produced by compilers while
111 running configure, to aid debugging if configure makes a mistake.
112
113-It was created by indicator-appmenu $as_me 0.1.94, which was
114+It was created by indicator-appmenu $as_me 0.1.95, which was
115 generated by GNU Autoconf 2.67. Invocation command line was
116
117 $ $0 $@
118@@ -2757,7 +2757,7 @@
119
120 # Define the identity of the package.
121 PACKAGE=indicator-appmenu
122- VERSION=0.1.94
123+ VERSION=0.1.95
124
125
126 cat >>confdefs.h <<_ACEOF
127@@ -11743,7 +11743,7 @@
128
129 GTK_REQUIRED_VERSION=2.12
130 GIO_REQUIRED_VERSION=2.26
131-INDICATOR_REQUIRED_VERSION=0.3.14
132+INDICATOR_REQUIRED_VERSION=0.3.19
133 DBUSMENUGTK_REQUIRED_VERSION=0.3.3
134 BAMF_REQUIRED_VERSION=0.2.53
135
136@@ -12623,7 +12623,7 @@
137 # report actual input values of CONFIG_FILES etc. instead of their
138 # values after options handling.
139 ac_log="
140-This file was extended by indicator-appmenu $as_me 0.1.94, which was
141+This file was extended by indicator-appmenu $as_me 0.1.95, which was
142 generated by GNU Autoconf 2.67. Invocation command line was
143
144 CONFIG_FILES = $CONFIG_FILES
145@@ -12689,7 +12689,7 @@
146 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
147 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
148 ac_cs_version="\\
149-indicator-appmenu config.status 0.1.94
150+indicator-appmenu config.status 0.1.95
151 configured by $0, generated by GNU Autoconf 2.67,
152 with options \\"\$ac_cs_config\\"
153
154
155=== modified file 'configure.ac'
156--- configure.ac 2011-02-11 16:04:47 +0000
157+++ configure.ac 2011-02-17 20:33:53 +0000
158@@ -1,11 +1,11 @@
159
160-AC_INIT(indicator-appmenu, 0.1.94, ted@canonical.com)
161+AC_INIT(indicator-appmenu, 0.1.95, ted@canonical.com)
162 AC_COPYRIGHT([Copyright 2010 Canonical])
163
164 AC_PREREQ(2.53)
165
166 AM_CONFIG_HEADER(config.h)
167-AM_INIT_AUTOMAKE(indicator-appmenu, 0.1.94)
168+AM_INIT_AUTOMAKE(indicator-appmenu, 0.1.95)
169
170 AM_MAINTAINER_MODE
171
172@@ -48,7 +48,7 @@
173
174 GTK_REQUIRED_VERSION=2.12
175 GIO_REQUIRED_VERSION=2.26
176-INDICATOR_REQUIRED_VERSION=0.3.14
177+INDICATOR_REQUIRED_VERSION=0.3.19
178 DBUSMENUGTK_REQUIRED_VERSION=0.3.3
179 BAMF_REQUIRED_VERSION=0.2.53
180
181
182=== modified file 'debian/changelog'
183--- debian/changelog 2011-02-11 17:14:03 +0000
184+++ debian/changelog 2011-02-17 20:33:53 +0000
185@@ -1,3 +1,11 @@
186+indicator-appmenu (0.1.95-0ubuntu1~ppa1) natty; urgency=low
187+
188+ * New upstream release.
189+ * Accessible description support
190+ * debian/control: Updating libindicator to 0.3.19
191+
192+ -- Ted Gould <ted@ubuntu.com> Thu, 17 Feb 2011 14:26:34 -0600
193+
194 indicator-appmenu (0.1.94-0ubuntu1) natty; urgency=low
195
196 * New upstream release.
197
198=== modified file 'debian/control'
199--- debian/control 2011-01-14 18:27:58 +0000
200+++ debian/control 2011-02-17 20:33:53 +0000
201@@ -8,7 +8,7 @@
202 gnome-doc-utils,
203 scrollkeeper,
204 intltool,
205- libindicator-dev (>= 0.3.16),
206+ libindicator-dev (>= 0.3.19),
207 libdbusmenu-gtk-dev (>= 0.3.91),
208 libdbusmenu-glib-dev (>= 0.3.91),
209 libdbusmenu-jsonloader-dev (>= 0.3.91),
210
211=== modified file 'src/indicator-appmenu-marshal.c'
212--- src/indicator-appmenu-marshal.c 2010-09-15 19:40:48 +0000
213+++ src/indicator-appmenu-marshal.c 2011-02-17 20:33:53 +0000
214@@ -128,3 +128,5 @@
215 data2);
216 }
217
218+/* VOID:POINTER (./indicator-appmenu-marshal.list:4) */
219+
220
221=== modified file 'src/indicator-appmenu-marshal.list'
222--- src/indicator-appmenu-marshal.list 2010-09-14 19:13:16 +0000
223+++ src/indicator-appmenu-marshal.list 2011-02-17 20:33:53 +0000
224@@ -1,3 +1,4 @@
225 VOID: UINT, STRING, BOXED
226 VOID: UINT
227 VOID: POINTER, UINT
228+VOID: POINTER
229
230=== modified file 'src/indicator-appmenu.c'
231--- src/indicator-appmenu.c 2011-02-11 15:57:44 +0000
232+++ src/indicator-appmenu.c 2011-02-17 20:33:53 +0000
233@@ -91,6 +91,7 @@
234 gulong sig_entry_added;
235 gulong sig_entry_removed;
236 gulong sig_show_menu;
237+ gulong sig_a11y_update;
238
239 GtkMenuItem * close_item;
240
241@@ -169,6 +170,9 @@
242 IndicatorObjectEntry * entry,
243 guint timestamp,
244 gpointer user_data);
245+static void window_a11y_update (WindowMenus * mw,
246+ IndicatorObjectEntry * entry,
247+ gpointer user_data);
248 static void active_window_changed (BamfMatcher * matcher,
249 BamfView * oldview,
250 BamfView * newview,
251@@ -1088,6 +1092,10 @@
252 g_signal_handler_disconnect(G_OBJECT(iapp->default_app), iapp->sig_show_menu);
253 iapp->sig_show_menu = 0;
254 }
255+ if (iapp->sig_a11y_update != 0) {
256+ g_signal_handler_disconnect(G_OBJECT(iapp->default_app), iapp->sig_a11y_update);
257+ iapp->sig_a11y_update = 0;
258+ }
259
260 /* Default App is NULL, let's see if it needs replacement */
261 iapp->default_app = NULL;
262@@ -1113,6 +1121,10 @@
263 WINDOW_MENUS_SIGNAL_SHOW_MENU,
264 G_CALLBACK(window_show_menu),
265 iapp);
266+ iapp->sig_a11y_update = g_signal_connect(G_OBJECT(iapp->default_app),
267+ WINDOW_MENUS_SIGNAL_A11Y_UPDATE,
268+ G_CALLBACK(window_a11y_update),
269+ iapp);
270 }
271
272 /* Get our new list of entries. Now we can go ahead and signal
273@@ -1390,6 +1402,14 @@
274 return;
275 }
276
277+/* Pass up the accessible string update */
278+static void
279+window_a11y_update (WindowMenus * mw, IndicatorObjectEntry * entry, gpointer user_data)
280+{
281+ g_signal_emit_by_name(G_OBJECT(user_data), INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, entry);
282+ return;
283+}
284+
285 /**********************
286 DEBUG INTERFACE
287 **********************/
288
289=== modified file 'src/window-menus.c'
290--- src/window-menus.c 2011-02-11 16:04:47 +0000
291+++ src/window-menus.c 2011-02-17 20:33:53 +0000
292@@ -54,6 +54,7 @@
293 gboolean disabled;
294 gboolean hidden;
295 DbusmenuMenuitem * mi;
296+ WindowMenus * wm;
297 };
298
299 #define WINDOW_MENUS_GET_PRIVATE(o) \
300@@ -66,6 +67,7 @@
301 ENTRY_REMOVED,
302 ERROR_STATE,
303 SHOW_MENU,
304+ A11Y_UPDATE,
305 LAST_SIGNAL
306 };
307
308@@ -125,6 +127,13 @@
309 NULL, NULL,
310 _indicator_appmenu_marshal_VOID__POINTER_UINT,
311 G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_NONE);
312+ signals[A11Y_UPDATE] = g_signal_new(WINDOW_MENUS_SIGNAL_A11Y_UPDATE,
313+ G_TYPE_FROM_CLASS(klass),
314+ G_SIGNAL_RUN_LAST,
315+ G_STRUCT_OFFSET (WindowMenusClass, a11y_update),
316+ NULL, NULL,
317+ _indicator_appmenu_marshal_VOID__POINTER,
318+ G_TYPE_NONE, 1, G_TYPE_POINTER, G_TYPE_NONE);
319
320 return;
321 }
322@@ -162,6 +171,9 @@
323 g_object_unref(entry->label);
324 entry->label = NULL;
325 }
326+ if (entry->accessible_desc != NULL) {
327+ entry->accessible_desc = NULL;
328+ }
329 if (entry->image != NULL) {
330 g_object_unref(entry->image);
331 entry->image = NULL;
332@@ -607,6 +619,11 @@
333 wmentry->disabled = !g_variant_get_boolean(value);
334 } else if (!g_strcmp0(property, DBUSMENU_MENUITEM_PROP_LABEL)) {
335 gtk_label_set_text_with_mnemonic(entry->label, g_variant_get_string(value, NULL));
336+ entry->accessible_desc = g_variant_get_string(value, NULL);
337+
338+ if (wmentry->wm != NULL) {
339+ g_signal_emit(G_OBJECT(wmentry->wm), A11Y_UPDATE, 0, entry, TRUE);
340+ }
341 }
342
343 return;
344@@ -623,6 +640,7 @@
345
346 WindowMenusPrivate * priv = WINDOW_MENUS_GET_PRIVATE((((gpointer *)user_data)[0]));
347 WMEntry * wmentry = g_new0(WMEntry, 1);
348+ wmentry->wm = WINDOW_MENUS((((gpointer *)user_data)[0]));
349 IndicatorObjectEntry * entry = &wmentry->ioentry;
350
351 wmentry->mi = newentry;
352@@ -634,6 +652,8 @@
353 g_object_ref(entry->label);
354 }
355
356+ entry->accessible_desc = dbusmenu_menuitem_property_get(newentry, DBUSMENU_MENUITEM_PROP_LABEL);
357+
358 entry->menu = dbusmenu_gtkclient_menuitem_get_submenu(priv->client, newentry);
359
360 if (entry->menu == NULL) {
361
362=== modified file 'src/window-menus.h'
363--- src/window-menus.h 2011-02-07 22:31:48 +0000
364+++ src/window-menus.h 2011-02-17 20:33:53 +0000
365@@ -39,6 +39,7 @@
366 #define WINDOW_MENUS_SIGNAL_ENTRY_REMOVED "entry-removed"
367 #define WINDOW_MENUS_SIGNAL_ERROR_STATE "error-state"
368 #define WINDOW_MENUS_SIGNAL_SHOW_MENU "show-menu"
369+#define WINDOW_MENUS_SIGNAL_A11Y_UPDATE "a11y-update"
370
371 typedef struct _WindowMenus WindowMenus;
372 typedef struct _WindowMenusClass WindowMenusClass;
373@@ -53,6 +54,7 @@
374 void (*error_state) (WindowMenus * wm, gboolean state, gpointer user_data);
375
376 void (*show_menu) (WindowMenus * wm, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data);
377+ void (*a11y_update) (WindowMenus * wm, IndicatorObjectEntry * entry, gpointer user_data);
378 };
379
380 struct _WindowMenus {

Subscribers

People subscribed via source and target branches

to all changes: