rpms/gnome-applet-timer/devel timer-applet-2.0.1-stop-pulsing.patch, NONE, 1.1 gnome-applet-timer.spec, 1.21, 1.22 timer-applet-2.0.1-libnotify.patch, 1.1, NONE

[Christoph Wickert]

Author: cwickert

Update of /cvs/extras/rpms/gnome-applet-timer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24226/devel

Modified Files:
	gnome-applet-timer.spec 
Added Files:
	timer-applet-2.0.1-stop-pulsing.patch 
Removed Files:
	timer-applet-2.0.1-libnotify.patch 
Log Message:
* Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-8
- Use Paul's patch instead of Michael suggestion (#471465)


timer-applet-2.0.1-stop-pulsing.patch:

--- NEW FILE timer-applet-2.0.1-stop-pulsing.patch ---
--- timer-applet-2.0.1-orig/src/timerapplet/ui/Notifier.py	2007-04-27 21:31:03.000000000 -0400
+++ timer-applet-2.0.1/src/timerapplet/ui/Notifier.py	2008-12-24 11:04:52.000000000 -0500
@@ -25,12 +25,16 @@
             if self._timeout_id is not None:
                 gobject.source_remove(self._timeout_id)
                 self._timeout_id = None
-            self._notify.disconnect(self._handler_id)
-            self._handler_id = None
-            self._notify.close()
-            self._notify = None
+            if self._handler_id is not None:
+                self._notify.disconnect(self._handler_id)
+                self._handler_id = None
+            try:
+                self._notify.close()
+                self._notify = None
+            except:
+                pass
             
-    def _on_notification_closed(self, notification, get_reminder_message_func):
+    def _on_notification_closed(self, notification, reason, get_reminder_message_func):
         self._timeout_id = gobject.timeout_add(Notifier._NOTIFICATION_REDISPLAY_INTERVAL_SECONDS * 1000,
                                                self._on_notification_redisplay_timeout,
                                                get_reminder_message_func)


Index: gnome-applet-timer.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-timer/devel/gnome-applet-timer.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gnome-applet-timer.spec	4 Jan 2009 18:09:14 -0000	1.21
+++ gnome-applet-timer.spec	4 Jan 2009 20:09:27 -0000	1.22
@@ -4,14 +4,14 @@
 
 Name:           gnome-applet-timer
 Version:        2.0.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A countdown timer applet for the GNOME panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://timerapplet.sourceforge.net/
 Source0:        http://download.sourceforge.net/timerapplet/timer-applet-%{version}.tar.gz
-Patch0:         timer-applet-2.0.1-libnotify.patch
+Patch0:         timer-applet-2.0.1-stop-pulsing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel >= 2.4
@@ -100,6 +100,9 @@
 %{python_sitelib}/timerapplet/
 
 %changelog
+* Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-8
+- Use Paul's patch instead of Michael suggestion (#471465)
+
 * Sun Jan 04 2009 Christoph Wickert <cwickert at fedoraproject.org> - 2.0.2-7
 - Apply libnotify patch, thanks to Michael Schwendt and Paul Frields (#471465)
 


--- timer-applet-2.0.1-libnotify.patch DELETED ---