aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--src/application-service-appstore.c4
-rw-r--r--src/indicator-application.c2
3 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 25e4ed4..373c3de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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
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);