Changeset 4536

Timestamp:

07/18/08 19:19:55 (5 years ago)

Author:

john_lee

Message:

modify fso_backend to set mainloop when initialize. use GMainLoop as
default in testing.

• also modify dialer to reflect the changes.

Location:

developers/john_lee/pyfso

Files:

• dialer.py (modified) (3 diffs)
• fso_backend.py (modified) (3 diffs)

developers/john_lee/pyfso/dialer.py

@@ -77 +77 @@
     """A Dialer implementation based on fso dbus API.
     """
-    def __init__(self):
+    def __init__(self, mainloop):
         super(FSODialer, self).__init__()
         self.callid = None
@@ -85 +85 @@
         from threading import Thread
         # put the slow init function into background
-        Thread(target=self._init).start()
+        Thread(target=self._init, args=(mainloop, )).start()
         # FIXME: get state from fso and set self state
         self._set_state('release')
 
-    def _init(self):
-        if not self.fso.initialize():
+    def _init(self, mainloop):
+        if not self.fso.initialize(mainloop):
             return
         self.fso.onCallStatus.append(self.on_call_status)
@@ -131 +131 @@
 
 def _test():
-    import ecore
-    FSODialer()
-    ecore.main_loop_begin()
+    from dbus.mainloop.glib import DBusGMainLoop
+    FSODialer(DBusGMainLoop())
 
 

developers/john_lee/pyfso/fso_backend.py

@@ -1 @@
-import e_dbus
 import os
 from dbus import DBusException, SystemBus, Interface
@@ -45 +44 @@
         return obj
 
-    def initialize( self ):
+    def initialize( self, mainloop ):
         if self.fullinit:
             return True
         try:
-            self.bus = SystemBus( mainloop=e_dbus.DBusEcoreMainLoop() )
+            self.bus = SystemBus( mainloop=mainloop )
         except DBusException, e:
             print "could not connect to dbus_object system bus:", e
@@ -178 +177 @@
 
 def _test():
+    from dbus.mainloop.glib import DBusGMainLoop
     fso = FSOObject()
-    fso.initialize()
+    fso.initialize(DBusGMainLoop())