diff options
| author | Ted Gould <ted@gould.cx> | 2011-08-11 11:54:07 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-08-11 11:54:07 -0500 |
| commit | 6773f899b6e40643e026ff49c5f7ec4fc4b93fe2 (patch) | |
| tree | 7d218feba25764cc047256f1a26abff4241f3205 | |
| parent | 3eca9a284fe1e4db2e839b9c77be5059ff78c69d (diff) | |
| parent | 432dd0a35db90d52a6b618e94255df69c1555527 (diff) | |
| download | ayatana-indicator-application-6773f899b6e40643e026ff49c5f7ec4fc4b93fe2.tar.gz ayatana-indicator-application-6773f899b6e40643e026ff49c5f7ec4fc4b93fe2.tar.bz2 ayatana-indicator-application-6773f899b6e40643e026ff49c5f7ec4fc4b93fe2.zip | |
Merge from U. Desktop
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | src/application-service-appstore.c | 4 | ||||
| -rw-r--r-- | src/indicator-application.c | 2 |
4 files changed, 16 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 46bccf1..373c3de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,18 @@ -indicator-application (0.3.91-0ubuntu1~ppa1) oneiric; urgency=low +indicator-application (0.3.91-0ubuntu2) oneiric; urgency=low + * Backport upstream fix for a segfault + + -- Sebastien Bacher <seb128@ubuntu.com> Fri, 08 Jul 2011 21:42:46 +0200 + +indicator-application (0.3.91-0ubuntu1) oneiric; urgency=low + + * debian/control: updated libindicator requirement + + [ Ted Gould ] * New upstream release. * Build with libindicator 0.4 - -- Ted Gould <ted@ubuntu.com> Thu, 07 Jul 2011 15:32:55 -0500 + -- Sebastien Bacher <seb128@ubuntu.com> Fri, 08 Jul 2011 12:23:16 +0200 indicator-application (0.3.90-0ubuntu2) oneiric; urgency=low diff --git a/debian/control b/debian/control index d79b35a..c83899d 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: debhelper (>= 5.0), intltool, libappindicator-dev (>= 0.2.91), libappindicator3-dev (>= 0.2.91), - libindicator-dev (>= 0.3.19), - libindicator3-dev (>= 0.3.19), + libindicator-dev (>= 0.3.90), + libindicator3-dev (>= 0.3.90), libdbusmenu-glib-dev (>= 0.3.94), libdbusmenu-gtk-dev (>= 0.3.94), libdbusmenu-gtk3-dev (>= 0.3.94) diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index 9cd65b4..9e1dab3 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -1276,9 +1276,9 @@ get_applications (ApplicationServiceAppstore * appstore) out = g_variant_builder_end(&builder); } else { GError * error = NULL; - out = g_variant_parse(g_variant_type_new("a(sisossss)"), "[]", NULL, NULL, &error); + out = g_variant_parse(g_variant_type_new("a(sisosssss)"), "[]", NULL, NULL, &error); if (error != NULL) { - g_warning("Unable to parse '[]' as a 'a(sisossss)': %s", error->message); + g_warning("Unable to parse '[]' as a 'a(sisosssss)': %s", error->message); out = NULL; g_error_free(error); } diff --git a/src/indicator-application.c b/src/indicator-application.c index dc810f4..0a0886a 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -861,7 +861,7 @@ get_applications (GObject * obj, GAsyncResult * res, gpointer user_data) } /* Get our new applications that we got in the request */ - g_variant_get(result, "(a(sisossss))", &iter); + g_variant_get(result, "(a(sisosssss))", &iter); while ((child = g_variant_iter_next_value (iter))) { get_applications_helper(self, child); g_variant_unref(child); |