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
=== modified file 'debian/changelog'
--- debian/changelog 2011-09-01 13:54:19 +0000
+++ debian/changelog 2011-09-02 13:01:50 +0000
@@ -1,8 +1,16 @@
1ubiquity (2.7.27) UNRELEASED; urgency=low1ubiquity (2.7.27) UNRELEASED; urgency=low
22
3 [ Evan Dandrea ]
3 * Don't show the wireless page if there's already a network connection4 * Don't show the wireless page if there's already a network connection
4 (LP: #838549).5 (LP: #838549).
56
7 [ Martin Pitt ]
8 * ubiquity/gtkwidgets.py: Fix return value evaluation of Gdk.color_parse()
9 (API was fixed to not return a separate "success" flag any more).
10 * ubiquity/misc.py: Disable set_indicator_keymaps() for now. It does not
11 work with either the old (2.28) nor the current (2.90) pygobject, and
12 still uses gconf. (LP: #829186)
13
6 -- Evan Dandrea <ev@ubuntu.com> Thu, 01 Sep 2011 14:53:45 +010014 -- Evan Dandrea <ev@ubuntu.com> Thu, 01 Sep 2011 14:53:45 +0100
715
8ubiquity (2.7.26) oneiric; urgency=low16ubiquity (2.7.26) oneiric; urgency=low
917
=== modified file 'ubiquity/gtkwidgets.py'
--- ubiquity/gtkwidgets.py 2011-08-29 20:19:24 +0000
+++ ubiquity/gtkwidgets.py 2011-09-02 13:01:50 +0000
@@ -14,7 +14,7 @@
14 c.close_path()14 c.close_path()
1515
16def gtk_to_cairo_color(c):16def gtk_to_cairo_color(c):
17 color = Gdk.color_parse(c)[1]17 color = Gdk.color_parse(c)
18 s = 1.0/65535.018 s = 1.0/65535.0
19 r = color.red * s19 r = color.red * s
20 g = color.green * s20 g = color.green * s
2121
=== modified file 'ubiquity/misc.py'
--- ubiquity/misc.py 2011-06-02 10:57:49 +0000
+++ ubiquity/misc.py 2011-09-02 13:01:50 +0000
@@ -561,6 +561,10 @@
561 return model561 return model
562562
563def set_indicator_keymaps(locale):563def set_indicator_keymaps(locale):
564 import warnings
565 warnings.warn('set_indicator_keymaps: this function currently does not work')
566 return
567
564 import libxml2568 import libxml2
565 import xklavier569 import xklavier
566 from gi.repository import Gdk570 from gi.repository import Gdk

Subscribers

People subscribed via source and target branches

to status/vote changes: