[Lunar-commits] <moonbase-gnome3> Merge branch 'master' of git://github.com/lunar-linux/moonbase-gnome3

[v4hn]

commit 1fd17580051a2c04acf4e51e4d11413562c4070b
Author: v4hn <me at v4hn.de>
Date: Sat, 23 Mar 2013 03:48:12 -0700
URL: https://github.com/lunar-linux/moonbase-gnome3/commit/1fd17580051a2c04acf4e51e4d11413562c4070b

Merge branch 'master' of git://github.com/lunar-linux/moonbase-gnome3
---
  core/cinnamon-screensaver/BUILD                          | +2/-0     
  core/cinnamon-screensaver/cinnamon-screensaver.desktop   | +0/-2     
  core/cinnamon-screensaver/cinnamon2d-screensaver.desktop | +0/-2     
  core/gnome-screensaver/BUILD                             | +2/-0     
  4 files changed, 4 insertions(+), 4 deletions(-)

--- a/core/cinnamon-screensaver/BUILD
+++ b/core/cinnamon-screensaver/BUILD
@@ -2,6 +2,8 @@ sedit "s:--warn-all --warn-error::" src/Makefile.am  &&
 
 sedit "s:gnome-autogen.sh:.\/gnome-autogen.sh:" autogen.sh  &&
 
+cp -f $SCRIPT_DIRECTORY/pam.d/cinnamon-screensaver data/  &&
+
 chmod +x gnome-autogen.sh &&
 
 ./autogen.sh --prefix=/usr     \
--- a/core/cinnamon-screensaver/cinnamon-screensaver.desktop
+++ b/core/cinnamon-screensaver/cinnamon-screensaver.desktop
@@ -4,8 +4,6 @@ Name=Cinnamon Screensaver
 Comment=Launch screensaver and locker program
 Icon=preferences-desktop-screensaver
 Exec=cinnamon-screensaver
-OnlyShowIn=GNOME;
-AutostartCondition=GNOME3 if-session cinnamon
 NoDisplay=true
 X-GNOME-Autostart-Phase=Application
 X-GNOME-Autostart-Notify=true
--- a/core/cinnamon-screensaver/cinnamon2d-screensaver.desktop
+++ b/core/cinnamon-screensaver/cinnamon2d-screensaver.desktop
@@ -4,8 +4,6 @@ Name=Cinnamon Screensaver
 Comment=Launch screensaver and locker program
 Icon=preferences-desktop-screensaver
 Exec=cinnamon-screensaver
-OnlyShowIn=GNOME;
-AutostartCondition=GNOME3 if-session cinnamon2d
 NoDisplay=true
 X-GNOME-Autostart-Phase=Application
 X-GNOME-Autostart-Notify=true
--- a/core/gnome-screensaver/BUILD
+++ b/core/gnome-screensaver/BUILD
@@ -1,3 +1,5 @@
 OPTS+="--with-x --with-mit-ext --with-systemde"  &&
 
+cp -f $SCRIPT_DIRECTORY/pam.d/gnome-screensaver data/  &&
+
 default_build