When logging out, prefer com.canonical.Unity.RequestLogout over org.gnome.SessionManager.Logout. Fixes: 1296814

1 files changed, 114 insertions, 32 deletions

diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c
index cac7c40..c19d02a 100644
--- a/src/backend-dbus/actions.c
+++ b/src/backend-dbus/actions.c
@@ -471,18 +471,103 @@ my_hibernate (IndicatorSessionActions * self)
 ****  End Session Dialog
 ***/
 
+static gboolean
+is_owned_proxy (gpointer proxy)
+{
+  gboolean owned = FALSE;
+
+  if ((proxy != NULL) && G_IS_DBUS_PROXY (proxy))
+    {
+      char * name_owner = g_dbus_proxy_get_name_owner (proxy);
+
+      if (name_owner != NULL)
+        {
+          owned = TRUE;
+          g_free (name_owner);
+        }
+    }
+
+  return owned;
+}
+
 static void
-logout_now (IndicatorSessionActionsDbus * self)
+on_gnome_logout_response (GObject * o,
+                          GAsyncResult * res,
+                          gpointer unused G_GNUC_UNUSED)
+{
+  GError * err = NULL;
+  gnome_session_manager_call_logout_finish (GNOME_SESSION_MANAGER(o), res, &err);
+  log_and_clear_error (&err, G_STRLOC, G_STRFUNC);
+}
+
+static gboolean
+logout_now_gnome_session_manager (IndicatorSessionActionsDbus * self)
+{
+  gboolean logout_called = FALSE;
+  priv_t * p = self->priv;
+
+  if (is_owned_proxy (p->session_manager))
+    {
+      g_debug ("%s: calling gnome_session_manager_call_logout()", G_STRFUNC);
+      gnome_session_manager_call_logout (p->session_manager,
+                                         1, /* don't prompt */
+                                         p->cancellable,
+                                         on_gnome_logout_response,
+                                         self);
+      logout_called = TRUE;
+    }
+
+  return logout_called;
+}
+
+static void
+on_unity_logout_response (GObject * o,
+                          GAsyncResult * res,
+                          gpointer gself)
+{
+  GError * error;
+
+  error = NULL;
+  unity_session_call_request_logout_finish (UNITY_SESSION(o), res, &error);
+
+  if (error != NULL)
+    {
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        {
+          g_warning ("%s %s: %s", G_STRLOC, G_STRFUNC, error->message);
+          logout_now_gnome_session_manager(gself);
+        }
+
+      g_clear_error (&error);
+    }
+}
+
+static gboolean
+logout_now_unity (IndicatorSessionActionsDbus * self)
 {
   priv_t * p = self->priv;
+  gboolean called = FALSE;
 
-  g_return_if_fail (p->session_manager != NULL);
+  if (is_owned_proxy (p->unity_session))
+    {
+      called = TRUE;
+      g_debug ("calling unity_session_call_request_logout()");
+      unity_session_call_request_logout (p->unity_session,
+                                         p->cancellable,
+                                         on_unity_logout_response,
+                                         self);
+    }
 
-  gnome_session_manager_call_logout (p->session_manager,
-                                     1, /* don't prompt */
-                                     p->cancellable,
-                                     NULL,
-                                     NULL);
+  return called;
+}
+
+static void
+logout_now (IndicatorSessionActionsDbus * self)
+{
+  if (!logout_now_unity(self) && !logout_now_gnome_session_manager(self))
+    {
+      g_critical("%s can't logout: no Unity nor GNOME session proxy", G_STRFUNC);
+    }
 }
 
 static void
@@ -550,7 +635,17 @@ on_open_end_session_dialog_ready (GObject      * o,
 {
   GError * err = NULL;
   end_session_dialog_call_open_finish (END_SESSION_DIALOG(o), res, &err);
-  log_and_clear_error (&err, G_STRLOC, G_STRFUNC);
+  if (err != NULL)
+    {
+      if (!g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s %s: %s", G_STRFUNC, G_STRLOC, err->message);
+
+      /* Treat errors as user confirmation.
+         Otherwise how will the user ever log out? */
+      logout_now(INDICATOR_SESSION_ACTIONS_DBUS(gself));
+
+      g_clear_error(&err);
+    }
 }
 
 static void
@@ -584,6 +679,7 @@ zenity_question (IndicatorSessionActionsDbus * self,
 {
   char * command_line;
   int exit_status;
+  GError * error;
   gboolean confirmed;
 
   command_line = g_strdup_printf ("%s"
@@ -601,11 +697,16 @@ zenity_question (IndicatorSessionActionsDbus * self,
                                   ok_label,
                                   cancel_label);
 
+  /* Treat errors as user confirmation.
+     Otherwise how will the user ever log out? */
   exit_status = -1;
-  if (!g_spawn_command_line_sync (command_line, NULL, NULL, &exit_status, NULL))
+  error = NULL;
+  if (!g_spawn_command_line_sync (command_line, NULL, NULL, &exit_status, &error))
+    {
+      confirmed = TRUE;
+    }
+  else if (!g_spawn_check_exit_status (exit_status, &error))
     {
-      /* Treat failure-to-prompt as user confirmation.
-         Otherwise how will the user ever log out? */
       confirmed = TRUE;
     }
   else
@@ -613,6 +714,7 @@ zenity_question (IndicatorSessionActionsDbus * self,
       confirmed = exit_status == 0;
     }
 
+  log_and_clear_error (&error, G_STRLOC, G_STRFUNC);
   g_free (command_line);
   return confirmed;
 }
@@ -776,32 +878,12 @@ my_about (IndicatorSessionActions * self G_GNUC_UNUSED)
 ****
 ***/
 
-static gboolean
-have_unity_session (IndicatorSessionActions * self)
-{
-  priv_t * p = INDICATOR_SESSION_ACTIONS_DBUS(self)->priv;
-  gchar * name_owner;
-
-  if (G_IS_DBUS_PROXY (p->unity_session))
-    {
-      name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (p->unity_session));
-
-      if (name_owner)
-        {
-          g_free (name_owner);
-          return TRUE;
-        }
-    }
-
-  return FALSE;
-}
-
 static void
 lock_current_session (IndicatorSessionActions * self, gboolean immediate)
 {
   priv_t * p = INDICATOR_SESSION_ACTIONS_DBUS(self)->priv;
 
-  if (have_unity_session (self))
+  if (is_owned_proxy (p->unity_session))
     {
       if (immediate)
         {