Merge lp:~pitti/software-center/gi-fixes into lp:software-center

[Martin Pitt]

More gobject/GObject fixes.

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-19 07:57:36 +0000
+++ debian/changelog	2011-08-19 08:26:37 +0000
@@ -26,6 +26,10 @@
     - show channel selector on button-press-event instead of
       button-release-event for consistent menu behaviour (LP: #828317)
 
+  [ Martin Pitt ]
+  * Fix some more places which need to conditionally import gobject or
+    GObject. (LP: #829186)
+
  -- Michael Vogt <[e-mail]>  Fri, 19 Aug 2011 09:38:46 +0200
 
 software-center (4.1.16) oneiric; urgency=low

=== modified file 'softwarecenter/backend/aptchannels.py'
--- softwarecenter/backend/aptchannels.py	2011-08-05 15:32:20 +0000
+++ softwarecenter/backend/aptchannels.py	2011-08-19 08:26:37 +0000
@@ -18,9 +18,14 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 import os
-from gi.repository import GObject
 import logging
 import xapian
+import sys
+
+if 'gobject' in sys.modules:
+    import gobject as GObject
+else:
+    from gi.repository import GObject
 
 from aptsources.sourceslist import SourceEntry, SourcesList
 

=== modified file 'softwarecenter/backend/aptd.py'
--- softwarecenter/backend/aptd.py	2011-08-17 09:11:49 +0000
+++ softwarecenter/backend/aptd.py	2011-08-19 08:26:37 +0000
@@ -18,10 +18,16 @@
 
 import apt_pkg
 import dbus
-from gi.repository import GObject
 import logging
 import os
 import re
+import sys
+
+if 'gobject' in sys.modules:
+    import gobject as GObject
+else:
+    from gi.repository import GObject
+
 from softwarecenter.utils import (sources_filename_from_ppa_entry,
                                   release_filename_in_lists_from_deb_line,
                                   obfuscate_private_ppa_details,

=== modified file 'softwarecenter/backend/weblive.py'
--- softwarecenter/backend/weblive.py	2011-08-09 08:47:43 +0000
+++ softwarecenter/backend/weblive.py	2011-08-19 08:26:37 +0000
@@ -22,13 +22,17 @@
 # and put into weblive_pristine.py
 
 import re
-from gi.repository import GObject
 import os
 import random
 import subprocess
 import string
 import imp
+import sys
 
+if 'gobject' in sys.modules:
+    import gobject as GObject
+else:
+    from gi.repository import GObject
 from threading import Thread, Event
 from weblive_pristine import WebLive
 import softwarecenter.paths

=== modified file 'softwarecenter/db/history_impl/apthistory.py'
--- softwarecenter/db/history_impl/apthistory.py	2011-08-13 08:50:01 +0000
+++ softwarecenter/db/history_impl/apthistory.py	2011-08-19 08:26:37 +0000
@@ -17,8 +17,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 
-from gi.repository import GObject
-
 import apt_pkg
 apt_pkg.init_config()
 
@@ -27,6 +25,7 @@
 import gzip
 import os.path
 import logging
+import gobject as GObject
 
 try:
     import cPickle as pickle

=== modified file 'softwarecenter/db/update.py'
--- softwarecenter/db/update.py	2011-08-18 16:36:07 +0000
+++ softwarecenter/db/update.py	2011-08-19 08:26:37 +0000
@@ -18,7 +18,6 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 import base64
-from gi.repository import GObject
 import logging
 import os
 import json
@@ -26,6 +25,12 @@
 import shutil
 import time
 import xapian
+import sys
+
+if 'gobject' in sys.modules:
+    import gobject as GObject
+else:
+    from gi.repository import GObject
 
 # py3 compat
 try: