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

Proposed by Martin Pitt
Status: Merged
Merge reported by: Marius Gedminas
Merged at revision: not available
Proposed branch: lp:~pitti/gtimelog/pygi
Merge into: lp:~gtimelog-dev/gtimelog/trunk
Diff against target: 14 lines (+2/-1)
1 file modified
src/gtimelog/main.py (+2/-1)
To merge this branch: bzr merge lp:~pitti/gtimelog/pygi
Reviewer Review Type Date Requested Status
Marius Gedminas Approve
Review via email: mp+51926@code.launchpad.net

Description of the change

The latest pygobject 2.27.91 slightly changed the syntax for require_version, as the old one caused problems (https://bugzilla.gnome.org/show_bug.cgi?id=642305). This updates the code accordingly.

To post a comment you must log in.
Revision history for this message
Marius Gedminas (mgedmin) wrote :

Thanks, merged!

review: Approve
lp:~pitti/gtimelog/pygi updated
189. By Marius Gedminas

Support PyGObject 2.27.91: require_version changes..

The latest pygobject 2.27.91 slightly changed the syntax for require_version,
as the old one caused problems
(https://bugzilla.gnome.org/show_bug.cgi?id=642305). This updates the code
accordingly.

Contributed by Martin Pitt.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/gtimelog/main.py'
--- src/gtimelog/main.py 2011-02-10 19:00:22 +0000
+++ src/gtimelog/main.py 2011-03-02 16:49:20 +0000
@@ -42,9 +42,10 @@
4242
43except ImportError:43except ImportError:
44 import gi44 import gi
45 gi.require_version('Gdk', '2.0')
46 gi.require_version('Gtk', '2.0')
45 from gi.repository import Gdk as gdk47 from gi.repository import Gdk as gdk
46 from gi.repository import Gtk as gtk48 from gi.repository import Gtk as gtk
47 gtk.require_version('2.0')
48 from gi.repository import Pango as pango49 from gi.repository import Pango as pango
49 pygtk = None50 pygtk = None
5051

Subscribers

People subscribed via source and target branches