X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=dbuscron%2Fbus.py;h=05146181acba2206c84704978c3d7c897886324f;hb=HEAD;hp=7d7f5b85b3b54b6891acfd8e1ad600abe374ab98;hpb=689661aeb4d7b906c58de6890c960e2091305f53;p=dbuscron

diff --git a/dbuscron/bus.py b/dbuscron/bus.py
index 7d7f5b8..0514618 100644
--- a/dbuscron/bus.py
+++ b/dbuscron/bus.py
@@ -1,13 +1,16 @@
 from __future__ import with_statement
 
 import dbus, os
+from fnmatch import fnmatch
 
 from dbuscron.logger import Logger
 log = Logger(__name__)
 
 def dbus_to_str(value):
     try:
-        if isinstance(value, dbus.Byte):
+        if value is None:
+            return ''
+        elif isinstance(value, dbus.Byte):
             result = str(int(value))
         elif isinstance(value, dbus.ByteArray):
             result = ','.join(str(ord(v)) for v in value)
@@ -24,7 +27,6 @@ def dbus_to_str(value):
         log.error('convert exception', e)
         raise e
 
-
 def get_dbus_message_type(message):
     result = message.__class__.__name__[0:-7]
     for c in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ':
@@ -36,16 +38,23 @@ class DbusBus(object):
     __system_bus = None
     __session_bus = None
 
-    def __new__(cls):
+    def __new__(cls, *args, **kw):
         if not cls.__bus:
             cls.__bus = super(DbusBus, cls).__new__(cls)
         return cls.__bus
 
-    def __init__(self):
-        self.get_session_bus_address()
+    def __init__(self, session_bus_address=None):
+        if session_bus_address:
+            self.set_session_bus_address(session_bus_address)
+        else:
+            self.get_session_bus_address()
+
         from dbus.mainloop.glib import DBusGMainLoop
         DBusGMainLoop(set_as_default=True)
 
+    def set_session_bus_address(self, value):
+        os.environ['DBUS_SESSION_BUS_ADDRESS'] = str(value)
+
     def get_session_bus_address(self):
         try:
             return os.environ['DBUS_SESSION_BUS_ADDRESS']
@@ -56,6 +65,8 @@ class DbusBus(object):
                 log('session bus address aquired', session_bus_address)
                 return session_bus_address
 
+    session_bus_address = property(get_session_bus_address, set_session_bus_address)
+
     @property
     def system(self):
         if not self.__system_bus:
@@ -116,7 +127,6 @@ class DbusRule(object):
         return ','.join(rule)
 
     def match(self, bus, message):
-
         if self._bus not in (None, bus):
             return False
 
@@ -145,8 +155,10 @@ class DbusRule(object):
             for i, arg in enumerate(args_):
                 if i >= len(self._args):
                     break
-                if self._args[i] not in (None, str(arg)):
-                    return False
+                a = dbus_to_str(arg)
+                if self._args[i] not in (None, a):
+                    if not fnmatch(a, self._args[i]):
+                        return False
 
         return True