aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-04-07 13:32:58 -0500
committerTed Gould <ted@gould.cx>2011-04-07 13:32:58 -0500
commitb0a027c1d23a80bdee99b119ec10567f51f80b66 (patch)
treeb5b5a9cf48a9618a8580bc20fa4b3b72d5d99644
parentfe82495302aee3ad30250507a685b9ae1473261c (diff)
parentf17f35feaf2f6d413302b813ef451d20491f4894 (diff)
downloadayatana-indicator-application-b0a027c1d23a80bdee99b119ec10567f51f80b66.tar.gz
ayatana-indicator-application-b0a027c1d23a80bdee99b119ec10567f51f80b66.tar.bz2
ayatana-indicator-application-b0a027c1d23a80bdee99b119ec10567f51f80b66.zip
Import upstream version 0.3.1
-rw-r--r--ChangeLog16
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac4
-rw-r--r--data/ordering-override.keyfile2
-rw-r--r--src/application-service-appstore.c19
5 files changed, 47 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 08cc00c..de65255 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
# Generated by Makefile. Do not edit.
+2011-04-07 Ted Gould <ted@gould.cx>
+
+ 0.3.1
+
+2011-04-07 Ted Gould <ted@gould.cx>
+
+ Handle async cancels
+
+2011-04-07 Michael Terry <mike@mterry.name>
+
+ cancel-guard several callback functions
+
+2011-04-06 Ted Gould <ted@gould.cx>
+
+ Fixing the name of the network manager applet
+
2011-03-23 Ted Gould <ted@gould.cx>
0.3.0
diff --git a/configure b/configure
index 926d0a6..67f41fe 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for indicator-application 0.3.0.
+# Generated by GNU Autoconf 2.67 for indicator-application 0.3.1.
#
# Report bugs to <ted@canonical.com>.
#
@@ -703,8 +703,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='indicator-application'
PACKAGE_TARNAME='indicator-application'
-PACKAGE_VERSION='0.3.0'
-PACKAGE_STRING='indicator-application 0.3.0'
+PACKAGE_VERSION='0.3.1'
+PACKAGE_STRING='indicator-application 0.3.1'
PACKAGE_BUGREPORT='ted@canonical.com'
PACKAGE_URL=''
@@ -1446,7 +1446,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures indicator-application 0.3.0 to adapt to many kinds of systems.
+\`configure' configures indicator-application 0.3.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1517,7 +1517,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of indicator-application 0.3.0:";;
+ short | recursive ) echo "Configuration of indicator-application 0.3.1:";;
esac
cat <<\_ACEOF
@@ -1634,7 +1634,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-indicator-application configure 0.3.0
+indicator-application configure 0.3.1
generated by GNU Autoconf 2.67
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1914,7 +1914,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by indicator-application $as_me 0.3.0, which was
+It was created by indicator-application $as_me 0.3.1, which was
generated by GNU Autoconf 2.67. Invocation command line was
$ $0 $@
@@ -2735,7 +2735,7 @@ fi
# Define the identity of the package.
PACKAGE=indicator-application
- VERSION=0.3.0
+ VERSION=0.3.1
cat >>confdefs.h <<_ACEOF
@@ -12462,7 +12462,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by indicator-application $as_me 0.3.0, which was
+This file was extended by indicator-application $as_me 0.3.1, which was
generated by GNU Autoconf 2.67. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12528,7 +12528,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-indicator-application config.status 0.3.0
+indicator-application config.status 0.3.1
configured by $0, generated by GNU Autoconf 2.67,
with options \\"\$ac_cs_config\\"
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
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
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) {