Merge lp:~pitti/ubiquity/pygobject-2.90 into lp:ubiquity

Proposed by Martin Pitt on 2011-09-02
Status: Merged
Merged at revision: 4925
Proposed branch: lp:~pitti/ubiquity/pygobject-2.90
Merge into: lp:ubiquity
Diff against target: 48 lines (+13/-1)
3 files modified
debian/changelog (+8/-0)
ubiquity/gtkwidgets.py (+1/-1)
ubiquity/misc.py (+4/-0)
To merge this branch: bzr merge lp:~pitti/ubiquity/pygobject-2.90
Reviewer Review Type Date Requested Status
Ubuntu Installer Team 2011-09-02 Pending
Review via email: mp+73802@code.launchpad.net

Description of the change

This fixes the remaining static library import which pulls in the static
gobject, "xklavier". The functionality just gets disabled, as it does not work
with pygobject 2.28 either:
https://bugs.launchpad.net/ubuntu/+source/ubuntuone-client/+bug/829186/comments/31

libxklavier does not currently build a GIR, but once it does this can be ported
as well. Until then disabling it avoids a crash without regressing
functionality.

pygobject 2.90 also slightly changed/fixed the API of Gdk.color_parse() as the
old API was unsafe. Now it's behaving like the old pygtk again and avoids
crashes in the case when the conversion failed.

I did two complete installations with these two fixes, one with manual
partitioning, the other with "use entire disk". I also locally hacked
/usr/share/pyshared/gobject/constants.py to raise an ImportError, so that I
detect all remaining imports of the static "gobject". With this branch I get no
exceptions any more.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-09-01 13:54:19 +0000
3+++ debian/changelog 2011-09-02 13:01:50 +0000
4@@ -1,8 +1,16 @@
5 ubiquity (2.7.27) UNRELEASED; urgency=low
6
7+ [ Evan Dandrea ]
8 * Don't show the wireless page if there's already a network connection
9 (LP: #838549).
10
11+ [ Martin Pitt ]
12+ * ubiquity/gtkwidgets.py: Fix return value evaluation of Gdk.color_parse()
13+ (API was fixed to not return a separate "success" flag any more).
14+ * ubiquity/misc.py: Disable set_indicator_keymaps() for now. It does not
15+ work with either the old (2.28) nor the current (2.90) pygobject, and
16+ still uses gconf. (LP: #829186)
17+
18 -- Evan Dandrea <ev@ubuntu.com> Thu, 01 Sep 2011 14:53:45 +0100
19
20 ubiquity (2.7.26) oneiric; urgency=low
21
22=== modified file 'ubiquity/gtkwidgets.py'
23--- ubiquity/gtkwidgets.py 2011-08-29 20:19:24 +0000
24+++ ubiquity/gtkwidgets.py 2011-09-02 13:01:50 +0000
25@@ -14,7 +14,7 @@
26 c.close_path()
27
28 def gtk_to_cairo_color(c):
29- color = Gdk.color_parse(c)[1]
30+ color = Gdk.color_parse(c)
31 s = 1.0/65535.0
32 r = color.red * s
33 g = color.green * s
34
35=== modified file 'ubiquity/misc.py'
36--- ubiquity/misc.py 2011-06-02 10:57:49 +0000
37+++ ubiquity/misc.py 2011-09-02 13:01:50 +0000
38@@ -561,6 +561,10 @@
39 return model
40
41 def set_indicator_keymaps(locale):
42+ import warnings
43+ warnings.warn('set_indicator_keymaps: this function currently does not work')
44+ return
45+
46 import libxml2
47 import xklavier
48 from gi.repository import Gdk

Subscribers

People subscribed via source and target branches

to status/vote changes: