commit xfce4-session for openSUSE:12.1:Update:Test

Hello community, here is the log from the commit of package xfce4-session for openSUSE:12.1:Update:Test checked in at 2012-01-16 01:37:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/xfce4-session (Old) and /work/SRC/openSUSE:12.1:Update:Test/.xfce4-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-session", Maintainer is "xfce-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/xfce4-session/xfce4-session.changes 2011-11-24 20:16:07.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.xfce4-session.new/xfce4-session.changes 2012-01-17 16:26:13.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Jan 10 16:11:36 UTC 2012 - gber@opensuse.org + +- added xfce4-session-lock-screen-on-suspend-hibernate.patch in + order to try to locking the screen when hibernating/suspending + when xfce4-power-manager is configured to do so (bnc#740566, + bxo#6019) + +------------------------------------------------------------------- New: ---- xfce4-session-lock-screen-on-suspend-hibernate.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-session.spec ++++++ --- /var/tmp/diff_new_pack.F3iaMq/_old 2012-01-17 16:26:14.000000000 +0100 +++ /var/tmp/diff_new_pack.F3iaMq/_new 2012-01-17 16:26:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfce4-session # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,37 +15,37 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: xfce4-session Version: 4.8.2 -Release: 13 -License: GPLv2+ +Release: 0 Summary: Xfce Session manager -Url: http://www.xfce.org/projects/xfce4-session/ +License: GPL-2.0+ Group: System/GUI/XFCE +Url: http://www.xfce.org/projects/xfce4-session/ Source: %{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch gber@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows Patch0: xfce4-session-simple-splash-remove-shadows.patch # PATCH-FIX-UPSTREAM xfce4-session-fix-gnome-mode.patch bnc#710038 bxo#8014 gber@opensuse.org -- Removes obsolete GNOME compatibility code, treats GNOME-/KDE-only autostart files as inactive, and allows to enable them through xfce4-session-settings Patch1: xfce4-session-fix-gnome-mode.patch +# PATCH-FEATURE-UPSTREAM xfce4-session-lock-screen-on-suspend-hibernate.patch bxo#6019 gber@opensuse.org -- Try to lock the screen when hibernating/suspending +Patch2: xfce4-session-lock-screen-on-suspend-hibernate.patch +BuildRequires: docbook-xsl-stylesheets +BuildRequires: docbook_4 BuildRequires: intltool +BuildRequires: libxslt BuildRequires: perl-XML-Parser +BuildRequires: update-desktop-files +BuildRequires: xml2po +BuildRequires: xorg-x11 BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(libwnck-1.0) +BuildRequires: pkgconfig(libxfce4panel-1.0) BuildRequires: pkgconfig(libxfce4ui-1) BuildRequires: pkgconfig(libxfce4util-1.0) -BuildRequires: pkgconfig(libxfce4panel-1.0) BuildRequires: pkgconfig(libxfcegui4-1.0) BuildRequires: pkgconfig(libxfconf-0) -BuildRequires: pkgconfig(gconf-2.0) -BuildRequires: pkgconfig(gnome-keyring-1) -BuildRequires: update-desktop-files -BuildRequires: xorg-x11 -BuildRequires: libxslt -BuildRequires: xml2po -BuildRequires: docbook_4 -BuildRequires: docbook-xsl-stylesheets Requires: %{name}-branding >= %{version} Requires: xfce-utils Recommends: fortune @@ -55,7 +55,6 @@ xfce4-session is the session manager for the Xfce desktop environment. %package devel -License: GPLv2+ Summary: Development files for xfce4-session Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -72,8 +71,8 @@ This package contains development files needed to develop custom splash themes. %package branding-upstream -License: GPLv2+ Summary: Upstream branding of xfce4-session +Group: System/GUI/XFCE Supplements: packageand(%{name}:branding-upstream) Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) @@ -90,6 +89,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure \ ++++++ xfce4-session-lock-screen-on-suspend-hibernate.patch ++++++ 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/xfce4-session/xfsm-shutdown-helper.c @@ -71,6 +71,8 @@ #include +#include + #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; + 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); + lock_screen (); + #ifdef ENABLE_UPOWER if ( helper->sleep_backend == XFSM_SLEEP_BACKEND_UPOWER ) { @@ -1812,6 +1834,8 @@ gboolean xfsm_shutdown_helper_hibernate { g_return_val_if_fail (!error || !*error, FALSE); + lock_screen (); + #ifdef ENABLE_UPOWER if ( helper->sleep_backend == XFSM_SLEEP_BACKEND_UPOWER ) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org