avoid some warnings

This commit is contained in:
Matthias Clasen 2009-04-05 05:37:04 +00:00
parent 86df7d920b
commit 9f7bb5c714
2 changed files with 21 additions and 1 deletions

View File

@ -0,0 +1,14 @@
diff -up gnome-session-2.26.0/gnome-session/gs-idle-monitor.c.alarm-warning gnome-session-2.26.0/gnome-session/gs-idle-monitor.c
--- gnome-session-2.26.0/gnome-session/gs-idle-monitor.c.alarm-warning 2009-04-05 01:31:17.238537050 -0400
+++ gnome-session-2.26.0/gnome-session/gs-idle-monitor.c 2009-04-05 01:32:57.511751140 -0400
@@ -181,6 +181,10 @@ handle_alarm_notify_event (GSIdleMonitor
gboolean res;
gboolean condition;
+ if (alarm_event->state == XSyncAlarmDestroyed) {
+ return;
+ }
+
watch = find_watch_for_alarm (monitor, alarm_event->alarm);
if (watch == NULL) {

View File

@ -10,7 +10,7 @@
Summary: GNOME session manager Summary: GNOME session manager
Name: gnome-session Name: gnome-session
Version: 2.26.0 Version: 2.26.0
Release: 1%{?dist} Release: 2%{?dist}
URL: http://www.gnome.org URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-session/2.26/%{name}-%{version}.tar.bz2 Source0: http://download.gnome.org/sources/gnome-session/2.26/%{name}-%{version}.tar.bz2
Source1: redhat-default-session Source1: redhat-default-session
@ -62,6 +62,8 @@ 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: gnome-session-alarm-warning.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.
@ -76,6 +78,7 @@ Desktop file to add GNOME to display manager session menu.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .alarm-warning
#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
@ -174,6 +177,9 @@ fi
%changelog %changelog
* Sun Apr 5 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.0-2
- Avoid some warnings (#493688)
* Mon Mar 16 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.0-1 * Mon Mar 16 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.0-1
- Update to 2.26.0 - Update to 2.26.0