Merge lp:~3v1n0/indicator-session/unity-session into lp:indicator-session/14.04

[Marco Trevisan (Treviño)]

DBusActions: use unity session APIs when unity is running

Use Immediate lock when switching, and rely to standard lock (with fade) in normal cases.

Fixes the unity fade-to-lock that might happen after switching a session, and thus that could quickly present user informations to others (that just switch tty).

[lp:~3v1n0/indicator-session/unity-session]

438. By Marco Trevisan (Treviño) on 2014-04-10

actions: cleanup spacing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:438
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/132/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-armhf-ci/28/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-session-ci/132/rebuild

review: Needs Fixing (continuous-integration)

[lp:~3v1n0/indicator-session/unity-session]

439. By Marco Trevisan (Treviño) on 2014-04-10

ScreenSaver API: add SimulateUserActivity back

440. By Marco Trevisan (Treviño) on 2014-04-10

DBusActions: use if/else instead of returning in lock_current_session

[Lars Karlitski (larsu)]

Looks good to me, thanks.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:439
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/133/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-amd64-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-armhf-ci/29/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-session-ci/133/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:440
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/134/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-amd64-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-armhf-ci/30/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-session-ci/134/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

the CI says tests are unhappy
"[ FAILED ] Actions.SwitchToScreensaver"

review: Needs Fixing

[lp:~3v1n0/indicator-session/unity-session]

441. By Marco Trevisan (Treviño) on 2014-04-10

MockUnitySession: add new mock for unity session, and use it in tests

[Charles Kerr (charlesk)]

Looks good.

This is actually a very timely patch: it also helps with bug #1296814 as paulliu's going to reuse com.canonical.Unity.Session for bug #1302213 :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:441
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/135/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-trusty-armhf-ci/31/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-session-ci/135/rebuild

review: Approve (continuous-integration)

=== modified file 'src/backend-dbus/CMakeLists.txt'
--- src/backend-dbus/CMakeLists.txt	2013-07-02 02:00:17 +0000
+++ src/backend-dbus/CMakeLists.txt	2014-04-10 15:11:29 +0000
@@ -14,7 +14,7 @@
 add_gdbus_codegen (BACKEND_GENERATED_SOURCES dbus-accounts
                    org.freedesktop
                    ${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.Accounts.xml)
-                   
+
 add_gdbus_codegen (BACKEND_GENERATED_SOURCES dbus-user
                    org.freedesktop
                    ${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.Accounts.User.xml)
@@ -43,6 +43,10 @@
                    org.gnome.SessionManager
                    ${CMAKE_CURRENT_SOURCE_DIR}/org.gnome.SessionManager.EndSessionDialog.xml)
 
+add_gdbus_codegen (BACKEND_GENERATED_SOURCES unity-session
+                   com.canonical
+                   ${CMAKE_CURRENT_SOURCE_DIR}/com.canonical.Unity.Session.xml)
+
 set (SOURCES actions.c guest.c users.c backend-dbus.c utils.c)
 
 # add warnings/coverage info on handwritten files

=== modified file 'src/backend-dbus/actions.c'
--- src/backend-dbus/actions.c	2014-01-21 21:31:50 +0000
+++ src/backend-dbus/actions.c	2014-04-10 15:11:29 +0000
@@ -25,6 +25,7 @@
 #include "dbus-webcredentials.h"
 #include "gnome-screen-saver.h"
 #include "gnome-session-manager.h"
+#include "unity-session.h"
 
 #include "actions.h"
 
@@ -43,6 +44,7 @@
   GSettings * indicator_settings;
   GnomeScreenSaver * screen_saver;
   GnomeSessionManager * session_manager;
+  UnitySession * unity_session;
   Login1Manager * login1_manager;
   GCancellable * login1_manager_cancellable;
   Login1Seat * login1_seat;
@@ -197,6 +199,22 @@
 }
 
 static void
