This commit is contained in:
Matthias Clasen 2009-03-03 17:35:53 +00:00
parent 89c5a6b32b
commit 6099235dea
4 changed files with 9 additions and 42 deletions

View File

@ -1 +1 @@
gnome-session-2.25.91.tar.bz2 gnome-session-2.25.92.tar.bz2

View File

@ -9,8 +9,8 @@
Summary: GNOME session manager Summary: GNOME session manager
Name: gnome-session Name: gnome-session
Version: 2.25.91 Version: 2.25.92
Release: 4%{?dist} Release: 1%{?dist}
URL: http://www.gnome.org URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-session/2.25/%{name}-%{version}.tar.bz2 Source0: http://download.gnome.org/sources/gnome-session/2.25/%{name}-%{version}.tar.bz2
Source1: redhat-default-session Source1: redhat-default-session
@ -61,8 +61,6 @@ Requires(pre): GConf2 >= %{gconf2_version}
Requires(post): GConf2 >= %{gconf2_version} Requires(post): GConf2 >= %{gconf2_version}
Requires(preun): GConf2 >= %{gconf2_version} Requires(preun): GConf2 >= %{gconf2_version}
Patch0: xsync-is-great.patch
%description %description
gnome-session manages a GNOME desktop or GDM login session. It starts up 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. the other core GNOME components and handles logout and saving the session.
@ -77,7 +75,6 @@ Desktop file to add GNOME to display manager session menu.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .xsync-is-great
#workaround broken perl-XML-Parser on 64bit arches #workaround broken perl-XML-Parser on 64bit arches
export PERL5LIB=/usr/lib64/perl5/vendor_perl/5.8.2 perl export PERL5LIB=/usr/lib64/perl5/vendor_perl/5.8.2 perl
@ -176,6 +173,9 @@ fi
%changelog %changelog
* Tue Mar 3 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.92-1
- Update to 2.25.92
* Thu Feb 26 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.91-4 * Thu Feb 26 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.91-4
- Make -xsession arch again - Make -xsession arch again
- Fix xsync usage - Fix xsync usage

View File

@ -1 +1 @@
521502729dd7481304287068988f013b gnome-session-2.25.91.tar.bz2 bb06f7962d9e9e55abc0a4727b596b20 gnome-session-2.25.92.tar.bz2

View File

@ -1,33 +0,0 @@
--- 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) {