Hello community,

here is the log from the commit of package xfce4-session for openSUSE:Factory 
checked in at 2011-12-15 16:08:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old)
 and      /work/SRC/openSUSE:Factory/.xfce4-session.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xfce4-session", Maintainer is "xfce-maintain...@suse.de"

Changes:
--------
--- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes      
2011-11-14 13:48:07.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xfce4-session.new/xfce4-session.changes 
2011-12-15 16:08:10.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Dec 14 13:18:26 UTC 2011 - g...@opensuse.org
+
+- added xfce4-session-lock-screen-on-suspend-hibernate.patch in
+  order to try to locking the screen when hibernating/suspending
+  (bxo#6019)
+
+-------------------------------------------------------------------

New:
----
  xfce4-session-lock-screen-on-suspend-hibernate.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xfce4-session.spec ++++++
--- /var/tmp/diff_new_pack.pSJ1Xe/_old  2011-12-15 16:08:11.000000000 +0100
+++ /var/tmp/diff_new_pack.pSJ1Xe/_new  2011-12-15 16:08:11.000000000 +0100
@@ -15,37 +15,37 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           xfce4-session
 Version:        4.8.2
-Release:        13
+Release:        0
+Summary:        Xfce Session Manager
 License:        GPL-2.0+
-Summary:        Xfce Session manager
-Url:            http://www.xfce.org/projects/xfce4-session/
 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 
g...@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 
g...@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 g...@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:        GPL-2.0+
 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:        GPL-2.0+
 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
@@ -1783,8 +1783,13 @@ gboolean xfsm_shutdown_helper_restart (X
  **/
 gboolean xfsm_shutdown_helper_suspend (XfsmShutdownHelper *helper, GError 
**error)
 {
+  gboolean ret;
   g_return_val_if_fail (!error || !*error, FALSE);
 
+  ret = g_spawn_command_line_async ("xflock4", NULL);
+  if (!ret)
+      g_warning("Could not lock screen");
+
 #ifdef ENABLE_UPOWER
   if ( helper->sleep_backend == XFSM_SLEEP_BACKEND_UPOWER )
     {
@@ -1810,8 +1815,13 @@ gboolean xfsm_shutdown_helper_suspend (X
  **/
 gboolean xfsm_shutdown_helper_hibernate (XfsmShutdownHelper *helper, GError 
**error)
 {
+  gboolean ret;
   g_return_val_if_fail (!error || !*error, FALSE);
 
+  ret = g_spawn_command_line_async ("xflock4", NULL);
+  if (!ret)
+      g_warning("Could not lock screen");
+
 #ifdef ENABLE_UPOWER
   if ( helper->sleep_backend == XFSM_SLEEP_BACKEND_UPOWER )
     {
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to