From 8413459fc915b83e9974d0ff7cb12c12c10df091 Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Mon, 26 Sep 2011 10:04:36 +0200
Subject: Adjust to GObject 3.0

---
 src/ppm/modemproxy.py         |  7 +++----
 src/prepaid-manager-applet.py | 14 +++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/ppm/modemproxy.py b/src/ppm/modemproxy.py
index ca5fcf7..b7108a1 100644
--- a/src/ppm/modemproxy.py
+++ b/src/ppm/modemproxy.py
@@ -16,7 +16,6 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-import glib
 from gi.repository import GObject
 from gi.repository import GLib
 from gi.repository import Gio
@@ -58,7 +57,7 @@ class ModemManagerProxy(GObject.GObject):
         }
 
     def __init__(self):
-        self.__gobject_init__()
+        GObject.GObject.__init__(self)
         self.bus = Gio.bus_get_sync(Gio.BusType.SYSTEM, None)
         self.request = None
         self.reply_func = None
@@ -106,7 +105,7 @@ class ModemManagerProxy(GObject.GObject):
             res = obj.call_finish(result)
             if self.reply_func:
                 self.reply_func(res, user_data)
-        except glib.GError as err:
+        except Exception as err:
             if self.error_func:
                 me = ModemError("%s failed: %s" % (self.request, err))
                 self.error_func(me)
@@ -135,7 +134,7 @@ class ModemManagerProxy(GObject.GObject):
                                     None)
         try:
             return card.GetImsi()
-        except glib.GError as msg:
+        except Exception as msg:
             raise ModemError("Getting IMSI failed: %s" % msg)
 
     def get_network_id(self):
diff --git a/src/prepaid-manager-applet.py b/src/prepaid-manager-applet.py
index 622b16f..682e170 100755
--- a/src/prepaid-manager-applet.py
+++ b/src/prepaid-manager-applet.py
@@ -20,7 +20,7 @@
 
 import gettext
 from gi.repository import GObject
-import glib
+from gi.repository import GLib
 from gi.repository import Gtk
 from gi.repository import Gdk
 import locale
@@ -60,7 +60,7 @@ class PPMController(GObject.GObject):
         self.mm.connect('request-finished', self.on_mm_request_finished)
 
     def __init__(self):
-        self.__gobject_init__()
+        GObject.GObject.__init__(self)
         self.mm = None
         self.imsi = None
         self.provider = None
@@ -320,7 +320,7 @@ class PPMDialog(GObject.GObject, PPMObject):
         self._init_subdialogs()
 
     def __init__(self, controller):
-        self.__gobject_init__()
+        GObject.GObject.__init__(self)
         PPMObject.__init__(self, None, "ppm")
         self.controller = controller
         # Register ourself to the controller
@@ -622,7 +622,7 @@ class PPMModemResponse(PPMObject):
         
     def show(self):
         self.timer = GObject.timeout_add(50, self.do_progress,
-                                         priority=glib.PRIORITY_HIGH)
+                                         priority=GLib.PRIORITY_HIGH)
         self.dialog.show()
 
     def close(self):
@@ -660,13 +660,13 @@ def setup_schemas():
 
 def setup_prgname():
     """Set the prgname since gnome-shell is application based"""
-    glib.set_prgname(ppm.prgname)
+    GLib.set_prgname(ppm.prgname)
     Gdk.set_program_class(ppm.prgname)
-    glib.set_application_name(_("Prepaid Manager"))
+    GLib.set_application_name(_("Prepaid Manager"))
 
 
 def main(args):
-    parser = glib.option.OptionParser()
+    parser = GLib.option.OptionParser()
     parser.add_option("--debug", "-d", action="store_true", dest="debug",
                       help="enable debugging", default=False)
     options, args = parser.parse_args()
-- 
cgit v1.2.3