Merge lp:~roadmr/checkbox/bug-937099 into lp:checkbox

[Daniel Manrique]

Mixing the old way of using gobject (in checkbox_qt.py import gobject) with the new way (in user_interface.py when importing gi.repository.Gio) break things. This updates checkbox_qt.py to use gi.repository instead.

I found several other instances of gobject use, but they seem to be self-contained in testing scripts, so they shouldn't cause problems for now, however at some point these should also be reviewed and rewritten to use gi.repository as the way to do it (tm).

[Marc Tardif (cr3)]

Awesome, thanks so much!

review: Approve

[Tiago Salem Herrmann (tiagosh)]

Looks like there is a conflict in the changelog file, is that correct?

[Marc Tardif (cr3)]

Right, but that's common because the same part of the same file is changed for every merge request. So, the person merging a branch should make sure to properly resolve any conflicts such as this one. This is what I did when merging this branch as revno 1275 in trunk:

=== modified file 'debian/changelog'
--- debian/changelog 2012-02-22 18:02:51 +0000
+++ debian/changelog 2012-02-22 21:05:54 +0000
@@ -1,5 +1,11 @@
 checkbox (0.13.3) precise; urgency=low

+ [Brendan Donegan]
+ * Typo in command for for miscellanea/virtualization-check (LP: #934243)
+
+ [Daniel Manrique]
+ * Use GObject from gi.repository instead of gobject (LP: #937099)
+
   [Javier Collado]
   * Fixed running of disk/read_performance tests (LP: #933528)

@@ -7,9 +13,6 @@
   * Fix depends fields in info and suspend test suites (LP: #934051)
   * Display results report in non-graphical interfaces (LP: #937657)

- [Brendan Donegan]
- * Typo in command for for miscellanea/virtualization-check (LP: #934243)
-
   [ Tiago Salem Herrmann ]
   * Remove auto generated qt resource file (LP: #938863)

=== modified file 'checkbox_qt/qt_interface.py'
--- checkbox_qt/qt_interface.py	2012-02-14 21:56:03 +0000
+++ checkbox_qt/qt_interface.py	2012-02-22 20:16:18 +0000
@@ -20,7 +20,7 @@
 import time
 import posixpath
 import inspect
-import gobject
+from gi.repository import GObject
 import os
 
 from gettext import gettext as _
@@ -51,7 +51,7 @@
                 self.bus = dbus.SessionBus(mainloop=DBusGMainLoop())
                 self.qtfront = self.bus.get_object('com.canonical.QtCheckbox', '/QtCheckbox')
                 self.qtiface = dbus.Interface(self.qtfront, dbus_interface='com.canonical.QtCheckbox')
-                self.loop = gobject.MainLoop()
+                self.loop = GObject.MainLoop()
                 notReady = False
             except:
                 time.sleep(0.5)

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-22 18:02:51 +0000
+++ debian/changelog	2012-02-22 20:16:18 +0000
@@ -10,9 +10,15 @@
   [Brendan Donegan]
   * Typo in command for for miscellanea/virtualization-check (LP: #934243)
 
+<<<<<<< TREE
   [ Tiago Salem Herrmann ]
   * Remove auto generated qt resource file (LP: #938863)
 
+=======
+  [Daniel Manrique]
+  * Use GObject from gi.repository instead of gobject (LP: #937099)
+
+>>>>>>> MERGE-SOURCE
  -- Marc Tardif <[e-mail]>  Thu, 16 Feb 2012 10:31:18 -0500
 
 checkbox (0.13.2) precise; urgency=low