aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-03-09 15:13:08 -0600
committerTed Gould <ted@gould.cx>2012-03-09 15:13:08 -0600
commit9b0c61b301c8de469cd01ad28514c021e50e7aa7 (patch)
treeeedec38bc99f86c7f3d40fa063f14ffd10efd6ba
parent3ed68ebca3e43beeac8376a4fc57b654a7691908 (diff)
parent1c5dbfebdcd6ea55ba72e60289e9efc56c6a2805 (diff)
downloadayatana-indicator-application-9b0c61b301c8de469cd01ad28514c021e50e7aa7.tar.gz
ayatana-indicator-application-9b0c61b301c8de469cd01ad28514c021e50e7aa7.tar.bz2
ayatana-indicator-application-9b0c61b301c8de469cd01ad28514c021e50e7aa7.zip
Merge from U. Desktop
-rw-r--r--debian/changelog10
-rw-r--r--src/application-service-appstore.c2
2 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index bd5164c..aa076d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
-indicator-application (0.4.91-0ubuntu1~ppa1) precise; urgency=low
+indicator-application (0.4.91-0ubuntu2) precise; urgency=low
+
+ * Backport an upstream fix for a gvariant misuse, thanks desrt for it!
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Mon, 05 Mar 2012 10:39:25 +0100
+
+indicator-application (0.4.91-0ubuntu1) precise; urgency=low
* New upstream release.
- * Unref approval data after use
+ * Unref approval data after use (lp: #930291)
-- Ted Gould <ted@ubuntu.com> Wed, 15 Feb 2012 12:08:30 -0600
diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
index 2f456f4..5d4296d 100644
--- a/src/application-service-appstore.c
+++ b/src/application-service-appstore.c
@@ -1348,7 +1348,7 @@ get_applications (ApplicationServiceAppstore * appstore)
GList * listpntr;
gint position = 0;
- g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
+ g_variant_builder_init(&builder, G_VARIANT_TYPE ("a(sisossssss)"));
for (listpntr = priv->applications; listpntr != NULL; listpntr = g_list_next(listpntr)) {
Application * app = (Application *)listpntr->data;