mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Sanel Zukan 2009-10-08 09:45:27 +00:00
parent 7c245a2715
commit d4ee21532a
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/desktop-links/Jamfile
View File

@ -10,9 +10,11 @@
SubDir TOP data desktop-links ; 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) ;

2
data/desktop-links/install-in-desktop-dir.sh
View File

@ -12,6 +12,8 @@ content=`ls $desktop_dir/*.desktop 2>>/dev/null`
# check if directory is empty and install if it does # check if directory is empty and install if it does
if test "x$content" = "x"; then if test "x$content" = "x"; then
echo "Preparing $desktop_dir for the first time..."
for file in $targets; do for file in $targets; do
cp $curr_dir/$file $desktop_dir cp $curr_dir/$file $desktop_dir
done done

7
ede-screensaver-conf/ede-screensaver-conf.cpp
View File

@ -194,11 +194,12 @@ int main(int argc, char **argv) {
Fl_Check_Button* denabled = new Fl_Check_Button(20, 299, 180, 26, _("Enabled")); Fl_Check_Button* denabled = new Fl_Check_Button(20, 299, 180, 26, _("Enabled"));
denabled->down_box(FL_DOWN_BOX); denabled->down_box(FL_DOWN_BOX);
denabled->tooltip(_("Enable or disable Display Power Management Signaling support")); 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); denabled->value(sp->dpms_enabled);
else } else {
denabled->value(1); denabled->value(1);
}
Fl_Box* energy_image = new Fl_Box(20, 341, 75, 49); Fl_Box* energy_image = new Fl_Box(20, 341, 75, 49);
energy_image->image(image_energy); energy_image->image(image_energy);