Merge lp:~pitti/ubiquity/indicator-soname into lp:ubiquity

[Martin Pitt]

Fix the tests to work with pygobject 3.1.92, which fixed the return API of get_visible_range().

[Martin Pitt (pitti)]

Sorry for the bad branch name, I accidentally re-used an older one.

[Colin Watson (cjwatson)]

Needs to tolerate both old and new pygobject, at least for now; I'll fix that up locally as discussed on IRC.

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-19 16:37:36 +0000
+++ debian/changelog	2012-03-19 16:38:27 +0000
@@ -13,7 +13,14 @@
   * Merge and update Alessio Treglia's branch to make the slideshow
     optional depending on (ubiquity/hide_slideshow) (LP: #690912)
 
+<<<<<<< TREE
  -- Stéphane Graber <[e-mail]>  Mon, 19 Mar 2012 12:22:59 -0400
+=======
+  [ Martin Pitt ]
+  * tests/test_migrationassistant.py: Fix to work with pygobject 3.1.92.
+
+ -- Stéphane Graber <[e-mail]>  Mon, 19 Mar 2012 11:48:43 -0400
+>>>>>>> MERGE-SOURCE
 
 ubiquity (2.9.29) precise; urgency=low
 

=== modified file 'tests/test_migrationassistant.py'
--- tests/test_migrationassistant.py	2012-03-06 00:28:03 +0000
+++ tests/test_migrationassistant.py	2012-03-19 16:38:27 +0000
@@ -37,7 +37,6 @@
                 })
         ma_page.ui.ma_set_choices(tree)
         ui.refresh()
-        valid, start_path, end_path = ui.matreeview.get_visible_range()
-        self.assertTrue(valid)
+        start_path, end_path = ui.matreeview.get_visible_range()
         self.assertEqual('0', start_path.to_string())
         self.assertEqual('3', end_path.to_string())