Renamed DbusRuleMatcher to DbusRule

diff --git a/dbuscron.py b/dbuscron.py
index a2bfb17..a66ff68 100755 (executable)
--- a/dbuscron.py
+++ b/dbuscron.py
@@ -23,14 +23,14 @@ if __name__ == '__main__':
             logfile='/var/log/dbuscron.log'
             )
 
-    from dbuscron import DbusBus, DbusRuleMatcher, Command, Commands, CrontabParser
+    from dbuscron import DbusBus, DbusRule, Command, Commands, CrontabParser
 
     bus = DbusBus()
     commands = Commands()
     crontab = CrontabParser('/etc/dbuscrontab')
 
     for rule, cmd in crontab:
-        matcher = DbusRuleMatcher(**rule)
+        matcher = DbusRule(**rule)
         command = Command(cmd)
         matcher.register()
         commands.add(matcher, command)

diff --git a/dbuscron/__init__.py b/dbuscron/__init__.py
index c01666e..3b5f99e 100644 (file)
--- a/dbuscron/__init__.py
+++ b/dbuscron/__init__.py
@@ -1,8 +1,8 @@
 
-from dbuscron.bus import DbusRuleMatcher, DbusBus
+from dbuscron.bus import DbusRule, DbusBus
 from dbuscron.command import Command, Commands
 from dbuscron.daemonize import daemonize
 from dbuscron.parser import CrontabParser
 
-__all__ = ['DbusRuleMatcher', 'DbusBus', 'Command', 'Commands', 'daemonize', 'CrontabParser']
+__all__ = ['DbusRule', 'DbusBus', 'Command', 'Commands', 'daemonize', 'CrontabParser']
 

diff --git a/dbuscron/bus.py b/dbuscron/bus.py
index 300c215..f82cb21 100644 (file)
--- a/dbuscron/bus.py
+++ b/dbuscron/bus.py
@@ -31,15 +31,12 @@ class DbusBus(object):
             self.__system_bus.add_message_filter(handler)
         if self.__session_bus:
             self.__session_bus.add_message_filter(handler)
-
     def listen(self):
-        from dbus.mainloop.glib import DBusGMainLoop
         from gobject import MainLoop
-        DBusGMainLoop(set_as_default=True)
         loop = MainLoop()
         loop.run()
 
-class DbusRuleMatcher(object):
+class DbusRule(object):
     def __init__(self, bus_=None, type_=None, sender_=None, interface_=None, path_=None, member_=None, destination_=None, args_=[]):
         self._bus         = bus_
         self._type        = type_