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

[Martin Pitt]

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.

=== 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 @@
 ubiquity (2.7.27) UNRELEASED; urgency=low
 
+  [ Evan Dandrea ]
   * Don't show the wireless page if there's already a network connection
     (LP: #838549).
 
+  [ Martin Pitt ]
+  * ubiquity/gtkwidgets.py: Fix return value evaluation of Gdk.color_parse()
+    (API was fixed to not return a separate "success" flag any more).
+  * ubiquity/misc.py: Disable set_indicator_keymaps() for now. It does not
+    work with either the old (2.28) nor the current (2.90) pygobject, and
+    still uses gconf. (LP: #829186)
+
  -- Evan Dandrea <[e-mail]>  Thu, 01 Sep 2011 14:53:45 +0100
 
 ubiquity (2.7.26) oneiric; urgency=low

=== 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 @@
     c.close_path()
 
 def gtk_to_cairo_color(c):
-    color = Gdk.color_parse(c)[1]
+    color = Gdk.color_parse(c)
     s = 1.0/65535.0
     r = color.red * s
     g = color.green * s

=== 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 @@
     return model
 
 def set_indicator_keymaps(locale):
+    import warnings
+    warnings.warn('set_indicator_keymaps: this function currently does not work')
+    return
+
     import libxml2
     import xklavier
     from gi.repository import Gdk