From 38b5b9b7427bfbc8ce937f758955952b2ab89f57 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Wed, 25 Feb 2009 12:19:21 +0000
Subject: Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline

---
diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
index e972aac..52a86fa 100644
--- a/src/jarabe/journal/misc.py
+++ b/src/jarabe/journal/misc.py
@@ -22,7 +22,6 @@ import os
 from gettext import gettext as _
 
 import gio
-import gtk
 
 from sugar.activity import activityfactory
 from sugar.activity.activityhandle import ActivityHandle
diff --git a/src/jarabe/model/bundleregistry.py b/src/jarabe/model/bundleregistry.py
index 15839c0..6a05734 100644
--- a/src/jarabe/model/bundleregistry.py
+++ b/src/jarabe/model/bundleregistry.py
@@ -67,8 +67,8 @@ class BundleRegistry(gobject.GObject):
 
         self._merge_default_favorites()
 
-    def __file_monitor_changed_cb(self, monitor, one_file, other_file, event_type):
-        logging.debug('__file_monitor_changed_cb %r' % ((monitor, one_file, other_file, event_type),))
+    def __file_monitor_changed_cb(self, monitor, one_file, other_file,
+                                  event_type):
         if not one_file.get_path().endswith('.activity'):
             return
         if event_type == gio.FILE_MONITOR_EVENT_CREATED:
diff --git a/src/jarabe/view/pulsingicon.py b/src/jarabe/view/pulsingicon.py
index 6847276..540431a 100644
--- a/src/jarabe/view/pulsingicon.py
+++ b/src/jarabe/view/pulsingicon.py
@@ -20,7 +20,6 @@ import gtk
 import gobject
 
 from sugar.graphics.icon import Icon, CanvasIcon
-from sugar.graphics.style import Color
 
 _INTERVAL = 100
 _STEP = math.pi / 10  # must be a fraction of pi, for clean caching
--
cgit v0.9.1