From 84ad961d46b38741d439953a6a32314120d7c4b2e4cfa399b651f2b767ae8224 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Fri, 2 Oct 2009 10:21:28 +0000
Subject: [PATCH] Accepting request 21572 from
 home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/gnome-session via accept of submit request 21572 revision 63.

OBS-URL: https://build.opensuse.org/request/show/21572
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=70
---
 gnome                 | 20 +++++++++++++++-----
 gnome-session.changes | 10 ++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/gnome b/gnome
index b7c51a0..404b1a8 100644
--- a/gnome
+++ b/gnome
@@ -62,12 +62,22 @@ else
  touch ~/.skel/sled10-run
 fi
 
-# Install the live install desktop icon this way until there is
-# a better solution.  The actual files reside in gnome2-SuSE
-# the /usr/share/applications/YaST2/live-installer.desktop exists on a live install system
+# Some actions that are specific to the LiveCD
 if [ -e /usr/share/applications/YaST2/live-installer.desktop ] ; then
-  mkdir -p ~/Desktop
-  cp -u /usr/share/applications/YaST2/live-installer.desktop ~/Desktop
+  # Install the live install desktop icon this way until there is a better
+  # solution. The actual files reside in gnome2-SuSE the
+  # /usr/share/applications/YaST2/live-installer.desktop exists on a live
+  # install system
+  if [ -e .config/user-dirs.dirs ]; then
+    . .config/user-dirs.dirs
+  else
+    XDG_DESKTOP_DIR="$HOME/Desktop"
+  fi
+  mkdir -p $XDG_DESKTOP_DIR
+  cp -u /usr/share/applications/YaST2/live-installer.desktop $XDG_DESKTOP_DIR/
+
+  # setup live install to not have a lock-enabled screensaver
+  gconftool-2 --set /apps/gnome-screensaver/lock_enabled --type=bool "false"
 
   # setup live install to not start beagled
   if [ -e /etc/xdg/autostart/beagled-autostart.desktop ] ; then
diff --git a/gnome-session.changes b/gnome-session.changes
index 4a056e7..6e9d3c2 100644
--- a/gnome-session.changes
+++ b/gnome-session.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Oct  2 12:13:42 CEST 2009 - vuntz@opensuse.org
+
+- Update gnome script for the Live CD:
+  + Make screensaver not lock the screen by default on LiveCD.
+  + Make sure the "Live Installer" icon is visible on the desktop
+    of the user. Because of xdg-user-dirs, the desktop directory is
+    not always ~/Desktop, so we have to look at
+    ~/.config/user-dirs.dirs first.
+
 -------------------------------------------------------------------
 Tue Sep 22 14:11:47 CEST 2009 - dimstar@opensuse.org