+on_unity_proxy_ready (GObject * o G_GNUC_UNUSED, GAsyncResult * res, gpointer gself)
+{
+  GError * err;
+  UnitySession * us;
+
+  err = NULL;
+  us = unity_session_proxy_new_for_bus_finish (res, &err);
+  if (err == NULL)
+    {
+      INDICATOR_SESSION_ACTIONS_DBUS(gself)->priv->unity_session = us;
+    }
+
+  log_and_clear_error (&err, G_STRLOC, G_STRFUNC);
+}
+
+static void
 on_can_suspend_ready (GObject * o, GAsyncResult * res, gpointer gself)
 {
   char * str;
@@ -758,20 +776,54 @@
 ****
 ***/
 
+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)
+lock_current_session (IndicatorSessionActions * self, gboolean immediate)
 {
   priv_t * p = INDICATOR_SESSION_ACTIONS_DBUS(self)->priv;
 
-  g_return_if_fail (p->screen_saver != NULL);
+  if (have_unity_session (self))
+    {
+      if (immediate)
+        {
+          unity_session_call_prompt_lock (p->unity_session, p->cancellable, NULL, NULL);
+        }
+      else
+        {
+          unity_session_call_lock (p->unity_session, p->cancellable, NULL, NULL);
+        }
+    }
+  else
+    {
+      g_return_if_fail (p->screen_saver != NULL);
 
-  gnome_screen_saver_call_lock (p->screen_saver, p->cancellable, NULL, NULL);
+      gnome_screen_saver_call_lock (p->screen_saver, p->cancellable, NULL, NULL);
+    }
 }
 
 static void
 my_switch_to_screensaver (IndicatorSessionActions * self)
 {
-  lock_current_session (self);
+  lock_current_session (self, FALSE);
 }
 
 static void
@@ -781,6 +833,8 @@
 
   g_return_if_fail (p->dm_seat != NULL);
 
+  lock_current_session (self, TRUE);
+
   display_manager_seat_call_switch_to_greeter (p->dm_seat,
                                                p->dm_seat_cancellable,
                                                NULL, NULL);
@@ -793,7 +847,7 @@
 
   g_return_if_fail (p->dm_seat != NULL);
 
-  lock_current_session (self);
+  lock_current_session (self, TRUE);
 
   display_manager_seat_call_switch_to_guest (p->dm_seat, "",
                                              p->dm_seat_cancellable,
@@ -807,6 +861,8 @@
 
   g_return_if_fail (p->dm_seat != NULL);
 
+  lock_current_session (self, TRUE);
+
   display_manager_seat_call_switch_to_user (p->dm_seat, username, "",
                                             p->dm_seat_cancellable,
                                             NULL, NULL);
@@ -850,6 +906,7 @@
 
   g_clear_object (&p->screen_saver);
   g_clear_object (&p->session_manager);
+  g_clear_object (&p->unity_session);
   set_dm_seat (self, NULL);
   set_login1_manager (self, NULL);
   set_login1_seat (self, NULL);
@@ -952,6 +1009,14 @@
                                         on_screensaver_proxy_ready,
                                         self);
 
