gnome-screensaver r1565 - in trunk: . savers

[mccann svn gnome org]

Author: mccann
Date: Wed Dec  3 02:51:37 2008
New Revision: 1565
URL: http://svn.gnome.org/viewvc/gnome-screensaver?rev=1565&view=rev

Log:
2008-12-02  William Jon McCann  <jmccann redhat com>

	* savers/Makefile.am:
	* savers/cosmos-slideshow.desktop.in.in:
	* savers/footlogo-floaters.desktop.in.in:
	Use absolute path for screensaver theme engines.
	Patch from: Frederic Crozat  <fcrozat mandriva com>



Modified:
   trunk/ChangeLog
   trunk/savers/Makefile.am
   trunk/savers/cosmos-slideshow.desktop.in.in
   trunk/savers/footlogo-floaters.desktop.in.in

Modified: trunk/savers/Makefile.am
==============================================================================
--- trunk/savers/Makefile.am	(original)
+++ trunk/savers/Makefile.am	Wed Dec  3 02:51:37 2008
@@ -14,21 +14,28 @@
 	$(WARN_CFLAGS)						\
 	$(NULL)
 
-DESKTOP_IN_IN_FILES = 			\
-	cosmos-slideshow.desktop.in.in 	\
-	footlogo-floaters.desktop.in.in	\
+DESKTOP_IN_IN_FILES = 			 \
+	cosmos-slideshow.desktop.in.in 	 \
+	footlogo-floaters.desktop.in.in	 \
+	personal-slideshow.desktop.in.in \
+	popsquares.desktop.in.in	 \
 	$(NULL)
 
 cosmos-slideshow.desktop.in: cosmos-slideshow.desktop.in.in Makefile
 	$(edit) $< >$@
 footlogo-floaters.desktop.in: footlogo-floaters.desktop.in.in Makefile
 	$(edit) $< >$@
+personal-slideshow.desktop.in: personal-slideshow.desktop.in.in Makefile
+	$(edit) $< >$@
+popsquares.desktop.in: popsquares.desktop.in.in Makefile
+	$(edit) $< >$@
 
 @INTLTOOL_DESKTOP_RULE@
 
 edit = sed \
 	-e 's|@SLIDESHOW_COSMOS_DIR[ ]|$(SLIDESHOW_COSMOS_DIR)|g' \
-	-e 's|@FLOATERS_FOOT_LOGO_IMAGE[ ]|$(FLOATERS_FOOT_LOGO_IMAGE)|g'
+	-e 's|@FLOATERS_FOOT_LOGO_IMAGE[ ]|$(FLOATERS_FOOT_LOGO_IMAGE)|g' \
+	-e 's|@SAVERDIR[ ]|$(privlibexecdir)|g'
 
 themesdir = $(datadir)/applications/screensavers
 themes_in_files = 			\

Modified: trunk/savers/cosmos-slideshow.desktop.in.in
==============================================================================
--- trunk/savers/cosmos-slideshow.desktop.in.in	(original)
+++ trunk/savers/cosmos-slideshow.desktop.in.in	Wed Dec  3 02:51:37 2008
@@ -2,10 +2,10 @@
 Encoding=UTF-8
 _Name=Cosmos
 _Comment=Display a slideshow of pictures of the cosmos
-Exec=slideshow --location= SLIDESHOW_COSMOS_DIR@
-TryExec=slideshow
+Exec= SAVERDIR@/slideshow --location= SLIDESHOW_COSMOS_DIR@
+TryExec= SAVERDIR@/slideshow
 StartupNotify=false
 Terminal=false
 Type=Application
 Categories=GNOME;Screensaver;
-OnlyShowIn=GNOME;
\ No newline at end of file
+OnlyShowIn=GNOME;

Modified: trunk/savers/footlogo-floaters.desktop.in.in
==============================================================================
--- trunk/savers/footlogo-floaters.desktop.in.in	(original)
+++ trunk/savers/footlogo-floaters.desktop.in.in	Wed Dec  3 02:51:37 2008
@@ -2,10 +2,10 @@
 Encoding=UTF-8
 _Name=Floating Feet
 _Comment=Bubbles the GNOME foot logo around the screen
-Exec=floaters @FLOATERS_FOOT_LOGO_IMAGE@
-TryExec=floaters
+Exec= SAVERDIR@/floaters @FLOATERS_FOOT_LOGO_IMAGE@
+TryExec= SAVERDIR@/floaters
 StartupNotify=false
 Terminal=false
 Type=Application
 Categories=GNOME;Screensaver;
-OnlyShowIn=GNOME;
\ No newline at end of file
+OnlyShowIn=GNOME;