gnome-zeitgeist team mailing list archive

[Stefano Candori <stefano.candori@xxxxxxxxx>]

Stefano Candori has proposed merging lp:~cando/gnome-activity-journal/fix-pinning into lp:gnome-activity-journal.

Requested reviews:
  GNOME Zeitgeist Team (gnome-zeitgeist)
Related bugs:
  #680653 Pinning feature is broken
  https://bugs.launchpad.net/bugs/680653


In this branch I've fixed bug #680653.
-- 
https://code.launchpad.net/~cando/gnome-activity-journal/fix-pinning/+merge/41754
Your team GNOME Zeitgeist Team is requested to review the proposed merge of lp:~cando/gnome-activity-journal/fix-pinning into lp:gnome-activity-journal.

=== modified file 'src/activity_widgets.py'
--- src/activity_widgets.py	2010-11-11 16:43:36 +0000
+++ src/activity_widgets.py	2010-11-24 15:57:57 +0000
@@ -172,7 +172,7 @@
         self.day = day
         if pinbox in self.box.get_children():
             self.box.remove(pinbox)
-        if (day.date - datetime.date.today()) == 0:
+        if (day.date - datetime.date.today()) == datetime.timedelta(days=0):
             self.box.pack_start(pinbox, False, False)
             self.box.reorder_child(pinbox, 0)
         self.daylabel.set_date(day.date)
@@ -1254,6 +1254,8 @@
                 self.event_templates, self.do_set,
                 self.event_timerange,
                 StorageState.Any, 10000, ResultType.MostRecentSubjects)
+        else:
+            self.do_set([])
 
     def do_set(self, event_ids):
         objs = []

=== modified file 'src/supporting_widgets.py'
--- src/supporting_widgets.py	2010-11-09 20:25:08 +0000
+++ src/supporting_widgets.py	2010-11-24 15:57:57 +0000
@@ -917,7 +917,7 @@
             uri = obj.uri
             uri = unicode(uri)
             isbookmarked = bookmarker.is_bookmarked(uri)
-            if isbookmarked:
+            if isbookmarked:               
                 bookmarker.unbookmark(uri)
 
     def do_delete(self, menuitem):