From a302870b4955b0f20573fc4ddb12f4fa3aded911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 10 Apr 2014 03:52:50 +0200 Subject: Actions: add Unity session proxy, and use to lock the screen if available --- src/backend-dbus/CMakeLists.txt | 6 ++- src/backend-dbus/actions.c | 55 ++++++++++++++++++++++-- src/backend-dbus/com.canonical.Unity.Session.xml | 12 ++++++ 3 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 src/backend-dbus/com.canonical.Unity.Session.xml (limited to 'src') diff --git a/src/backend-dbus/CMakeLists.txt b/src/backend-dbus/CMakeLists.txt index fa41534..1fb9d7c 100644 --- a/src/backend-dbus/CMakeLists.txt +++ b/src/backend-dbus/CMakeLists.txt @@ -14,7 +14,7 @@ add_gdbus_codegen (BACKEND_GENERATED_SOURCES dbus-webcredentials 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 @@ add_gdbus_codegen (BACKEND_GENERATED_SOURCES dbus-end-session-dialog 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 diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c index b1fa8ac..d99f81f 100644 --- a/src/backend-dbus/actions.c +++ b/src/backend-dbus/actions.c @@ -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 @@ struct _IndicatorSessionActionsDbusPriv GSettings * indicator_settings; GnomeScreenSaver * screen_saver; GnomeSessionManager * session_manager; + UnitySession * unity_session; Login1Manager * login1_manager; GCancellable * login1_manager_cancellable; Login1Seat * login1_seat; @@ -196,6 +198,23 @@ on_screensaver_proxy_ready (GObject * o G_GNUC_UNUSED, GAsyncResult * res, gpoin log_and_clear_error (&err, G_STRLOC, G_STRFUNC); } +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) { @@ -759,9 +778,30 @@ my_about (IndicatorSessionActions * self G_GNUC_UNUSED) ***/ static void -lock_current_session (IndicatorSessionActions * self) +lock_current_session (IndicatorSessionActions * self, gboolean immediate) { 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) + { + 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); + } + + g_free (name_owner); + return; + } + } g_return_if_fail (p->screen_saver != NULL); @@ -771,7 +811,7 @@ lock_current_session (IndicatorSessionActions * self) static void my_switch_to_screensaver (IndicatorSessionActions * self) { - lock_current_session (self); + lock_current_session (self, FALSE); } static void @@ -793,7 +833,7 @@ my_switch_to_guest (IndicatorSessionActions * self) 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, @@ -850,6 +890,7 @@ my_dispose (GObject * o) 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 +993,14 @@ indicator_session_actions_dbus_init (IndicatorSessionActionsDbus * self) 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", diff --git a/src/backend-dbus/com.canonical.Unity.Session.xml b/src/backend-dbus/com.canonical.Unity.Session.xml new file mode 100644 index 0000000..1dce43e --- /dev/null +++ b/src/backend-dbus/com.canonical.Unity.Session.xml @@ -0,0 +1,12 @@ + + + + + + + + + + -- cgit v1.2.3 From 4ad55d6c928cff40ed58a6a12971355a6757bc53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 10 Apr 2014 03:55:12 +0200 Subject: Actions: lock current session also when switching to greeter and another user --- src/backend-dbus/actions.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c index d99f81f..b5810a7 100644 --- a/src/backend-dbus/actions.c +++ b/src/backend-dbus/actions.c @@ -821,6 +821,8 @@ my_switch_to_greeter (IndicatorSessionActions * self) 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); @@ -847,6 +849,8 @@ my_switch_to_username (IndicatorSessionActions * self, const char * username) 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); -- cgit v1.2.3 From 78112284ec71ea481625408455835e1dc4e0d7f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 10 Apr 2014 06:58:04 +0200 Subject: actions: add have_unity_session to check if unity is currently running and exporting his session bus --- src/backend-dbus/actions.c | 37 ++++++++++++++++++++---------- src/backend-dbus/org.gnome.ScreenSaver.xml | 3 --- 2 files changed, 25 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c index b5810a7..f395e12 100644 --- a/src/backend-dbus/actions.c +++ b/src/backend-dbus/actions.c @@ -777,8 +777,8 @@ my_about (IndicatorSessionActions * self G_GNUC_UNUSED) **** ***/ -static void -lock_current_session (IndicatorSessionActions * self, gboolean immediate) +static gboolean +have_unity_session (IndicatorSessionActions * self) { priv_t * p = INDICATOR_SESSION_ACTIONS_DBUS(self)->priv; gchar * name_owner; @@ -789,20 +789,33 @@ lock_current_session (IndicatorSessionActions * self, gboolean immediate) if (name_owner) { - 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); - } - g_free (name_owner); - return; + 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 (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); + } + + return; + } + g_return_if_fail (p->screen_saver != NULL); gnome_screen_saver_call_lock (p->screen_saver, p->cancellable, NULL, NULL); diff --git a/src/backend-dbus/org.gnome.ScreenSaver.xml b/src/backend-dbus/org.gnome.ScreenSaver.xml index c21fdc5..a1da786 100644 --- a/src/backend-dbus/org.gnome.ScreenSaver.xml +++ b/src/backend-dbus/org.gnome.ScreenSaver.xml @@ -8,9 +8,6 @@ - - - -- cgit v1.2.3 From 9fd91d7e3d07219922cc4ac0c749262bc36ae024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 10 Apr 2014 07:31:32 +0200 Subject: actions: cleanup spacing --- src/backend-dbus/actions.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c index f395e12..3d4b6f0 100644 --- a/src/backend-dbus/actions.c +++ b/src/backend-dbus/actions.c @@ -209,7 +209,6 @@ on_unity_proxy_ready (GObject * o G_GNUC_UNUSED, GAsyncResult * res, gpointer gs if (err == NULL) { INDICATOR_SESSION_ACTIONS_DBUS(gself)->priv->unity_session = us; - } log_and_clear_error (&err, G_STRLOC, G_STRFUNC); -- cgit v1.2.3 From 99418d9780518e2bcda8034ad9cb950b899f8cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 10 Apr 2014 14:16:40 +0200 Subject: ScreenSaver API: add SimulateUserActivity back --- src/backend-dbus/org.gnome.ScreenSaver.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/backend-dbus/org.gnome.ScreenSaver.xml b/src/backend-dbus/org.gnome.ScreenSaver.xml index a1da786..c21fdc5 100644 --- a/src/backend-dbus/org.gnome.ScreenSaver.xml +++ b/src/backend-dbus/org.gnome.ScreenSaver.xml @@ -8,6 +8,9 @@ + + + -- cgit v1.2.3 From 700dbeacd2c0377e4f1c9c48565f61e437c40534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 10 Apr 2014 14:39:14 +0200 Subject: DBusActions: use if/else instead of returning in lock_current_session --- src/backend-dbus/actions.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/backend-dbus/actions.c b/src/backend-dbus/actions.c index 3d4b6f0..cac7c40 100644 --- a/src/backend-dbus/actions.c +++ b/src/backend-dbus/actions.c @@ -811,13 +811,13 @@ lock_current_session (IndicatorSessionActions * self, gboolean immediate) { unity_session_call_lock (p->unity_session, p->cancellable, NULL, NULL); } - - return; } + else + { + g_return_if_fail (p->screen_saver != NULL); - 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 -- cgit v1.2.3