diff options
| author | Ted Gould <ted@gould.cx> | 2011-03-16 14:49:22 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-03-16 14:49:22 -0500 |
| commit | 7c64f1595fc244617ff1f725ea5f3bd30234542b (patch) | |
| tree | c1ca5863d3a63f7b2c91029f1fa15d3d01a0bc03 /src/application-service-appstore.c | |
| parent | c8b3e361e64226a549c4536facd6de4bf9a025c5 (diff) | |
| parent | 57bf196fb01cd7f9bd4185c5d8d35cfc441795b7 (diff) | |
| download | ayatana-indicator-application-7c64f1595fc244617ff1f725ea5f3bd30234542b.tar.gz ayatana-indicator-application-7c64f1595fc244617ff1f725ea5f3bd30234542b.tar.bz2 ayatana-indicator-application-7c64f1595fc244617ff1f725ea5f3bd30234542b.zip | |
New upstream release.
∘ Fix ordering of indicators
∘ No more duplication of indicators on the panel (LP: #708243)
∘ Using proper object on async call (LP: #734584)
∘ Protect from the accessible description being NULL. (LP: #724767)
Diffstat (limited to 'src/application-service-appstore.c')
| -rw-r--r-- | src/application-service-appstore.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index 10feef5..25eba69 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -374,6 +374,7 @@ load_override_file (GHashTable * hash, const gchar * filename) g_return_if_fail(filename != NULL); if (!g_file_test(filename, G_FILE_TEST_EXISTS)) { + g_debug("Override file '%s' doesn't exist", filename); return; } @@ -438,7 +439,7 @@ got_all_properties (GObject * source_object, GAsyncResult * res, * icon_theme_path = NULL, * index = NULL, * label = NULL, * guide = NULL; - GVariant * properties = g_dbus_proxy_call_finish(app->props, res, &error); + GVariant * properties = g_dbus_proxy_call_finish(G_DBUS_PROXY(source_object), res, &error); if (app->props_cancel != NULL) { g_object_unref(app->props_cancel); @@ -486,6 +487,7 @@ got_all_properties (GObject * source_object, GAsyncResult * res, } /* else ignore */ } g_variant_iter_free (iter); + g_variant_unref(properties); if (menu == NULL || id == NULL || category == NULL || status == NULL || icon_name == NULL) { @@ -524,6 +526,7 @@ got_all_properties (GObject * source_object, GAsyncResult * res, app->ordering_index = GPOINTER_TO_UINT(ordering_index_over); } g_debug("'%s' ordering index is '%X'", app->id, app->ordering_index); + app->appstore->priv->applications = g_list_sort_with_data(app->appstore->priv->applications, app_sort_func, NULL); if (label != NULL) { app->label = g_variant_dup_string(label, NULL); @@ -1238,9 +1241,10 @@ get_applications (ApplicationServiceAppstore * appstore) } g_variant_builder_add (&builder, "(sisossss)", app->icon, - position++, app->dbus_name, app->menu, - app->icon_theme_path, app->label, - app->guide, app->icon_desc); + position++, app->dbus_name, app->menu, + app->icon_theme_path, app->label, + app->guide, + (app->icon_desc != NULL) ? app->icon_desc : ""); } out = g_variant_builder_end(&builder); |