Hello community, here is the log from the commit of package xdg-utils for openSUSE:Factory checked in at Fri Jul 23 21:37:34 CEST 2010. -------- --- xdg-utils/xdg-utils.changes 2010-04-09 13:46:32.000000000 +0200 +++ xdg-utils/xdg-utils.changes 2010-07-20 23:22:46.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 20 21:21:59 UTC 2010 - reddwarf@opensuse.org + +- Fix screensaver handling in KDE4 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-utils.spec ++++++ --- /var/tmp/diff_new_pack.CgdfwZ/_old 2010-07-23 21:36:51.000000000 +0200 +++ /var/tmp/diff_new_pack.CgdfwZ/_new 2010-07-23 21:36:51.000000000 +0200 @@ -24,7 +24,7 @@ Group: System/GUI/Other Summary: Utilities to uniformly interface desktop environments Version: 1.0.2 -Release: 84 +Release: 85 BuildArch: noarch Url: http://portland.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ xdg-kde4-upstream.patch ++++++ --- /var/tmp/diff_new_pack.CgdfwZ/_old 2010-07-23 21:36:51.000000000 +0200 +++ /var/tmp/diff_new_pack.CgdfwZ/_new 2010-07-23 21:36:51.000000000 +0200 @@ -1,11 +1,7 @@ -Index: xdg-utils/scripts/xdg-email +Index: xdg-utils-1.0.2/scripts/xdg-email =================================================================== -RCS file: /cvs/portland/portland/xdg-utils/scripts/xdg-email,v -retrieving revision 1.37 -retrieving revision 1.39 -diff -u -p -r1.37 -r1.39 ---- xdg-utils/scripts/xdg-email 24 Jan 2008 20:24:50 -0000 1.37 -+++ xdg-utils/scripts/xdg-email 27 Jul 2009 15:44:14 -0000 1.39 +--- xdg-utils-1.0.2.orig/scripts/xdg-email ++++ xdg-utils-1.0.2/scripts/xdg-email @@ -367,7 +367,7 @@ detectDE() kfmclient_fix_exit_code() @@ -30,14 +26,10 @@ kfmclient_fix_exit_code $? if [ $? -eq 0 ]; then -Index: xdg-utils/scripts/xdg-mime +Index: xdg-utils-1.0.2/scripts/xdg-mime =================================================================== -RCS file: /cvs/portland/portland/xdg-utils/scripts/xdg-mime,v -retrieving revision 1.46 -retrieving revision 1.56 -diff -u -p -r1.46 -r1.56 ---- xdg-utils/scripts/xdg-mime 4 Nov 2006 06:23:49 -0000 1.46 -+++ xdg-utils/scripts/xdg-mime 31 Jul 2009 06:42:46 -0000 1.56 +--- xdg-utils-1.0.2.orig/scripts/xdg-mime ++++ xdg-utils-1.0.2/scripts/xdg-mime @@ -436,7 +436,7 @@ detectDE() kfmclient_fix_exit_code() @@ -386,3 +378,131 @@ DEBUG 1 "Removing $kde_dir/$x.desktop (KDE 3.x support)" rm -f $kde_dir/$x.desktop fi +Index: xdg-utils-1.0.2/scripts/xdg-screensaver +=================================================================== +--- xdg-utils-1.0.2.orig/scripts/xdg-screensaver ++++ xdg-utils-1.0.2/scripts/xdg-screensaver +@@ -344,7 +344,7 @@ detectDE() + + kfmclient_fix_exit_code() + { +- version=`kde-config --version 2>/dev/null | grep KDE` ++ version=`kde${KDE_SESSION_VERSION}-config --version 2>/dev/null | grep KDE` + major=`echo $version | sed 's/KDE: \([0-9]\).*/\1/'` + minor=`echo $version | sed 's/KDE: [0-9]*\.\([0-9]\).*/\1/'` + release=`echo $version | sed 's/KDE: [0-9]*\.[0-9]*\.\([0-9]\).*/\1/'` +@@ -414,7 +414,11 @@ perform_action() + + case "$DE" in + kde) +- screensaver_kde "$1" ++ if [ x"$KDE_SESSION_VERSION" = x"4" ]; then ++ screensaver_freedesktop "$1" ++ else ++ screensaver_kde "$1" ++ fi + ;; + + gnome) +@@ -535,6 +539,101 @@ track_window() + cleanup_suspend + } + ++screensaver_freedesktop() ++{ ++ case "$1" in ++ suspend) ++ dbus-send --session \ ++ --dest=org.freedesktop.ScreenSaver \ ++ --type=method_call \ ++ --print-reply \ ++ --reply-timeout=2000 \ ++ /ScreenSaver \ ++ org.freedesktop.ScreenSaver.Inhibit \ ++ string:$window_id \ ++ string:xdg-screensaver \ ++ | grep uint32 | cut -d ' ' -f 5 >| "$screensaver_file.cookie" \ ++ 2> /dev/null ++ result=$? ++ ;; ++ ++ resume) ++ if [ -f "$screensaver_file.cookie" ] ; then ++ value=`cat "$screensaver_file.cookie"` ++ dbus-send --session \ ++ --dest=org.freedesktop.ScreenSaver \ ++ --type=method_call \ ++ /ScreenSaver \ ++ org.freedesktop.ScreenSaver.UnInhibit \ ++ uint32:$value \ ++ 2> /dev/null ++ rm -f "$screensaver_file.cookie" ++ fi ++ result=$? ++ ;; ++ ++ activate) ++ dbus-send --session \ ++ --dest=org.freedesktop.ScreenSaver \ ++ --type=method_call \ ++ /ScreenSaver \ ++ org.freedesktop.ScreenSaver.SetActive \ ++ boolean:true \ ++ 2> /dev/null ++ result=$? ++ ;; ++ ++ lock) ++ dbus-send --session \ ++ --dest=org.freedesktop.ScreenSaver \ ++ --type=method_call \ ++ /ScreenSaver \ ++ org.freedesktop.ScreenSaver.Lock \ ++ 2> /dev/null ++ ;; ++ ++ reset) ++ if [ -f "$screensaver_file.cookie" ] ; then ++ value=`cat "$screensaver_file.cookie"` ++ dbus-send --session \ ++ --dest=org.freedesktop.ScreenSaver \ ++ --type=method_call \ ++ /ScreenSaver \ ++ org.freedesktop.ScreenSaver.UnInhibit \ ++ uint32:$value \ ++ 2> /dev/null ++ rm -f "$screensaver_file.cookie" ++ fi ++ result=$? ++ ;; ++ ++ status) ++ status=`dbus-send --session \ ++ --dest=org.freedesktop.ScreenSaver \ ++ --type=method_call \ ++ --print-reply \ ++ --reply-timeout=2000 \ ++ /ScreenSaver \ ++ org.freedesktop.ScreenSaver.GetActive \ ++ | grep boolean | cut -d ' ' -f 5` ++ result=$? ++ if [ x"$status" = "xtrue" ]; then ++ echo "enabled" ++ elif [ x"$status" = "xfalse" ]; then ++ echo "disabled" ++ else ++ echo "ERROR: dbus org.freedesktop.ScreenSaver.GetActive returned '$status'" >&2 ++ return 1 ++ fi ++ ;; ++ ++ *) ++ echo "ERROR: Unknown command '$1'" >&2 ++ return 1 ++ ;; ++ esac ++} ++ + screensaver_kde() + { + case "$1" in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org