Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/jarabe
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpgritti@gmail.com>2008-10-28 21:02:38 (GMT)
committer Marco Pesenti Gritti <mpgritti@gmail.com>2008-10-28 21:02:38 (GMT)
commit7b19bc93b3e6f9df748e5f4cdd2c6a570e8d2902 (patch)
tree2b14f84a74ba682dc112dd17c61643c0951944b0 /src/jarabe
parent3c7994b107cd1bf3827d814cca86af2a34e1459d (diff)
parentc102058a20657e51c17e6d38800f30432f15993f (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'src/jarabe')
-rw-r--r--src/jarabe/view/launcher.py1
-rw-r--r--src/jarabe/view/pulsingicon.py6
2 files changed, 7 insertions, 0 deletions
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()