Changeset 6b6c9e80cbff045021290c7b45b342a12de9fb60 for sx-actions

Timestamp:

06/28/2009 09:20:49 PM (13 months ago)

Author:

dunk <dunk@…>

Children:

b06d50c90d5a172454075501ac2cce799832e9d0

Parents:

2369521f681e2c7b6d3037306b2dee05fba9d67b

git-committer:

dunk <dunk@inspo.(none)> / 2009-06-28T21:20:49Z+0100

Message:

sx-dbus: initial yaydbus code

Location:

sx-actions/sxactions

Files:

• __init__.py (modified) (1 diff)
• dbusobj.py (modified) (1 diff)

sx-actions/sxactions/__init__.py

@@ -322 +322 @@
 
     def on_ready(self, app):
-        if 'dbus' in app.plugins:
+        if False and 'dbus' in app.plugins:
             import sxactions.dbusobj
             import functools

sx-actions/sxactions/dbusobj.py

@@ -1 @@
-import dbus 
+try:
+    from yaydbus.service import Object
+    YAYDBUS = True
+except ImportError:
+    from dbus.service import Object
+    YAYDBUS = False
 from sxdbus import sxmethod
 
-class ActionsObject(dbus.service.Object):
-    def __init__(self, plugin, **kwargs):
+class ActionsObject(Object):
+    def __init__(self, plugin, *args, **kwargs):
         self.plugin = plugin
-        dbus.service.Object.__init__(self, **kwargs)
+        Object.__init__(self, *args, **kwargs)
 
     @sxmethod("ActionsInterface", in_signature='s', out_signature='')