diff options
| author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2012-12-14 10:56:00 +0100 |
|---|---|---|
| committer | Lars Uebernickel <lars.uebernickel@canonical.com> | 2012-12-14 10:56:00 +0100 |
| commit | c46e38d7ab03589a7c7d4fd5fa52ef0bb5f1a9d5 (patch) | |
| tree | 86f1dd2cf76a743ae8108a68be042a8468e8f8b8 | |
| parent | 68e65013c13570ac4c6e1c526eefbbec264778f1 (diff) | |
| download | ayatana-indicator-messages-c46e38d7ab03589a7c7d4fd5fa52ef0bb5f1a9d5.tar.gz ayatana-indicator-messages-c46e38d7ab03589a7c7d4fd5fa52ef0bb5f1a9d5.tar.bz2 ayatana-indicator-messages-c46e38d7ab03589a7c7d4fd5fa52ef0bb5f1a9d5.zip | |
im_application_list_proxy_created: fix error condition
Also, don't print a warning when the proy couldn't be created because the
operation was cancelled. This only happens when the service is shutting down
or when one application replaces another one with the same desktop file (in
which case we already warn with a more descriptive message).
| -rw-r--r-- | src/im-application-list.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/im-application-list.c b/src/im-application-list.c index 5a7f768..d3d8dad 100644 --- a/src/im-application-list.c +++ b/src/im-application-list.c @@ -796,9 +796,10 @@ im_application_list_proxy_created (GObject *source_object, GError *error = NULL; app->proxy = indicator_messages_application_proxy_new_finish (result, &error); - if (!app) + if (!app->proxy) { - g_warning ("could not create application proxy: %s", error->message); + if (error->code != G_IO_ERROR_CANCELLED) + g_warning ("could not create application proxy: %s", error->message); g_error_free (error); return; } |