main: Move neard to the system bus

neard is a system daemon and should be link to a session.

diff --git a/src/main.c b/src/main.c
index 9818e73..7fe6388 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -127,13 +127,13 @@ int main(int argc, char *argv[])
 
        dbus_error_init(&err);
 
-       conn = g_dbus_setup_bus(DBUS_BUS_SESSION, NFC_SERVICE, &err);
+       conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, NFC_SERVICE, &err);
        if (conn == NULL) {
                if (dbus_error_is_set(&err) == TRUE) {
                        fprintf(stderr, "%s\n", err.message);
                        dbus_error_free(&err);
                } else
-                       fprintf(stderr, "Can't register with session bus\n");
+                       fprintf(stderr, "Can't register with system bus\n");
                exit(1);
        }
 

diff --git a/test/dump-record b/test/dump-record
index e40850f..8cf3cb1 100755 (executable)
--- a/test/dump-record
+++ b/test/dump-record
@@ -10,7 +10,7 @@ def extract_list(list):
        val += " ]"
        return val
 
-bus = dbus.SessionBus()
+bus = dbus.SystemBus()
 
 record = dbus.Interface(bus.get_object("org.neard", sys.argv[1]),
                                                "org.neard.Record")

diff --git a/test/dump-target b/test/dump-target
index e5e7a34..1242636 100755 (executable)
--- a/test/dump-target
+++ b/test/dump-target
@@ -3,7 +3,7 @@
 import sys
 import dbus
 
-bus = dbus.SessionBus()
+bus = dbus.SystemBus()
 
 def extract_list(list):
        val = "["

diff --git a/test/list-adapters b/test/list-adapters
index c8e7dc6..379aca4 100755 (executable)
--- a/test/list-adapters
+++ b/test/list-adapters
@@ -10,7 +10,7 @@ def extract_list(list):
        val += " ]"
        return val
 
-bus = dbus.SessionBus()
+bus = dbus.SystemBus()
 
 manager = dbus.Interface(bus.get_object("org.neard", "/"),
                                        "org.neard.Manager")

diff --git a/test/monitor-near b/test/monitor-near
index 30d82b7..0db7ea1 100755 (executable)
--- a/test/monitor-near
+++ b/test/monitor-near
@@ -44,7 +44,7 @@ def property_changed_manager(name, value, path):
 if __name__ == '__main__':
        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
-       bus = dbus.SessionBus()
+       bus = dbus.SystemBus()
 
        bus.add_signal_receiver(property_changed_manager,
                                bus_name="org.neard",

diff --git a/test/neard-ui.py b/test/neard-ui.py
index 3f0294e..ff7a74f 100755 (executable)
--- a/test/neard-ui.py
+++ b/test/neard-ui.py
@@ -69,7 +69,7 @@ class Neard:
     def record_updateDetails(self, target_properties):
          for record_path in target_properties["Records"]:
             print ("REC %s ") % record_path
-            record_obj = self.sessionBus.get_object('org.neard',
+            record_obj = self.systemBus.get_object('org.neard',
                                                      record_path)
             record_iface = dbus.Interface(record_obj,'org.neard.Record')
             record_properties = record_iface.GetProperties()
@@ -84,7 +84,7 @@ class Neard:
         if adapt_properties["Targets"]:
             for target_path in adapt_properties["Targets"]:
                 print ("TGT %s ") % target_path
-                target_obj = self.sessionBus.get_object('org.neard', target_path)
+                target_obj = self.systemBus.get_object('org.neard', target_path)
 
                 target_iface = dbus.Interface(target_obj,'org.neard.Target')
                 target_properties = target_iface.GetProperties()
@@ -108,7 +108,7 @@ class Neard:
                     print (" already registered %s") % adapt_path
                 else:
                     #Get valuable informations from the object
-                    adapter_obj = self.sessionBus.get_object('org.neard',
+                    adapter_obj = self.systemBus.get_object('org.neard',
                                                          adapt_path)
                     adapter_obj.connect_to_signal('PropertyChanged',
                                                self.adapter_PropertyChanged,
@@ -151,10 +151,10 @@ class Neard:
         self.targetregistered = {}
         self.recordregistered = {}
 
-        self.sessionBus = dbus.SessionBus()
+        self.systemBus = dbus.SessionBus()
 
         #Prepare the first handler
-        self.sessionBus.watch_name_owner('org.neard',
+        self.systemBus.watch_name_owner('org.neard',
                                          self.neardNameOwnerChanged)
 
 ##=================================================================
@@ -171,7 +171,7 @@ class NeardUI(Neard):
         if path:
             i = self.adapters_list.get_iter(path)
             objpath = self.adapters_list.get_value(i, 0)
-            adapter_obj = self.sessionBus.get_object('org.neard', objpath)
+            adapter_obj = self.systemBus.get_object('org.neard', objpath)
             adapt_iface = dbus.Interface(adapter_obj,'org.neard.Adapter')
 
             if self.adapters_actionToggle(i, 3):

diff --git a/test/start-poll b/test/start-poll
index 60ac2f4..69431d5 100755 (executable)
--- a/test/start-poll
+++ b/test/start-poll
@@ -7,7 +7,7 @@ if len(sys.argv) < 2:
        print "Usage: %s <nfc device>" % (sys.argv[0])
        sys.exit(1)
 
-bus = dbus.SessionBus()
+bus = dbus.SystemBus()
 
 manager = dbus.Interface(bus.get_object("org.neard", "/"),
                                        "org.neard.Manager")
@@ -20,4 +20,4 @@ adapter = dbus.Interface(bus.get_object("org.neard", path),
 try:
        adapter.StartPoll()
 except dbus.DBusException, error:
-       print "%s: %s" % (error._dbus_error_name, error.message)
\ No newline at end of file
+       print "%s: %s" % (error._dbus_error_name, error.message)

diff --git a/test/stop-poll b/test/stop-poll
index cd932b2..83a07f9 100755 (executable)
--- a/test/stop-poll
+++ b/test/stop-poll
@@ -7,7 +7,7 @@ if len(sys.argv) < 2:
        print "Usage: %s <nfc device>" % (sys.argv[0])
        sys.exit(1)
 
-bus = dbus.SessionBus()
+bus = dbus.SystemBus()
 
 manager = dbus.Interface(bus.get_object("org.neard", "/"),
                                        "org.neard.Manager")
@@ -20,4 +20,4 @@ adapter = dbus.Interface(bus.get_object("org.neard", path),
 try:
        adapter.StopPoll()
 except dbus.DBusException, error:
-       print "%s: %s" % (error._dbus_error_name, error.message)
\ No newline at end of file
+       print "%s: %s" % (error._dbus_error_name, error.message)