rpms/gnome-session/devel xsync-is-great.patch, NONE, 1.1 gnome-session.spec, 1.226, 1.227

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4504

Modified Files:
	gnome-session.spec 
Added Files:
	xsync-is-great.patch 
Log Message:
fix xsync usage


xsync-is-great.patch:

--- NEW FILE xsync-is-great.patch ---
--- gnome-session-2.25.91/gnome-session/gs-idle-monitor.c	2009-02-16 23:44:27.000000000 -0500
+++ hacked/gnome-session/gs-idle-monitor.c	2009-02-26 15:09:36.247212669 -0500
@@ -273,13 +273,6 @@
                 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;
@@ -440,13 +433,15 @@
                 | 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) {


Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- gnome-session.spec	25 Feb 2009 00:31:47 -0000	1.226
+++ gnome-session.spec	26 Feb 2009 20:17:32 -0000	1.227
@@ -10,7 +10,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.25.91
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.25/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -61,6 +61,8 @@
 Requires(post): GConf2 >= %{gconf2_version}
 Requires(preun): GConf2 >= %{gconf2_version}
 
+Patch0: xsync-is-great.patch
+
 %description
 gnome-session manages a GNOME desktop or GDM login session. It starts up 
 the other core GNOME components and handles logout and saving the session.
@@ -69,13 +71,13 @@
 Summary: gnome-session desktop file
 Group: User Interface/Desktop
 Requires: gnome-session = %{version}-%{release}
-BuildArch: noarch
 
 %description xsession
 Desktop file to add GNOME to display manager session menu.
 
 %prep
 %setup -q
+%patch0 -p1 -b .xsync-is-great
 
 #workaround broken perl-XML-Parser on 64bit arches
 export PERL5LIB=/usr/lib64/perl5/vendor_perl/5.8.2 perl
@@ -174,6 +176,10 @@
 
 
 %changelog
+* Thu Feb 26 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.91-4
+- Make -xsession arch again
+- Fix xsync usage
+
 * Tue Feb 24 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.91-3
 - Make -xsession noarch