Merge lp:~pitti/gtimelog/pygi into lp:~gtimelog-dev/gtimelog/trunk

[Martin Pitt]

Seems 0.6 accidentally dropped the required import of "gi" when using GI. Also, it seems my TabAlign.LEFT -> TabAlign.TAB_LEFT change was wrong, this is due to a broken .gir of Pango in the Ubuntu packages. With upstream Pango it really is TabAlign.LEFT, as it is supposed to be with GIR. However, I added a backwards compat quirk to work with either.

With this, gtimelog again works fine in jhbuild with current GTK3/Pango/etc.

[Barry Warsaw (barry)]

Thanks Martin, this looks great. I'll commit this to trunk, but I want to hold off on uploading it to Ubuntu until I can fix the quit-button issue (i.e. ctrl-Q works but the quit button only closes the window).

review: Approve

=== modified file 'NEWS.txt'
--- NEWS.txt	2011-08-23 22:21:14 +0000
+++ NEWS.txt	2011-09-20 08:38:24 +0000
@@ -1,3 +1,8 @@
+Changes in version 0.6.1 (UNRELEASED)
+==============================================
+
+* Fix two crashes when using GI.
+
 Changes in version 0.6.0 (released 2011-08-23)
 ==============================================
 

=== modified file 'src/gtimelog/main.py'
--- src/gtimelog/main.py	2011-08-17 18:18:23 +0000
+++ src/gtimelog/main.py	2011-09-20 08:38:24 +0000
@@ -41,6 +41,7 @@
         new_app_indicator = None
 
 except ImportError:
+    import gi
     from gi.repository import GObject as gobject
     from gi.repository import Gdk as gdk
     from gi.repository import Gtk as gtk
@@ -48,7 +49,11 @@
     pygtk = None
 
     # these are hacks until we fully switch to GI
-    PANGO_ALIGN_LEFT = pango.TabAlign.TAB_LEFT
+    try:
+        PANGO_ALIGN_LEFT = pango.TabAlign.LEFT
+    except AttributeError:
+        # backwards compat for older Pango versions with broken GIR
+        PANGO_ALIGN_LEFT = pango.TabAlign.TAB_LEFT
     GTK_RESPONSE_OK = gtk.ResponseType.OK
     gtk_status_icon_new = gtk.StatusIcon.new_from_file
     pango_tabarray_new = pango.TabArray.new