From 7b19bc93b3e6f9df748e5f4cdd2c6a570e8d2902 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpgritti@gmail.com>
Date: Tue, 28 Oct 2008 21:02:38 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

---
(limited to 'src/jarabe')

diff --git a/src/jarabe/view/launcher.py b/src/jarabe/view/launcher.py
index b4f1020..cc9e2a7 100644
--- a/src/jarabe/view/launcher.py
+++ b/src/jarabe/view/launcher.py
@@ -84,6 +84,7 @@ class LaunchBox(hippo.CanvasBox):
         self.connect('destroy', self.__destroy_cb)
 
     def __destroy_cb(self, box):
+        self._activity_icon.props.pulsing = False
         self._home.disconnect_by_func(self.__active_activity_changed_cb)
 
     def zoom_in(self):
diff --git a/src/jarabe/view/pulsingicon.py b/src/jarabe/view/pulsingicon.py
index 499ae99..e04b117 100644
--- a/src/jarabe/view/pulsingicon.py
+++ b/src/jarabe/view/pulsingicon.py
@@ -159,6 +159,7 @@ class PulsingIcon(Icon):
     palette = property(_get_palette, _set_palette)
 
     def __destroy_cb(self, icon):
+        self._pulser.stop()
         if self._palette is not None:
             self._palette.destroy()
 
@@ -174,6 +175,11 @@ class CanvasPulsingIcon(CanvasIcon):
 
         CanvasIcon.__init__(self, **kwargs)
 
+        self.connect('destroy', self.__destroy_cb)
+
+    def __destroy_cb(self, box):
+        self._pulser.stop()    
+
     def set_pulse_color(self, pulse_color):
         self._pulse_color = pulse_color
         self._pulser.update()
--
cgit v0.9.1