in our async callbacks, don't call g_warning() if the task was cancelled by the client

4 files changed, 58 insertions, 41 deletions

diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c
index 8994710..bc196f2 100644
--- a/src/backend-dbus/actions.c
+++ b/src/backend-dbus/actions.c
@@ -68,7 +68,9 @@ log_and_clear_error (GError ** err, const char * loc, const char * func)
 {
   if (*err)
     {
-      g_warning ("%s %s: %s", loc, func, (*err)->message);
+      if (!g_error_matches (*err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", loc, func, (*err)->message);
+
       g_clear_error (err);
     }
 }
@@ -591,14 +593,6 @@ my_dispose (GObject * o)
   G_OBJECT_CLASS (indicator_session_actions_dbus_parent_class)->dispose (o);
 }
 
-static void
-my_finalize (GObject * o)
-{
-  /*IndicatorSessionActionsDbus * u = INDICATOR_SESSION_ACTIONS_DBUS (o);*/
-
-  G_OBJECT_CLASS (indicator_session_actions_dbus_parent_class)->finalize (o);
-}
-
 /***
 ****  GObject Boilerplate
 ***/
@@ -612,7 +606,6 @@ indicator_session_actions_dbus_class_init (IndicatorSessionActionsDbusClass * kl
 
   object_class = G_OBJECT_CLASS (klass);
   object_class->dispose = my_dispose;
-  object_class->finalize = my_finalize;
 
   actions_class = INDICATOR_SESSION_ACTIONS_CLASS (klass);
   actions_class->can_lock = my_can_lock;
diff --git a/src/backend-dbus/guest.c b/src/backend-dbus/guest.c
index 1559aa8..317152d 100644
--- a/src/backend-dbus/guest.c
+++ b/src/backend-dbus/guest.c
@@ -95,7 +95,9 @@ on_active_uid_ready (GObject * o G_GNUC_UNUSED, GAsyncResult * res, gpointer gse
 
   if (err != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+      if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+
       g_error_free (err);
     }
   else
@@ -140,7 +142,10 @@ on_active_session_proxy_ready (GObject * o G_GNUC_UNUSED, GAsyncResult * res, gp
 
   if (err != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+      if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+
+      g_error_free (err);
     }
   else
     {
@@ -253,7 +258,9 @@ on_user_proxy_ready (GObject       * o     G_GNUC_UNUSED,
 
   if (err != NULL)
     {
-      g_warning ("%s: %s", G_STRFUNC, err->message);
+      if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s: %s", G_STRFUNC, err->message);
+
       g_error_free (err);
     }
   else if (is_guest (user))
@@ -290,7 +297,9 @@ on_user_list_ready (GObject * o, GAsyncResult * res, gpointer gself)
   accounts_call_list_cached_users_finish (ACCOUNTS(o), &paths, res, &err);
   if (err != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+      if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+
       g_error_free (err);
     }
   else
@@ -389,7 +398,9 @@ on_switch_to_guest_done (GObject * o, GAsyncResult * res, gpointer unused G_GNUC
   display_manager_seat_call_switch_to_guest_finish (DISPLAY_MANAGER_SEAT(o), res, &err);
   if (err != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+      if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+
       g_error_free (err);
     }
 }
@@ -418,14 +429,6 @@ my_dispose (GObject * o)
   G_OBJECT_CLASS (indicator_session_guest_dbus_parent_class)->dispose (o);
 }
 
-static void
-my_finalize (GObject * o)
-{
-  /*IndicatorSessionGuestDbus * u = INDICATOR_SESSION_GUEST_DBUS (o);*/
-
-  G_OBJECT_CLASS (indicator_session_guest_dbus_parent_class)->finalize (o);
-}
-
 static gboolean
 my_is_allowed (IndicatorSessionGuest * self)
 {
@@ -483,7 +486,6 @@ indicator_session_guest_dbus_class_init (IndicatorSessionGuestDbusClass * klass)
 
   object_class = G_OBJECT_CLASS (klass);
   object_class->dispose = my_dispose;
-  object_class->finalize = my_finalize;
 
   guest_class = INDICATOR_SESSION_GUEST_CLASS (klass);
   guest_class->is_allowed = my_is_allowed;
diff --git a/src/backend-dbus/users.c b/src/backend-dbus/users.c
index 34e0c97..6d9ada6 100644
--- a/src/backend-dbus/users.c
+++ b/src/backend-dbus/users.c
@@ -154,7 +154,9 @@ on_user_proxy_ready (GObject       * o        G_GNUC_UNUSED,
   user = accounts_user_proxy_new_for_bus_finish (res, &err);
   if (err != NULL)
     {
-      g_warning ("%s: %s", G_STRFUNC, err->message);
+      if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s: %s", G_STRFUNC, err->message);
+
       g_error_free (err);
     }
   else
@@ -187,7 +189,9 @@ on_user_list_ready (GObject * o, GAsyncResult * res, gpointer gself)
   accounts_call_list_cached_users_finish (ACCOUNTS(o), &paths, res, &err);
   if (err != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+      if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+
       g_error_free (err);
     }
   else
@@ -317,7 +321,9 @@ on_session_proxy_uid_ready (GObject       * o,
   console_kit_session_call_get_unix_user_finish (session, &uid, res, &err);
   if (err != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+      if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+
       g_error_free (err);
     }
   else if (uid)
@@ -347,7 +353,9 @@ on_session_x11_display_ready (GObject       * o,
   console_kit_session_call_get_x11_display_finish (session, &gui, res, &err);
   if (err != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+      if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+
       g_error_free (err);
     }
   else
@@ -378,7 +386,9 @@ on_session_proxy_ready (GObject * o G_GNUC_UNUSED, GAsyncResult * res, gpointer
   session = console_kit_session_proxy_new_finish (res, &err);
   if (err != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+      if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+
       g_error_free (err);
     }
   else if (session != NULL)
@@ -417,7 +427,9 @@ on_session_list_ready (GObject * o, GAsyncResult * res, gpointer gself)
                                              &sessions, res, &err);
   if (err != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+      if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+
       g_error_free (err);
     }
   else
@@ -508,7 +520,9 @@ on_seat_active_session_ready (GObject * o, GAsyncResult * res, gpointer gself)
   console_kit_seat_call_get_active_session_finish (seat, &ssid, res, &err);
   if (err != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+      if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, err->message);
+
       g_error_free (err);
     }
   else if (ssid != NULL)
diff --git a/src/backend-dbus/utils.c b/src/backend-dbus/utils.c
index 86a5e5a..c8abc2b 100644
--- a/src/backend-dbus/utils.c
+++ b/src/backend-dbus/utils.c
@@ -91,7 +91,8 @@ on_user_proxy_ready (GObject       * o       G_GNUC_UNUSED,
 
   if (data->error != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
+      if (!g_error_matches (data->error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
     }
   else
     {
@@ -112,7 +113,8 @@ on_user_path_ready (GObject * o G_GNUC_UNUSED, GAsyncResult * res, gpointer gdat
 
   if (data->error != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
+      if (!g_error_matches (data->error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
     }
   else if (path != NULL)
     {
@@ -141,7 +143,8 @@ on_uid_ready (GObject * o G_GNUC_UNUSED, GAsyncResult * res, gpointer gdata)
   console_kit_session_call_get_unix_user_finish (data->current_session, &uid, res, &data->error);
   if (data->error != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
+      if (!g_error_matches (data->error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
     }
   else if (uid)
     {
@@ -165,7 +168,7 @@ on_seat_proxy_ready (GObject * o G_GNUC_UNUSED, GAsyncResult * res, gpointer gda
 
   data->current_seat = console_kit_seat_proxy_new_for_bus_finish (res, &data->error);
 
-  if (data->error != NULL)
+  if (data->error && !g_error_matches (data->error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
     g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
 
   finish_callback (data);
@@ -182,7 +185,8 @@ on_sid_ready (GObject * o G_GNUC_UNUSED, GAsyncResult * res, gpointer gdata)
 
   if (data->error != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
+      if (!g_error_matches (data->error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
     }
   else if (sid != NULL)
     {
@@ -210,7 +214,8 @@ on_session_proxy_ready (GObject * o G_GNUC_UNUSED, GAsyncResult * res, gpointer
   data->current_session = console_kit_session_proxy_new_finish (res, &data->error);
   if (data->error != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
+      if (!g_error_matches (data->error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
     }
   else
     {
@@ -243,7 +248,8 @@ on_current_session_ready (GObject * o G_GNUC_UNUSED, GAsyncResult * res, gpointe
                                                        &data->error);
   if (data->error != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
+      if (!g_error_matches (data->error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
     }
   else if (ssid)
     {
@@ -275,7 +281,8 @@ on_display_manager_seat_proxy_ready (GObject      * o         G_GNUC_UNUSED,
 
   if (data->error != NULL)
     {
-      g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
+      if (!g_error_matches (data->error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
     }
   else if (seat != NULL)
     {
@@ -302,7 +309,8 @@ on_console_kit_manager_proxy_ready (GObject      * o       G_GNUC_UNUSED,
 
       if (data->error != NULL)
         {
-          g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
+          if (!g_error_matches (data->error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+            g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
         }
       else
         {
@@ -330,7 +338,7 @@ on_accounts_proxy_ready (GObject * o G_GNUC_UNUSED, GAsyncResult * res, gpointer
     {
       data->account_manager = accounts_proxy_new_for_bus_finish (res, &data->error);
 
-      if (data->error != NULL)
+      if (data->error && !g_error_matches (data->error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
         g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, data->error->message);
     }