Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(682)

Unified Diff: third_party/xdg-utils/scripts/xdg-screensaver

Issue 159433: Bring xdg-utils up to date as of 2009-07-27. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/xdg-utils/scripts/xdg-mime.in ('k') | third_party/xdg-utils/scripts/xdg-screensaver.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/xdg-utils/scripts/xdg-screensaver
===================================================================
--- third_party/xdg-utils/scripts/xdg-screensaver (revision 21489)
+++ third_party/xdg-utils/scripts/xdg-screensaver (working copy)
@@ -364,7 +364,7 @@
# No secure moves available, use home dir
DEBUG 1 "mv -T not available"
MV="mv"
- screensaver_file="$HOME/.xdg-screensaver-"`echo $HOSTNAME-$DISPLAY | sed 's/:/-/g'`
+ screensaver_file="$HOME/.xdg-screensaver-"`echo $(hostname)-$DISPLAY | sed 's/:/-/g'`
fi
lockfile_command=`which lockfile 2> /dev/null`
@@ -444,7 +444,7 @@
lockfile
test "${TMPDIR+set}" = set || TMPDIR=/tmp
tmpfile=`mktemp $TMPDIR/tmp.XXXXXXXXXX`
- grep -v "$window_id:" "$screensaver_file" > "$tmpfile" 2> /dev/null
+ grep -v "$window_id:$xprop_pid\$" "$screensaver_file" > "$tmpfile" 2> /dev/null
$MV "$tmpfile" "$screensaver_file"
if [ ! -s "$screensaver_file" ] ; then
rm "$screensaver_file"
@@ -464,7 +464,7 @@
unlockfile # Free lockfile
if [ -n "$xprop_pid" ] && ps -p "$xprop_pid" 2> /dev/null | grep xprop > /dev/null; then
# Kill the tracking process
- kill -TERM $xprop_pid
+ kill -s TERM $xprop_pid
fi
cleanup_suspend
}
@@ -657,7 +657,7 @@
fi
$MV "$tmpfile" "$screensaver_file"
unlockfile
- (while [ -f "$screensaver_file" ]; do $*; sleep 59; done) > /dev/null 2> /dev/null &
+ (while [ -f "$screensaver_file" ]; do $*; sleep 50; done) > /dev/null 2> /dev/null &
}
screensaver_gnome()
« no previous file with comments | « third_party/xdg-utils/scripts/xdg-mime.in ('k') | third_party/xdg-utils/scripts/xdg-screensaver.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698