rpm/xfce4-session
SHA256
1
0
Fork 0
forked from pool/xfce4-session
Code Pull Requests Activity

Accepting request 97251 from X11:xfce

Browse Source 
- improve xfce4-session-lock-screen-on-suspend-hibernate.patch and
  only lock the screen if xfce4-power-manager is configured to do
  so and execute xflock4 synchronously

OBS-URL: https://build.opensuse.org/request/show/97251
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfce4-session?expand=0&rev=49
This commit is contained in:
Stephan Kulow 2011-12-21 09:04:28 +00:00 committed by Git OBS Bridge
parent 8d498f1e27
commit b1f6cdf48f
3 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
xfce4-session-lock-screen-on-suspend-hibernate.patch
View File

@ -2,30 +2,54 @@ Index: xfce4-session-4.8.2/xfce4-session/xfsm-shutdown-helper.c
=================================================================== ===================================================================
--- xfce4-session-4.8.2.orig/xfce4-session/xfsm-shutdown-helper.c --- xfce4-session-4.8.2.orig/xfce4-session/xfsm-shutdown-helper.c
+++ xfce4-session-4.8.2/xfce4-session/xfsm-shutdown-helper.c +++ xfce4-session-4.8.2/xfce4-session/xfsm-shutdown-helper.c
@@ -1783,8 +1783,13 @@ gboolean xfsm_shutdown_helper_restart (X @@ -71,6 +71,8 @@
**/
gboolean xfsm_shutdown_helper_suspend (XfsmShutdownHelper *helper, GError **error) #include <libxfce4util/libxfce4util.h>
{
+#include <xfconf/xfconf.h>
+
#include "xfsm-shutdown-helper.h"
#include "xfsm-global.h"
@@ -1722,6 +1724,24 @@ gboolean xfsm_shutdown_helper_send_passw
return TRUE;
}
+static void
+lock_screen (void)
+{
+ XfconfChannel *channel;
+ gboolean ret; + gboolean ret;
+ gint exit_status;
+
+ channel = xfconf_channel_get ("xfce4-power-manager");
+ if (xfconf_channel_get_bool (channel, "/xfce4-power-manager/lock-screen-suspend-hibernate", TRUE))
+ {
+ ret = g_spawn_command_line_sync ("xflock4", NULL, NULL, &exit_status, NULL);
+ if (!ret || exit_status != 0)
+ {
+ g_warning ("Could not lock screen");
+ }
+ }
+}
+
/**
* xfsm_shutdown_helper_shutdown:
*
@@ -1785,6 +1805,8 @@ gboolean xfsm_shutdown_helper_suspend (X
{
g_return_val_if_fail (!error || !*error, FALSE); g_return_val_if_fail (!error || !*error, FALSE);
+ ret = g_spawn_command_line_async ("xflock4", NULL); + lock_screen ();
+ if (!ret)
+ g_warning("Could not lock screen");
+ +
#ifdef ENABLE_UPOWER #ifdef ENABLE_UPOWER
if ( helper->sleep_backend == XFSM_SLEEP_BACKEND_UPOWER ) if ( helper->sleep_backend == XFSM_SLEEP_BACKEND_UPOWER )
{ {
@@ -1810,8 +1815,13 @@ gboolean xfsm_shutdown_helper_suspend (X @@ -1812,6 +1834,8 @@ gboolean xfsm_shutdown_helper_hibernate
**/
gboolean xfsm_shutdown_helper_hibernate (XfsmShutdownHelper *helper, GError **error)
{ {
+ gboolean ret;
g_return_val_if_fail (!error || !*error, FALSE); g_return_val_if_fail (!error || !*error, FALSE);
+ ret = g_spawn_command_line_async ("xflock4", NULL); + lock_screen ();
+ if (!ret)
+ g_warning("Could not lock screen");
+ +
#ifdef ENABLE_UPOWER #ifdef ENABLE_UPOWER
if ( helper->sleep_backend == XFSM_SLEEP_BACKEND_UPOWER ) if ( helper->sleep_backend == XFSM_SLEEP_BACKEND_UPOWER )

7
xfce4-session.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Dec 15 15:58:02 UTC 2011 - gber@opensuse.org
- improve xfce4-session-lock-screen-on-suspend-hibernate.patch and
only lock the screen if xfce4-power-manager is configured to do
so and execute xflock4 synchronously
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 14 13:18:26 UTC 2011 - gber@opensuse.org Wed Dec 14 13:18:26 UTC 2011 - gber@opensuse.org

1
xfce4-session.spec
View File

@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
Name: xfce4-session Name: xfce4-session
Version: 4.8.2 Version: 4.8.2
Release: 0 Release: 0