+  unity_session_proxy_new_for_bus (G_BUS_TYPE_SESSION,
+                                   G_DBUS_PROXY_FLAGS_NONE,
+                                   "com.canonical.Unity",
+                                   "/com/canonical/Unity/Session",
+                                   p->cancellable,
+                                   on_unity_proxy_ready,
+                                   self);
+
   gnome_session_manager_proxy_new_for_bus (G_BUS_TYPE_SESSION,
                                            G_DBUS_PROXY_FLAGS_NONE,
                                            "org.gnome.SessionManager",

=== added file 'src/backend-dbus/com.canonical.Unity.Session.xml'
--- src/backend-dbus/com.canonical.Unity.Session.xml	1970-01-01 00:00:00 +0000
+++ src/backend-dbus/com.canonical.Unity.Session.xml	2014-04-10 15:11:29 +0000
@@ -0,0 +1,12 @@
+<!DOCTYPE node PUBLIC
+"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <interface name="com.canonical.Unity.Session">
+    <method name="Lock" />
+    <method name="PromptLock" />
+    <method name="RequestLogout" />
+    <method name="RequestReboot" />
+    <method name="RequestShutdown" />
+  </interface>
+</node>

=== modified file 'tests/backend-dbus/CMakeLists.txt'
--- tests/backend-dbus/CMakeLists.txt	2013-06-25 04:14:57 +0000
+++ tests/backend-dbus/CMakeLists.txt	2014-04-10 15:11:29 +0000
@@ -23,6 +23,8 @@
              mock-object.h
              mock-screen-saver.cc
              mock-screen-saver.h
+             mock-unity-session.cc
+             mock-unity-session.h
              mock-session-manager.cc
              mock-session-manager.h
              mock-user.cc

=== modified file 'tests/backend-dbus/gtest-mock-dbus-fixture.h'
--- tests/backend-dbus/gtest-mock-dbus-fixture.h	2013-06-25 04:14:57 +0000
+++ tests/backend-dbus/gtest-mock-dbus-fixture.h	2014-04-10 15:11:29 +0000
@@ -25,6 +25,7 @@
 #include "mock-display-manager-seat.h"
 #include "mock-end-session-dialog.h"
 #include "mock-screen-saver.h"
+#include "mock-unity-session.h"
 #include "mock-session-manager.h"
 #include "mock-user.h"
 #include "mock-webcredentials.h"
@@ -42,6 +43,7 @@
   protected:
 
     MockScreenSaver * screen_saver;
+    MockUnitySession * unity_session;
     MockSessionManager * session_manager;
     MockDisplayManagerSeat * dm_seat;
     MockAccounts * accounts;
@@ -60,6 +62,7 @@
       end_session_dialog = new MockEndSessionDialog (loop, conn);
       session_manager = new MockSessionManager (loop, conn);
       screen_saver = new MockScreenSaver (loop, conn);
+      unity_session = new MockUnitySession (loop, conn);
       dm_seat = new MockDisplayManagerSeat (loop, conn);
       g_setenv ("XDG_SEAT_PATH", dm_seat->path(), TRUE);
       dm_seat->set_guest_allowed (false);
@@ -83,6 +86,7 @@
       delete login1_manager;
       delete dm_seat;
       delete screen_saver;
+      delete unity_session;
       delete session_manager;
       delete end_session_dialog;
       delete webcredentials;

=== added file 'tests/backend-dbus/mock-unity-session.cc'
--- tests/backend-dbus/mock-unity-session.cc	1970-01-01 00:00:00 +0000
+++ tests/backend-dbus/mock-unity-session.cc	2014-04-10 15:11:29 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * Authors:
+ *   Marco Trevisan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "mock-unity-session.h"
+
+
+gboolean
+MockUnitySession :: handle_lock (UnitySession      * us,
+                                 GDBusMethodInvocation * inv,
+                                 gpointer                gself)
+{
+  static_cast<MockUnitySession*>(gself)->my_last_action = Lock;
+  unity_session_complete_lock (us, inv);
+  return true;
+}
+
+gboolean
+MockUnitySession :: handle_prompt_lock (UnitySession      * us,
+                                        GDBusMethodInvocation * inv,
+                                        gpointer                gself)
+{
+  static_cast<MockUnitySession*>(gself)->my_last_action = PromptLock;
+  unity_session_complete_prompt_lock (us, inv);
+  return true;
+}
+
+/***
+****
+***/
+
+namespace
+{
+  const char * const UNITY_SESSION_NAME = "com.canonical.Unity";
+  const char * const UNITY_SESSION_PATH = "/com/canonical/Unity/Session";
+
+}
+
+MockUnitySession :: MockUnitySession (GMainLoop       * loop,
+                                      GDBusConnection * bus_connection):
+  MockObject (loop, bus_connection, UNITY_SESSION_NAME, UNITY_SESSION_PATH),
+  my_skeleton (unity_session_skeleton_new ()),
+  my_last_action (None)
+{
+  g_signal_connect (my_skeleton, "handle-lock",
+                    G_CALLBACK(handle_lock), this);
+  g_signal_connect (my_skeleton, "handle-prompt-lock",
+                    G_CALLBACK(handle_prompt_lock), this);
+
+  set_skeleton (G_DBUS_INTERFACE_SKELETON(my_skeleton));
+}
+
+MockUnitySession :: ~MockUnitySession ()
+{
+  g_clear_object (&my_skeleton);
+}

=== added file 'tests/backend-dbus/mock-unity-session.h'
--- tests/backend-dbus/mock-unity-session.h	1970-01-01 00:00:00 +0000
+++ tests/backend-dbus/mock-unity-session.h	2014-04-10 15:11:29 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * Authors:
+ *   Marco Trevisan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MOCK_UNITY_SESSION_H
+#define MOCK_UNITY_SESSION_H
+
+#include "mock-object.h" // parent class
+#include "backend-dbus/unity-session.h" // Unity Session
+
+class MockUnitySession: public MockObject
+{
+  public:
+
+    MockUnitySession (GMainLoop       * loop,
+                      GDBusConnection * bus_connection);
+    virtual ~MockUnitySession ();
+
+  public:
+
+    enum Action { None, Lock, PromptLock, RequestLogout, RequestShutdown, RequestReboot };
+    Action last_action () { return my_last_action; }
+
+  private:
+
+    UnitySession * my_skeleton;
+    Action my_last_action;
+
+    static gboolean handle_lock (UnitySession *,
+                                 GDBusMethodInvocation *,
+                                 gpointer);
+    static gboolean handle_prompt_lock (UnitySession *,
+                                        GDBusMethodInvocation *,
+                                        gpointer);
+
+};
+
+#endif

=== modified file 'tests/backend-dbus/test-actions.cc'
--- tests/backend-dbus/test-actions.cc	2013-07-12 07:05:35 +0000
+++ tests/backend-dbus/test-actions.cc	2014-04-10 15:11:29 +0000
@@ -316,17 +316,19 @@
 
 TEST_F (Actions, SwitchToScreensaver)
 {
-  ASSERT_EQ (MockScreenSaver::None, screen_saver->last_action());
+  ASSERT_EQ (MockUnitySession::None, unity_session->last_action());
   indicator_session_actions_switch_to_screensaver (actions);
   wait_msec (50);
-  ASSERT_EQ (MockScreenSaver::Lock, screen_saver->last_action());
+  ASSERT_EQ (MockUnitySession::Lock, unity_session->last_action());
 }
 
 TEST_F (Actions, SwitchToGreeter)
 {
   ASSERT_NE (MockDisplayManagerSeat::GREETER, dm_seat->last_action());
+  ASSERT_EQ (MockUnitySession::None, unity_session->last_action());
   indicator_session_actions_switch_to_greeter (actions);
   wait_msec (50);
+  ASSERT_EQ (MockUnitySession::PromptLock, unity_session->last_action());
   ASSERT_EQ (MockDisplayManagerSeat::GREETER, dm_seat->last_action());
 }
 
@@ -346,6 +348,7 @@
   wait_for_signal (login1_seat->skeleton(), "notify::active-session");
   ASSERT_EQ (guest_session_tag, login1_seat->active_session());
   wait_msec (50);
+  ASSERT_EQ (MockUnitySession::PromptLock, unity_session->last_action());
 }
 
 TEST_F (Actions, SwitchToUsername)
@@ -367,6 +370,7 @@
   wait_for_signal (login1_seat->skeleton(), "notify::active-session");
   ASSERT_EQ (dr1_session, login1_seat->active_session());
   wait_msec (50);
+  ASSERT_EQ (MockUnitySession::PromptLock, unity_session->last_action());
 
   indicator_session_actions_switch_to_username (actions, dr2_username);
   wait_for_signal (login1_seat->skeleton(), "notify::active-session");