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

Side by Side Diff: scripts/xdg-screensaver

Issue 7000007: Upstream adjusted my patch to xdg-utils a little before committing it. Merge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/xdg-utils/
Patch Set: '' Created 9 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « scripts/xdg-open ('k') | scripts/xdg-settings » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/sh 1 #!/bin/sh
2 #--------------------------------------------- 2 #---------------------------------------------
3 # xdg-screensaver 3 # xdg-screensaver
4 # 4 #
5 # Utility script to control screensaver. 5 # Utility script to control screensaver.
6 # 6 #
7 # Refer to the usage() function below for usage. 7 # Refer to the usage() function below for usage.
8 # 8 #
9 # Copyright 2006, Bryce Harrington <bryce@osdl.org> 9 # Copyright 2006, Bryce Harrington <bryce@osdl.org>
10 # 10 #
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 case "$(uname 2>/dev/null)" in 419 case "$(uname 2>/dev/null)" in
420 Darwin) 420 Darwin)
421 DE=darwin; 421 DE=darwin;
422 ;; 422 ;;
423 esac 423 esac
424 fi 424 fi
425 425
426 if [ x"$DE" = x"gnome" ]; then 426 if [ x"$DE" = x"gnome" ]; then
427 # gnome-default-applications-properties is only available in GNOME 2.x 427 # gnome-default-applications-properties is only available in GNOME 2.x
428 # but not in GNOME 3.x 428 # but not in GNOME 3.x
429 which gnome-default-applications-properties > /dev/null 2> /dev/null || DE ="gnome3" 429 which gnome-default-applications-properties > /dev/null 2>&1 || DE="gnome 3"
430 fi 430 fi
431 } 431 }
432 432
433 #---------------------------------------------------------------------------- 433 #----------------------------------------------------------------------------
434 # kfmclient exec/openURL can give bogus exit value in KDE <= 3.5.4 434 # kfmclient exec/openURL can give bogus exit value in KDE <= 3.5.4
435 # It also always returns 1 in KDE 3.4 and earlier 435 # It also always returns 1 in KDE 3.4 and earlier
436 # Simply return 0 in such case 436 # Simply return 0 in such case
437 437
438 kfmclient_fix_exit_code() 438 kfmclient_fix_exit_code()
439 { 439 {
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
1039 if [ "$action" = "suspend" ] ; then 1039 if [ "$action" = "suspend" ] ; then
1040 # Start tracking $window_id and resume the screensaver once it disappears 1040 # Start tracking $window_id and resume the screensaver once it disappears
1041 ( track_window ) 2> /dev/null > /dev/null & 1041 ( track_window ) 2> /dev/null > /dev/null &
1042 fi 1042 fi
1043 1043
1044 if [ $result -eq 0 ]; then 1044 if [ $result -eq 0 ]; then
1045 exit_success 1045 exit_success
1046 else 1046 else
1047 exit_failure_operation_failed 1047 exit_failure_operation_failed
1048 fi 1048 fi
OLDNEW
« no previous file with comments | « scripts/xdg-open ('k') | scripts/xdg-settings » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698