Application Indicators

Merge lp:~ted/indicator-application/more-s-is-better into lp:indicator-application/0.4

  1. more-s-is-better
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: 209
Proposed branch: lp:~ted/indicator-application/more-s-is-better
Merge into: lp:indicator-application/0.4
Diff against target: 28 lines (+3/-3)
2 files modified
src/application-service-appstore.c (+2/-2)
src/indicator-application.c (+1/-1)
To merge this branch: bzr merge lp:~ted/indicator-application/more-s-is-better
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+67365@code.launchpad.net

Description of the change

Fixing the signatures of the signals

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

For fun you can test like this:

 $ dbus-test-runner -t /usr/lib/libindicator/indicator-loader3 -p .libs/libapplication.so -t ./indicator-application-service

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/application-service-appstore.c'
2--- src/application-service-appstore.c 2011-07-07 15:16:51 +0000
3+++ src/application-service-appstore.c 2011-07-08 19:26:44 +0000
4@@ -1276,9 +1276,9 @@
5 out = g_variant_builder_end(&builder);
6 } else {
7 GError * error = NULL;
8- out = g_variant_parse(g_variant_type_new("a(sisossss)"), "[]", NULL, NULL, &error);
9+ out = g_variant_parse(g_variant_type_new("a(sisosssss)"), "[]", NULL, NULL, &error);
10 if (error != NULL) {
11- g_warning("Unable to parse '[]' as a 'a(sisossss)': %s", error->message);
12+ g_warning("Unable to parse '[]' as a 'a(sisosssss)': %s", error->message);
13 out = NULL;
14 g_error_free(error);
15 }
16
17=== modified file 'src/indicator-application.c'
18--- src/indicator-application.c 2011-07-07 15:39:10 +0000
19+++ src/indicator-application.c 2011-07-08 19:26:44 +0000
20@@ -861,7 +861,7 @@
21 }
22
23 /* Get our new applications that we got in the request */
24- g_variant_get(result, "(a(sisossss))", &iter);
25+ g_variant_get(result, "(a(sisosssss))", &iter);
26 while ((child = g_variant_iter_next_value (iter))) {
27 get_applications_helper(self, child);
28 g_variant_unref(child);

Subscribers

People subscribed via source and target branches