Merge lp:~emanuele-aina/gtimelog/fix-status-icon-position-menu-pygi into lp:~gtimelog-dev/gtimelog/trunk

[Emanuele Aina]

This branch fixes LP#1039977 by replacing the usage of status_icon_position_menu with gtk.StatusIcon.position_menu when using PyGI (and swapping some of the tray_icon_popup_menu.popup() arguments).

[Marius Gedminas (mgedmin)]

Thank you!

http://fpaste.org/osUI/ is more what I had in mind (keep the 'if toolkit' checks in one place, at the top), but didn't commit because it didn't work. Now I realize that the differing argument ordering makes my kind of fix impossible. I either have to litter the code with if statements, or bite the bullet and rip out the obsolete pygtk support code.

[Marius Gedminas (mgedmin)]

I committed your patch as is, because life is short. Thanks a lot!

review: Approve

=== modified file 'src/gtimelog/main.py'
--- src/gtimelog/main.py	2012-08-22 12:01:41 +0000
+++ src/gtimelog/main.py	2012-08-22 12:04:29 +0000
@@ -1181,9 +1181,14 @@
     def on_popup_menu(self, widget, button, activate_time):
         """The user clicked on the icon."""
         tray_icon_popup_menu = self.gtimelog_window.tray_icon_popup_menu
-        tray_icon_popup_menu.popup(
-            None, None, gtk.status_icon_position_menu,
-            button, activate_time, self.icon)
+        if toolkit == "gi":
+            tray_icon_popup_menu.popup(
+                None, None, gtk.StatusIcon.position_menu,
+                self.icon, button, activate_time)
+        else:
+            tray_icon_popup_menu.popup(
+                None, None, gtk.status_icon_position_menu,
+                button, activate_time, self.icon)
 
     def entry_added(self, entry):
         """An entry has been added."""