Merge lp:~invernizzi/gtg/tomboy-fix into lp:~gtg/gtg/old-trunk

[Luca Invernizzi]

[Luca Invernizzi (invernizzi)]

This is a very small fix, please consider it for merging.
I won't be here all day, so if you accept please merge it yourselves.

[Bertrand Rousseau (bertrand-rousseau)]

review: Approve

[Lionel Dricot (ploum-deactivatedaccount)]

Hello Luca, can you explain a bit more what you are doing?

I don't understand why you are removing the self.activated and how the new check fix the bug.

Thanks

review: Needs Information

[Luca Invernizzi (invernizzi)]

sure.
The check checkTomboyPresent() has been introduced after removing the dbus dependency of the plugin (because looking for tomboy in dbus launches tomboy as a side effect). checkTomboyPresent() simply checks that tomboy is installed.
In order to avoid checking each time that some action require tomboy presence, the plugin checks once per run and then sets the self.activated flag to true.

The self.activated = True in the fist line in onTaskOpened is what causes the problem. Is a leftover of before the intruduction of checkTomboyPresent().
In practice, it disables the following check of tomboy presence, because checkTomboyPresent() skips the check since self.activated is already set to true.

The other modification, in addButtonToToolbar(), shouldn't be needed, since the check of tomboy presence should happen before. I put it there because, in case anything goes wrong, it gracefully disables the plugin without making it crash.

[Lionel Dricot (ploum-deactivatedaccount)]

Thanks for the information, I understand better now and, indeed, this should be unlikely to break something.

Agreed for 0.2 then.

review: Approve

=== modified file 'GTG/plugins/tomboy/tomboy.py'
--- GTG/plugins/tomboy/tomboy.py	2009-12-03 09:59:33 +0000
+++ GTG/plugins/tomboy/tomboy.py	2009-12-10 18:43:12 +0000
@@ -113,6 +113,8 @@
 
     # adds a item(button) to the ToolBar, with a nice icon
     def addButtonToToolbar(self, plugin_api):
+        if not self.checkTomboyPresent():
+            return
         tb_Taskbutton_image = gtk.Image()
         tb_Taskbutton_image_path = self.tomboy_icon_path
         tb_Taskbutton_pixbuf=gtk.gdk.\
@@ -158,9 +160,8 @@
             token_ending = text.find(self.token_end)
 
     def onTaskOpened(self, plugin_api):
-        self.activated = True
         if not self.checkTomboyPresent():
-            return False
+            return
         #NOTE: get_textview() only works in this function
         # (see GTG/core/plugins/api.py docs)
         self.textview = plugin_api.get_textview()