Hello community, here is the log from the commit of package zapping checked in at Sun May 7 16:50:28 CEST 2006. -------- --- GNOME/zapping/zapping.changes 2006-02-18 00:27:00.000000000 +0100 +++ STABLE/zapping/zapping.changes 2006-05-03 16:47:27.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 3 16:46:55 CEST 2006 - rodrigo@suse.de + +- Added patch to use gnome-screensaver when available (#127499). + +------------------------------------------------------------------- New: ---- zapping-gnomescreensaver.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zapping.spec ++++++ --- /var/tmp/diff_new_pack.AAJxkV/_old 2006-05-07 16:50:23.000000000 +0200 +++ /var/tmp/diff_new_pack.AAJxkV/_new 2006-05-07 16:50:23.000000000 +0200 @@ -16,11 +16,12 @@ Group: Hardware/TV Autoreqprov: on Version: 0.9.6 -Release: 8 +Release: 21 Summary: GNOME TV Application Source0: %{name}-%{version}.tar.bz2 Patch0: zapping-noincaudit.diff Patch4: zapping-lib64.diff +Patch5: zapping-gnomescreensaver.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: permissions @@ -38,6 +39,7 @@ %setup -q #%patch0 %patch4 -p1 -b .lib64 +%patch5 -p1 %build %{?suse_update_config -fl} @@ -97,6 +99,8 @@ fi %changelog -n zapping +* Wed May 03 2006 - rodrigo@suse.de +- Added patch to use gnome-screensaver when available (#127499). * Sat Feb 18 2006 - gekker@suse.de - Update .desktop file for UI team * Wed Jan 25 2006 - mls@suse.de ++++++ zapping-gnomescreensaver.patch ++++++ --- zapping-0.9.6/src/x11stuff.c 2005-02-14 16:11:24.000000000 +0100 +++ zapping-0.9.6gs/src/x11stuff.c 2005-11-08 14:02:51.000000000 +0100 @@ -1338,6 +1338,7 @@ static Atom _XA_DEACTIVATE; static gboolean screensaver_enabled; static unsigned int screensaver_level; static gboolean kscreensaver; +static gboolean gnomescreensaver; static gboolean dpms_usable; static guint screensaver_timeout_id; @@ -1450,6 +1451,11 @@ screensaver_timeout (gpointer unused _ } + if (gnomescreensaver) + { + system("gnome-screensaver-command --poke >/dev/null 2>&1"); + } + return TRUE; /* call again */ } @@ -1622,6 +1628,12 @@ x11_screensaver_init (void) printv ("KScreensaver %spresent\n", kscreensaver ? "" : "not "); #endif + + gnomescreensaver = + (0 == system ("( gnome-screensaver-command --query 2>/dev/null" + "| grep inactive ) >/dev/null 2>&1")); + + printv ("gnome-screensaver %spresent\n", gnomescreensaver ? "" : "not "); } /* ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de