Application Indicators

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

  1. ubuntu
  2. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: 259
Proposed branch: lp:~indicator-applet-developers/indicator-application/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-application/ubuntu
Diff against target: 533 lines (+169/-36)
9 files modified
AUTHORS (+1/-0)
ChangeLog (+68/-0)
configure (+10/-10)
configure.ac (+2/-2)
debian/changelog (+10/-0)
src/application-service-appstore.c (+30/-9)
src/application-service.xml (+3/-1)
src/gen-application-service.xml.c (+3/-1)
src/indicator-application.c (+42/-13)
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-application/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+51247@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-02-03 20:54:42 +0000
3+++ AUTHORS 2011-02-25 04:17:56 +0000
4@@ -13,6 +13,7 @@
5 Ken Vandine
6 Ken VanDine
7 Krzysztof Klimonda
8+ Luke Yelavich
9 Marco Trevisan (Treviño)
10 Michael Terry
11 Neil Jagdish Patel
12
13=== modified file 'ChangeLog'
14--- ChangeLog 2011-02-03 20:54:42 +0000
15+++ ChangeLog 2011-02-25 04:17:56 +0000
16@@ -1,5 +1,73 @@
17 # Generated by Makefile. Do not edit.
18
19+2011-02-24 Ted Gould <ted@gould.cx>
20+
21+ 0.2.94
22+
23+2011-02-24 Ted Gould <ted@gould.cx>
24+
25+ Making sure we have a description for the variant world
26+
27+2011-02-24 Ted Gould <ted@gould.cx>
28+
29+ Adding support for accessible descriptions
30+
31+2011-02-24 Ted Gould <ted@gould.cx>
32+
33+ Switching things around so the icon switches with the description all the way up the stack
34+
35+2011-02-23 Ted Gould <ted@gould.cx>
36+
37+ Adding a missing brace
38+
39+2011-02-11 Luke Yelavich <luke.yelavich@canonical.com>
40+
41+ Use the ACCESSIBLE_DESC_UPDATE signal to refresh the accessible description.
42+
43+2011-02-08 Luke Yelavich <luke.yelavich@canonical.com>
44+
45+ accessible_name -> accessible_desc
46+
47+2011-02-08 Luke Yelavich <luke.yelavich@canonical.com>
48+
49+ Merge from trunk
50+
51+2011-02-07 Luke Yelavich <luke.yelavich@canonical.com>
52+
53+ Add accessible name support
54+
55+2011-02-21 Ted Gould <ted@gould.cx>
56+
57+ Make sure to NULL out the structure
58+
59+2011-02-18 Ted Gould <ted@gould.cx>
60+
61+ Ensures the accessible description is NULL
62+
63+2011-02-16 Ted Gould <ted@gould.cx>
64+
65+ Remove g_error's to stop abortion.
66+
67+2011-02-11 Michael Terry <mike@mterry.name>
68+
69+ don't abort on various unexpected situations; just spit out critical warning
70+
71+2011-02-16 Ted Gould <ted@gould.cx>
72+
73+ On status change update the label as well
74+
75+2011-02-11 Michael Terry <mike@mterry.name>
76+
77+ update label too in update_status
78+
79+2011-02-07 Ted Gould <ted@gould.cx>
80+
81+ Build fix to get libindicator header
82+
83+2011-02-07 Luke Yelavich <luke.yelavich@canonical.com>
84+
85+ Include indicator-object.h to reference INDICATOR_OBJECT_SCROLL_UP
86+
87 2011-02-03 Ted Gould <ted@gould.cx>
88
89 0.2.93
90
91=== modified file 'configure'
92--- configure 2011-02-03 20:56:18 +0000
93+++ configure 2011-02-25 04:17:56 +0000
94@@ -1,6 +1,6 @@
95 #! /bin/sh
96 # Guess values for system-dependent variables and create Makefiles.
97-# Generated by GNU Autoconf 2.67 for indicator-application 0.2.93.
98+# Generated by GNU Autoconf 2.67 for indicator-application 0.2.94.
99 #
100 # Report bugs to <ted@canonical.com>.
101 #
102@@ -703,8 +703,8 @@
103 # Identity of this package.
104 PACKAGE_NAME='indicator-application'
105 PACKAGE_TARNAME='indicator-application'
106-PACKAGE_VERSION='0.2.93'
107-PACKAGE_STRING='indicator-application 0.2.93'
108+PACKAGE_VERSION='0.2.94'
109+PACKAGE_STRING='indicator-application 0.2.94'
110 PACKAGE_BUGREPORT='ted@canonical.com'
111 PACKAGE_URL=''
112
113@@ -1446,7 +1446,7 @@
114 # Omit some internal or obsolete options to make the list less imposing.
115 # This message is too long to be a string in the A/UX 3.1 sh.
116 cat <<_ACEOF
117-\`configure' configures indicator-application 0.2.93 to adapt to many kinds of systems.
118+\`configure' configures indicator-application 0.2.94 to adapt to many kinds of systems.
119
120 Usage: $0 [OPTION]... [VAR=VALUE]...
121
122@@ -1517,7 +1517,7 @@
123
124 if test -n "$ac_init_help"; then
125 case $ac_init_help in
126- short | recursive ) echo "Configuration of indicator-application 0.2.93:";;
127+ short | recursive ) echo "Configuration of indicator-application 0.2.94:";;
128 esac
129 cat <<\_ACEOF
130
131@@ -1634,7 +1634,7 @@
132 test -n "$ac_init_help" && exit $ac_status
133 if $ac_init_version; then
134 cat <<\_ACEOF
135-indicator-application configure 0.2.93
136+indicator-application configure 0.2.94
137 generated by GNU Autoconf 2.67
138
139 Copyright (C) 2010 Free Software Foundation, Inc.
140@@ -1914,7 +1914,7 @@
141 This file contains any messages produced by compilers while
142 running configure, to aid debugging if configure makes a mistake.
143
144-It was created by indicator-application $as_me 0.2.93, which was
145+It was created by indicator-application $as_me 0.2.94, which was
146 generated by GNU Autoconf 2.67. Invocation command line was
147
148 $ $0 $@
149@@ -2735,7 +2735,7 @@
150
151 # Define the identity of the package.
152 PACKAGE=indicator-application
153- VERSION=0.2.93
154+ VERSION=0.2.94
155
156
157 cat >>confdefs.h <<_ACEOF
158@@ -12462,7 +12462,7 @@
159 # report actual input values of CONFIG_FILES etc. instead of their
160 # values after options handling.
161 ac_log="
162-This file was extended by indicator-application $as_me 0.2.93, which was
163+This file was extended by indicator-application $as_me 0.2.94, which was
164 generated by GNU Autoconf 2.67. Invocation command line was
165
166 CONFIG_FILES = $CONFIG_FILES
167@@ -12528,7 +12528,7 @@
168 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
169 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
170 ac_cs_version="\\
171-indicator-application config.status 0.2.93
172+indicator-application config.status 0.2.94
173 configured by $0, generated by GNU Autoconf 2.67,
174 with options \\"\$ac_cs_config\\"
175
176
177=== modified file 'configure.ac'
178--- configure.ac 2011-02-03 20:53:45 +0000
179+++ configure.ac 2011-02-25 04:17:56 +0000
180@@ -1,11 +1,11 @@
181
182-AC_INIT(indicator-application, 0.2.93, ted@canonical.com)
183+AC_INIT(indicator-application, 0.2.94, ted@canonical.com)
184 AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
185
186 AC_PREREQ(2.53)
187
188 AM_CONFIG_HEADER(config.h)
189-AM_INIT_AUTOMAKE(indicator-application, 0.2.93)
190+AM_INIT_AUTOMAKE(indicator-application, 0.2.94)
191
192 AM_MAINTAINER_MODE
193
194
195=== modified file 'debian/changelog'
196--- debian/changelog 2011-02-20 04:23:27 +0000
197+++ debian/changelog 2011-02-25 04:17:56 +0000
198@@ -1,3 +1,13 @@
199+indicator-application (0.2.94-0ubuntu1~ppa1) natty; urgency=low
200+
201+ * New upstream release.
202+ * Adding in support for Accssible Descriptions
203+ * Make the accessible description NULL so that indicator-applet doesn't
204+ crash (LP: #721533)
205+ * emit LabelChanged signal along with the IconChanged signal (LP: #712581)
206+
207+ -- Ted Gould <ted@ubuntu.com> Thu, 24 Feb 2011 22:13:26 -0600
208+
209 indicator-application (0.2.93-0ubuntu4) natty; urgency=low
210
211 * Make the accessible description NULL so that indicator-applet doesn't
212
213=== modified file 'src/application-service-appstore.c'
214--- src/application-service-appstore.c 2011-02-20 04:23:27 +0000
215+++ src/application-service-appstore.c 2011-02-25 04:17:56 +0000
216@@ -43,7 +43,9 @@
217 #define NOTIFICATION_ITEM_PROP_CATEGORY "Category"
218 #define NOTIFICATION_ITEM_PROP_STATUS "Status"
219 #define NOTIFICATION_ITEM_PROP_ICON_NAME "IconName"
220+#define NOTIFICATION_ITEM_PROP_ICON_DESC "IconAccessibleDesc"
221 #define NOTIFICATION_ITEM_PROP_AICON_NAME "AttentionIconName"
222+#define NOTIFICATION_ITEM_PROP_AICON_DESC "AttentionAccessibleDesc"
223 #define NOTIFICATION_ITEM_PROP_ICON_THEME_PATH "IconThemePath"
224 #define NOTIFICATION_ITEM_PROP_MENU "Menu"
225 #define NOTIFICATION_ITEM_PROP_LABEL "XAyatanaLabel"
226@@ -99,7 +101,9 @@
227 gboolean validated; /* Whether we've gotten all the parameters and they look good. */
228 AppIndicatorStatus status;
229 gchar * icon;
230+ gchar * icon_desc;
231 gchar * aicon;
232+ gchar * aicon_desc;
233 gchar * menu;
234 gchar * icon_theme_path;
235 gchar * label;
236@@ -430,6 +434,7 @@
237 ApplicationServiceAppstorePrivate * priv = app->appstore->priv;
238 GVariant * menu = NULL, * id = NULL, * category = NULL,
239 * status = NULL, * icon_name = NULL, * aicon_name = NULL,
240+ * icon_desc = NULL, * aicon_desc = NULL,
241 * icon_theme_path = NULL, * index = NULL, * label = NULL,
242 * guide = NULL;
243
244@@ -464,8 +469,12 @@
245 status = g_variant_ref(value);
246 } else if (g_strcmp0(name, NOTIFICATION_ITEM_PROP_ICON_NAME) == 0) {
247 icon_name = g_variant_ref(value);
248+ } else if (g_strcmp0(name, NOTIFICATION_ITEM_PROP_ICON_DESC) == 0) {
249+ icon_desc = g_variant_ref(value);
250 } else if (g_strcmp0(name, NOTIFICATION_ITEM_PROP_AICON_NAME) == 0) {
251 aicon_name = g_variant_ref(value);
252+ } else if (g_strcmp0(name, NOTIFICATION_ITEM_PROP_AICON_DESC) == 0) {
253+ aicon_desc = g_variant_ref(value);
254 } else if (g_strcmp0(name, NOTIFICATION_ITEM_PROP_ICON_THEME_PATH) == 0) {
255 icon_theme_path = g_variant_ref(value);
256 } else if (g_strcmp0(name, NOTIFICATION_ITEM_PROP_ORDERING_INDEX) == 0) {
257@@ -543,7 +552,9 @@
258 if (category) g_variant_unref (category);
259 if (status) g_variant_unref (status);
260 if (icon_name) g_variant_unref (icon_name);
261+ if (icon_desc) g_variant_unref (icon_desc);
262 if (aicon_name) g_variant_unref (aicon_name);
263+ if (aicon_desc) g_variant_unref (aicon_desc);
264 if (icon_theme_path) g_variant_unref (icon_theme_path);
265 if (index) g_variant_unref (index);
266 if (label) g_variant_unref (label);
267@@ -707,8 +718,11 @@
268 if (app->icon != NULL) {
269 g_free(app->icon);
270 }
271- if (app->aicon != NULL) {
272- g_free(app->aicon);
273+ if (app->icon_desc != NULL) {
274+ g_free(app->icon_desc);
275+ }
276+ if (app->aicon_desc != NULL) {
277+ g_free(app->aicon_desc);
278 }
279 if (app->menu != NULL) {
280 g_free(app->menu);
281@@ -825,26 +839,33 @@
282 } else {
283 /* Figure out which icon we should be using */
284 gchar * newicon = app->icon;
285+ gchar * newdesc = app->icon_desc;
286 if (app->status == APP_INDICATOR_STATUS_ATTENTION && app->aicon != NULL && app->aicon[0] != '\0') {
287 newicon = app->aicon;
288+ newdesc = app->aicon_desc;
289+ }
290+
291+ if (newdesc == NULL) {
292+ newdesc = "";
293 }
294
295 /* Determine whether we're already shown or not */
296 if (app->visible_state == VISIBLE_STATE_HIDDEN) {
297 /* Put on panel */
298 emit_signal (appstore, "ApplicationAdded",
299- g_variant_new ("(sisosss)", newicon,
300+ g_variant_new ("(sisossss)", newicon,
301 get_position(app),
302 app->dbus_name, app->menu,
303 app->icon_theme_path,
304- app->label, app->guide));
305+ app->label, app->guide,
306+ newdesc));
307 } else {
308 /* Icon update */
309 gint position = get_position(app);
310 if (position == -1) return;
311
312 emit_signal (appstore, "ApplicationIconChanged",
313- g_variant_new ("(is)", position, newicon));
314+ g_variant_new ("(iss)", position, newicon, newdesc));
315 emit_signal (appstore, "ApplicationLabelChanged",
316 g_variant_new ("(iss)", position,
317 app->label != NULL ? app->label : "",
318@@ -1216,18 +1237,18 @@
319 continue;
320 }
321
322- g_variant_builder_add (&builder, "(sisosss)", app->icon,
323+ g_variant_builder_add (&builder, "(sisossss)", app->icon,
324 position++, app->dbus_name, app->menu,
325 app->icon_theme_path, app->label,
326- app->guide);
327+ app->guide, app->icon_desc);
328 }
329
330 out = g_variant_builder_end(&builder);
331 } else {
332 GError * error = NULL;
333- out = g_variant_parse(g_variant_type_new("a(sisosss)"), "[]", NULL, NULL, &error);
334+ out = g_variant_parse(g_variant_type_new("a(sisossss)"), "[]", NULL, NULL, &error);
335 if (error != NULL) {
336- g_warning("Unable to parse '[]' as a 'a(sisosss)': %s", error->message);
337+ g_warning("Unable to parse '[]' as a 'a(sisossss)': %s", error->message);
338 out = NULL;
339 g_error_free(error);
340 }
341
342=== modified file 'src/application-service.xml'
343--- src/application-service.xml 2011-01-29 02:25:32 +0000
344+++ src/application-service.xml 2011-02-25 04:17:56 +0000
345@@ -26,7 +26,7 @@
346
347 <!-- Methods -->
348 <method name="GetApplications">
349- <arg type="a(sisosss)" name="applications" direction="out" />
350+ <arg type="a(sisossss)" name="applications" direction="out" />
351 </method>
352 <method name="ApplicationScrollEvent">
353 <arg type="s" name="dbusaddress" direction="in" />
354@@ -44,6 +44,7 @@
355 <arg type="s" name="iconpath" direction="out" />
356 <arg type="s" name="label" direction="out" />
357 <arg type="s" name="labelguide" direction="out" />
358+ <arg type="s" name="accessibledesc" direction="out" />
359 </signal>
360 <signal name="ApplicationRemoved">
361 <arg type="i" name="position" direction="out" />
362@@ -51,6 +52,7 @@
363 <signal name="ApplicationIconChanged">
364 <arg type="i" name="position" direction="out" />
365 <arg type="s" name="icon_name" direction="out" />
366+ <arg type="s" name="icon_desc" direction="out" />
367 </signal>
368 <signal name="ApplicationIconThemePathChanged">
369 <arg type="i" name="position" direction="out" />
370
371=== modified file 'src/gen-application-service.xml.c'
372--- src/gen-application-service.xml.c 2011-02-03 20:54:42 +0000
373+++ src/gen-application-service.xml.c 2011-02-25 04:17:56 +0000
374@@ -27,7 +27,7 @@
375 "\n"
376 "<!-- Methods -->\n"
377 " <method name=\"GetApplications\">\n"
378-" <arg type=\"a(sisosss)\" name=\"applications\" direction=\"out\" />\n"
379+" <arg type=\"a(sisossss)\" name=\"applications\" direction=\"out\" />\n"
380 " </method>\n"
381 " <method name=\"ApplicationScrollEvent\">\n"
382 " <arg type=\"s\" name=\"dbusaddress\" direction=\"in\" />\n"
383@@ -45,6 +45,7 @@
384 " <arg type=\"s\" name=\"iconpath\" direction=\"out\" />\n"
385 " <arg type=\"s\" name=\"label\" direction=\"out\" />\n"
386 " <arg type=\"s\" name=\"labelguide\" direction=\"out\" />\n"
387+" <arg type=\"s\" name=\"accessibledesc\" direction=\"out\" />\n"
388 " </signal>\n"
389 " <signal name=\"ApplicationRemoved\">\n"
390 " <arg type=\"i\" name=\"position\" direction=\"out\" />\n"
391@@ -52,6 +53,7 @@
392 " <signal name=\"ApplicationIconChanged\">\n"
393 " <arg type=\"i\" name=\"position\" direction=\"out\" />\n"
394 " <arg type=\"s\" name=\"icon_name\" direction=\"out\" />\n"
395+" <arg type=\"s\" name=\"icon_desc\" direction=\"out\" />\n"
396 " </signal>\n"
397 " <signal name=\"ApplicationIconThemePathChanged\">\n"
398 " <arg type=\"i\" name=\"position\" direction=\"out\" />\n"
399
400=== modified file 'src/indicator-application.c'
401--- src/indicator-application.c 2011-02-19 05:32:53 +0000
402+++ src/indicator-application.c 2011-02-25 04:17:56 +0000
403@@ -115,10 +115,10 @@
404 static void disconnected_helper (gpointer data, gpointer user_data);
405 static gboolean disconnected_kill (gpointer user_data);
406 static void disconnected_kill_helper (gpointer data, gpointer user_data);
407-static void application_added (IndicatorApplication * application, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_theme_path, const gchar * label, const gchar * guide);
408+static void application_added (IndicatorApplication * application, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_theme_path, const gchar * label, const gchar * guide, const gchar * accessible_desc);
409 static void application_removed (IndicatorApplication * application, gint position);
410 static void application_label_changed (IndicatorApplication * application, gint position, const gchar * label, const gchar * guide);
411-static void application_icon_changed (IndicatorApplication * application, gint position, const gchar * iconname);
412+static void application_icon_changed (IndicatorApplication * application, gint position, const gchar * iconname, const gchar * icondesc);
413 static void application_icon_theme_path_changed (IndicatorApplication * application, gint position, const gchar * icon_theme_path);
414 static void get_applications (GObject * obj, GAsyncResult * res, gpointer user_data);
415 static void get_applications_helper (IndicatorApplication * self, GVariant * variant);
416@@ -450,7 +450,7 @@
417 ApplicationEntry and signaling the indicator host that
418 we've got a new indicator. */
419 static void
420-application_added (IndicatorApplication * application, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_theme_path, const gchar * label, const gchar * guide)
421+application_added (IndicatorApplication * application, const gchar * iconname, gint position, const gchar * dbusaddress, const gchar * dbusobject, const gchar * icon_theme_path, const gchar * label, const gchar * guide, const gchar * accessible_desc)
422 {
423 g_return_if_fail(IS_INDICATOR_APPLICATION(application));
424 g_debug("Building new application entry: %s with icon: %s at position %i", dbusaddress, iconname, position);
425@@ -499,6 +499,12 @@
426 guess_label_size(app);
427 }
428
429+ if (accessible_desc == NULL || accessible_desc[0] == '\0') {
430+ app->entry.accessible_desc = NULL;
431+ } else {
432+ app->entry.accessible_desc = g_strdup(accessible_desc);
433+ }
434+
435 app->entry.menu = GTK_MENU(dbusmenu_gtkmenu_new((gchar *)dbusaddress, (gchar *)dbusobject));
436
437 /* Keep copies of these for ourself, just in case. */
438@@ -644,7 +650,7 @@
439 /* The callback for the signal that the icon for an application
440 has changed. */
441 static void
442-application_icon_changed (IndicatorApplication * application, gint position, const gchar * iconname)
443+application_icon_changed (IndicatorApplication * application, gint position, const gchar * iconname, const gchar * icondesc)
444 {
445 IndicatorApplicationPrivate * priv = INDICATOR_APPLICATION_GET_PRIVATE(application);
446 ApplicationEntry * app = (ApplicationEntry *)g_list_nth_data(priv->applications, position);
447@@ -654,6 +660,11 @@
448 return;
449 }
450
451+ if (iconname == NULL) {
452+ g_warning("We can't have a NULL icon name on %d", position);
453+ return;
454+ }
455+
456 /* We make a long name using the suffix, and if that
457 icon is available we want to use it. Otherwise we'll
458 just use the name we were given. */
459@@ -668,6 +679,19 @@
460 }
461 indicator_image_helper_update(app->entry.image, app->longname);
462
463+ if (g_strcmp0(app->entry.accessible_desc, icondesc) != 0) {
464+ if (app->entry.accessible_desc != NULL) {
465+ g_free((gchar *)app->entry.accessible_desc);
466+ app->entry.accessible_desc = NULL;
467+ }
468+
469+ if (icondesc != NULL && icondesc[0] != '\0') {
470+ app->entry.accessible_desc = g_strdup(icondesc);
471+ }
472+
473+ g_signal_emit(G_OBJECT(application), INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID, 0, &(app->entry), TRUE);
474+ }
475+
476 return;
477 }
478
479@@ -715,11 +739,14 @@
480 const gchar * icon_theme_path;
481 const gchar * label;
482 const gchar * guide;
483- g_variant_get (parameters, "(&si&s&o&s&s&s)", &iconname,
484+ const gchar * accessible_desc;
485+ g_variant_get (parameters, "(&si&s&o&s&s&s&s)", &iconname,
486 &position, &dbusaddress, &dbusobject,
487- &icon_theme_path, &label, &guide);
488+ &icon_theme_path, &label, &guide,
489+ &accessible_desc);
490 application_added(self, iconname, position, dbusaddress,
491- dbusobject, icon_theme_path, label, guide);
492+ dbusobject, icon_theme_path, label, guide,
493+ accessible_desc);
494 }
495 else if (g_strcmp0(signal_name, "ApplicationRemoved") == 0) {
496 gint position;
497@@ -729,8 +756,9 @@
498 else if (g_strcmp0(signal_name, "ApplicationIconChanged") == 0) {
499 gint position;
500 const gchar * iconname;
501- g_variant_get (parameters, "(i&s)", &position, &iconname);
502- application_icon_changed(self, position, iconname);
503+ const gchar * icondesc;
504+ g_variant_get (parameters, "(i&s&s)", &position, &iconname, &icondesc);
505+ application_icon_changed(self, position, iconname, icondesc);
506 }
507 else if (g_strcmp0(signal_name, "ApplicationIconThemePathChanged") == 0) {
508 gint position;
509@@ -768,7 +796,7 @@
510 return;
511 }
512
513- g_variant_get(result, "(a(sisosss))", &iter);
514+ g_variant_get(result, "(a(sisossss))", &iter);
515 while ((child = g_variant_iter_next_value (iter)))
516 get_applications_helper(self, child);
517 g_variant_iter_free (iter);
518@@ -788,11 +816,12 @@
519 const gchar * icon_theme_path;
520 const gchar * label;
521 const gchar * guide;
522- g_variant_get(variant, "(sisosss)", &icon_name, &position,
523+ const gchar * accessible_desc;
524+ g_variant_get(variant, "(sisossss)", &icon_name, &position,
525 &dbus_address, &dbus_object, &icon_theme_path, &label,
526- &guide);
527+ &guide, &accessible_desc);
528
529- return application_added(self, icon_name, position, dbus_address, dbus_object, icon_theme_path, label, guide);
530+ return application_added(self, icon_name, position, dbus_address, dbus_object, icon_theme_path, label, guide, accessible_desc);
531 }
532
533 /* Unrefs a theme directory. This may involve removing it from

Subscribers

People subscribed via source and target branches

to all changes: