[ede-cvs] SF.net SVN: ede:[2896] trunk/ede2

[<ka...@us...>]

Revision: 2896
          http://ede.svn.sourceforge.net/ede/?rev=2896&view=rev
Author:   karijes
Date:     2009-10-08 09:45:27 +0000 (Thu, 08 Oct 2009)

Log Message:
-----------
Prevented ede-screensaver-conf to crash when xscreensaver is not installed.

Default desktop files will be installed during compilation time; if this was done during installation
time, files will be installed in superuser directory, which isn't the goal.

Fixed Jamfile to use correct path.

Modified Paths:
--------------
    trunk/ede2/data/desktop-links/Jamfile
    trunk/ede2/data/desktop-links/install-in-desktop-dir.sh
    trunk/ede2/ede-screensaver-conf/ede-screensaver-conf.cpp

Modified: trunk/ede2/data/desktop-links/Jamfile
===================================================================
--- trunk/ede2/data/desktop-links/Jamfile	2009-10-07 15:11:38 UTC (rev 2895)
+++ trunk/ede2/data/desktop-links/Jamfile	2009-10-08 09:45:27 UTC (rev 2896)
@@ -10,9 +10,11 @@
 
 SubDir TOP data desktop-links ;
 
-actions InstallIfEmpty
+actions quietly existing InstallIfEmpty
 {
-	./$(SUBDIR)/install-in-desktop-dir.sh
+	./$(>)/install-in-desktop-dir.sh
 }
 
-InstallIfEmpty install ;
+# use 'all' pseudotarget not 'install' because 'install' will be often run as superuser, installing 
+# data in superuser directory, not user directory
+InstallIfEmpty all : $(SUBDIR) ;

Modified: trunk/ede2/data/desktop-links/install-in-desktop-dir.sh
===================================================================
--- trunk/ede2/data/desktop-links/install-in-desktop-dir.sh	2009-10-07 15:11:38 UTC (rev 2895)
+++ trunk/ede2/data/desktop-links/install-in-desktop-dir.sh	2009-10-08 09:45:27 UTC (rev 2896)
@@ -12,6 +12,8 @@
 
 # check if directory is empty and install if it does
 if test "x$content" = "x"; then
+	echo "Preparing $desktop_dir for the first time..."
+
 	for file in $targets; do
 		cp $curr_dir/$file $desktop_dir
 	done

Modified: trunk/ede2/ede-screensaver-conf/ede-screensaver-conf.cpp
===================================================================
--- trunk/ede2/ede-screensaver-conf/ede-screensaver-conf.cpp	2009-10-07 15:11:38 UTC (rev 2895)
+++ trunk/ede2/ede-screensaver-conf/ede-screensaver-conf.cpp	2009-10-08 09:45:27 UTC (rev 2896)
@@ -194,11 +194,12 @@
 			Fl_Check_Button* denabled = new Fl_Check_Button(20, 299, 180, 26, _("Enabled"));
 			denabled->down_box(FL_DOWN_BOX);
 			denabled->tooltip(_("Enable or disable Display Power Management Signaling support"));
-			denabled->callback((Fl_Callback*)dpms_enable_cb, sp);
-			if(sp)
+			if(sp) {
+				denabled->callback((Fl_Callback*)dpms_enable_cb, sp);
 				denabled->value(sp->dpms_enabled);
-			else
+			} else {
 				denabled->value(1);
+			}
 
 			Fl_Box* energy_image = new Fl_Box(20, 341, 75, 49);
 			energy_image->image(image_energy);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.