Merge commit 'v0.0.2.1' into debian/sid

6 files changed, 60 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 5db9688..5031736 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,40 @@
-commit 65744bc63c0230a8bfcf39b4723ac1ff68d89f10
+commit b20c91e1d1f75150c2e6e028dfd0eda75791a4a1
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Mon Nov 14 18:36:31 2011 +0100
+
+    Bump version to 0.0.2.1
+
+commit 855afa8a30645ce4cfff762fc502f951e786d219
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Mon Nov 14 18:34:30 2011 +0100
+
+    Fix URL
+
+commit 97803a61a75ef00147e26befffd22889ac19f16d
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Mon Sep 26 10:04:36 2011 +0200
+
+    Require PyGObject 3.0
+
+commit 8413459fc915b83e9974d0ff7cb12c12c10df091
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Mon Sep 26 10:04:36 2011 +0200
+
+    Adjust to GObject 3.0
+
+commit e9f6c6d60fd007643fab72cde5aacf851e34404f
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Mon Sep 26 19:18:07 2011 +0200
+
+    Fix typo
+
+commit 8b35c7402bbe003e9da37773d3ef5ceb06e8ae04
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Fri Aug 19 08:56:54 2011 +0200
+
+    Use a consistent timeout for MM DBus calls
+
+commit 04ae3ade85928efd5513e138a7cedcaaeb675e4c
 Author: Guido Günther <agx@sigxcpu.org>
 Date:   Sun Aug 14 14:06:59 2011 +0200
 
diff --git a/NEWS b/NEWS
index f121474..21e4a69 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+===============
+Version 0.0.2.1
+===============
+* Update to PyGObject 3.0
+
 =============
 Version 0.0.2
 =============
diff --git a/configure.ac b/configure.ac
index 0ff79c4..e0ee2f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,19 +1,19 @@
 #                                               -*- Autoconf -*-
 
 AC_PREREQ([2.67])
-AC_INIT([prepaid-manager-applet], [0.0.2],
-        [http://honk.sigxcpu.org/projects/prepaid-manager.py])
+AC_INIT([prepaid-manager-applet], [0.0.2.1],
+        [https://honk.sigxcpu.org/piki/projects/ppm/])
 AM_INIT_AUTOMAKE([-Wno-portability])
 
 IT_PROG_INTLTOOL([0.35.0])
 
 GLIB_REQUIRED=2.25.6
 GTK_REQUIRED=3.0.0
-PYGOBJECT_REQUIRED=2.28.3
+PYGOBJECT_REQUIRED=3.0
 
 PKG_CHECK_MODULES(PPM, [glib-2.0 >= $GLIB_REQUIRED
                         gtk+-3.0 >= $GTK_REQUIRED
-                        pygobject-2.0 >= $PYGOBJECT_REQUIRED])
+                        pygobject-3.0 >= $PYGOBJECT_REQUIRED])
 
 GETTEXT_PACKAGE=prepaid-manager-applet
 AC_SUBST(GETTEXT_PACKAGE)
diff --git a/src/ppm/modemproxy.py b/src/ppm/modemproxy.py
index fa06dd5..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
@@ -47,6 +46,7 @@ class ModemManagerProxy(GObject.GObject):
     MM_DBUS_INTERFACE_MODEM='org.freedesktop.ModemManager.Modem'
     MM_DBUS_INTERFACE_MODEM_GSM_CARD='org.freedesktop.ModemManager.Modem.Gsm.Card'
     MM_DBUS_INTERFACE_MODEM_GSM_USSD='org.freedesktop.ModemManager.Modem.Gsm.Ussd'
+    MM_DBUS_TIMEOUT = 5000
     
     __gsignals__ = {
         # Emitted when we got the new account balance from the provider
@@ -57,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
@@ -105,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)
@@ -134,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):
@@ -153,7 +153,7 @@ class ModemManagerProxy(GObject.GObject):
                                       self.MM_DBUS_INTERFACE_MODEM_GSM_USSD,
                                       None)
         ussd.call("Initiate", GLib.Variant('(s)', (command,)),
-                  Gio.DBusCallFlags.NO_AUTO_START, 5000, None,
+                  Gio.DBusCallFlags.NO_AUTO_START, self.MM_DBUS_TIMEOUT, None,
                   self.handle_dbus_reply, None)
 
     @mm_request
@@ -166,7 +166,7 @@ class ModemManagerProxy(GObject.GObject):
                                       self.MM_DBUS_INTERFACE_MODEM,
                                       None)
         ussd.call("Enable", GLib.Variant('(b)', (enable,)),
-                  Gio.DBusCallFlags.NO_AUTO_START, 1000, None,
+                  Gio.DBusCallFlags.NO_AUTO_START, self.MM_DBUS_TIMEOUT, None,
                   self.handle_dbus_reply, None)
 
     def modem_enable(self, reply_func=None, error_func=None):
diff --git a/src/ppm/providerdb.py b/src/ppm/providerdb.py
index 2ea3272..8aafa27 100644
--- a/src/ppm/providerdb.py
+++ b/src/ppm/providerdb.py
@@ -94,7 +94,7 @@ class ProviderDB(object):
                 if t.tag == 'sms':
                     number = t.text
                     text = t.attrib['text']
-                    provicer.add_top_up_cmd({'sms': (number, text)})
+                    provider.add_top_up_cmd({'sms': (number, text)})
                     
     def get_providers(self, mcc, mnc):
         """
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()