From 108f239625577a43667aeb40f02803704bf961f5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 6 Apr 2011 09:06:53 -0500 Subject: Fixing the name of the network manager applet --- data/ordering-override.keyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/ordering-override.keyfile b/data/ordering-override.keyfile index 7adef0c..1468ea0 100644 --- a/data/ordering-override.keyfile +++ b/data/ordering-override.keyfile @@ -1,5 +1,5 @@ [Ordering Index Overrides] -nm_applet=1 +nm-applet=1 gnome-power-manager=2 ibus=3 gst-keyboard-xkb=4 -- cgit v1.2.3 From f57f2e78ccd66ed1fc4dc83f74ee3bdc2ed510e7 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 7 Apr 2011 10:10:11 -0400 Subject: cancel-guard several callback functions --- src/application-service-appstore.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index 25eba69..3e827d5 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -432,7 +432,6 @@ got_all_properties (GObject * source_object, GAsyncResult * res, g_return_if_fail(app != NULL); GError * error = NULL; - ApplicationServiceAppstorePrivate * priv = app->appstore->priv; GVariant * menu = NULL, * id = NULL, * category = NULL, * status = NULL, * icon_name = NULL, * aicon_name = NULL, * icon_desc = NULL, * aicon_desc = NULL, @@ -441,6 +440,11 @@ got_all_properties (GObject * source_object, GAsyncResult * res, GVariant * properties = g_dbus_proxy_call_finish(G_DBUS_PROXY(source_object), res, &error); + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { + g_error_free (error); + return; // Must exit before accessing freed memory + } + if (app->props_cancel != NULL) { g_object_unref(app->props_cancel); app->props_cancel = NULL; @@ -454,6 +458,8 @@ got_all_properties (GObject * source_object, GAsyncResult * res, return; } + ApplicationServiceAppstorePrivate * priv = app->appstore->priv; + /* Grab all properties from variant */ GVariantIter * iter = NULL; const gchar * name = NULL; @@ -1043,6 +1049,11 @@ dbus_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data) GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error); + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { + g_error_free (error); + return; // Must exit before accessing freed memory + } + if (app->dbus_proxy_cancel != NULL) { g_object_unref(app->dbus_proxy_cancel); app->dbus_proxy_cancel = NULL; @@ -1437,6 +1448,12 @@ approver_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data) g_return_if_fail(approver != NULL); GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error); + + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { + g_error_free (error); + return; // Must exit before accessing freed memory + } + ApplicationServiceAppstorePrivate * priv = APPLICATION_SERVICE_APPSTORE_GET_PRIVATE (approver->appstore); if (approver->proxy_cancel != NULL) { -- cgit v1.2.3 From f17f35feaf2f6d413302b813ef451d20491f4894 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Apr 2011 13:30:06 -0500 Subject: 0.3.1 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index be35a93..12bc68b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.3.0, ted@canonical.com) +AC_INIT(indicator-application, 0.3.1, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 0.3.0) +AM_INIT_AUTOMAKE(indicator-application, 0.3.1) AM_MAINTAINER_MODE -- cgit v1.2.3 From 72fbb0886a57574d1442ad6ab18b7404ccbb2375 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Apr 2011 13:34:13 -0500 Subject: releasing version 0.3.1-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3bccc8b..bd5d01d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -indicator-application (0.3.1-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-application (0.3.1-0ubuntu1~ppa1) natty; urgency=low * New upstream release. ∘ Fix the name of "nm-applet" in the overrides file ∘ Handle async tasks being canceled (LP: #752998) - -- Ted Gould Thu, 07 Apr 2011 13:33:10 -0500 + -- Ted Gould Thu, 07 Apr 2011 13:34:09 -0500 indicator-application (0.3.0-0ubuntu1) natty; urgency=low -- cgit v1.2.3