diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-03-08 10:37:47 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-03-08 10:37:47 +0800 |
| commit | 23d548de45625de64e164c3b033df34f4a3a3ed9 (patch) | |
| tree | 1f8888e5b7195095bb174d14ae491909d927911f | |
| parent | df54b55d9e49a39a36eaabe88c0c90bfacd82255 (diff) | |
| download | marcuscom-ports-23d548de45625de64e164c3b033df34f4a3a3ed9.tar marcuscom-ports-23d548de45625de64e164c3b033df34f4a3a3ed9.tar.gz marcuscom-ports-23d548de45625de64e164c3b033df34f4a3a3ed9.tar.bz2 marcuscom-ports-23d548de45625de64e164c3b033df34f4a3a3ed9.tar.lz marcuscom-ports-23d548de45625de64e164c3b033df34f4a3a3ed9.tar.xz marcuscom-ports-23d548de45625de64e164c3b033df34f4a3a3ed9.tar.zst marcuscom-ports-23d548de45625de64e164c3b033df34f4a3a3ed9.zip | |
Adapt a patch from gnome-session to fix some theming issues which may be
triggered by the idle-monitor code.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12040 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11/gnome-screensaver/Makefile | 3 | ||||
| -rw-r--r-- | x11/gnome-screensaver/files/patch-src_gs-idle-monitor.c | 33 |
2 files changed, 35 insertions, 1 deletions
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index f925d4cd0..4c14c2c44 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.99 2009/01/02 19:17:35 marcus Exp $ +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.101 2009/02/27 21:52:33 marcus Exp $ # PORTNAME= gnome-screensaver PORTVERSION= 2.25.2 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11/gnome-screensaver/files/patch-src_gs-idle-monitor.c b/x11/gnome-screensaver/files/patch-src_gs-idle-monitor.c new file mode 100644 index 000000000..678fa7a70 --- /dev/null +++ b/x11/gnome-screensaver/files/patch-src_gs-idle-monitor.c @@ -0,0 +1,33 @@ +--- src/gs-idle-monitor.c.orig 2009-03-07 21:35:19.000000000 -0500 ++++ src/gs-idle-monitor.c 2009-03-07 21:36:00.000000000 -0500 +@@ -271,13 +271,6 @@ init_xsync (GSIdleMonitor *monitor) + return FALSE; + } + +- /* select for sync events */ +- gdk_error_trap_push (); +- XSelectInput (GDK_DISPLAY (), GDK_ROOT_WINDOW (), XSyncAlarmNotifyMask); +- if (gdk_error_trap_pop ()) { +- g_warning ("XSelectInput failed"); +- } +- + gdk_window_add_filter (NULL, (GdkFilterFunc)xevent_filter, monitor); + + return TRUE; +@@ -438,13 +431,15 @@ _xsync_alarm_set (GSIdleMonitor *mo + | XSyncCAValueType + | XSyncCATestType + | XSyncCAValue +- | XSyncCADelta; ++ | XSyncCADelta ++ | XSyncCAEvents; + + XSyncIntToValue (&delta, 0); + attr.trigger.counter = monitor->priv->counter; + attr.trigger.value_type = XSyncAbsolute; + attr.trigger.wait_value = watch->interval; + attr.delta = delta; ++ attr.events = True; + + attr.trigger.test_type = XSyncPositiveTransition; + if (watch->xalarm_positive != None) { |