diff options
| -rw-r--r-- | include/dbus.h | 2 | ||||
| -rw-r--r-- | src/connman.conf | 8 | ||||
| -rw-r--r-- | src/connman.service.in | 2 | ||||
| -rwxr-xr-x | test/get-state | 4 | ||||
| -rwxr-xr-x | test/list-interfaces | 12 | ||||
| -rwxr-xr-x | test/select-network | 12 | ||||
| -rwxr-xr-x | test/show-introspection | 8 | ||||
| -rwxr-xr-x | test/simple-agent | 6 | ||||
| -rwxr-xr-x | test/start-scanning | 8 |
9 files changed, 31 insertions, 31 deletions
diff --git a/include/dbus.h b/include/dbus.h index 21efdf52..a237e382 100644 --- a/include/dbus.h +++ b/include/dbus.h @@ -28,7 +28,7 @@ extern "C" { #include <dbus/dbus.h> -#define CONNMAN_SERVICE "org.freedesktop.connman" +#define CONNMAN_SERVICE "org.moblin.connman" #define CONNMAN_ERROR_INTERFACE CONNMAN_SERVICE ".Error" diff --git a/src/connman.conf b/src/connman.conf index 4e3567e6..f9da1512 100644 --- a/src/connman.conf +++ b/src/connman.conf @@ -2,12 +2,12 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <busconfig> <policy user="root"> - <allow own="org.freedesktop.connman"/> - <allow send_destination="org.freedesktop.connman"/> + <allow own="org.moblin.connman"/> + <allow send_destination="org.moblin.connman"/> <allow send_interface="org.isc.dhclient"/> </policy> <policy at_console="true"> - <allow send_destination="org.freedesktop.connman"/> - <allow send_interface="org.freedesktop.connman"/> + <allow send_destination="org.moblin.connman"/> + <allow send_interface="org.moblin.connman"/> </policy> </busconfig> diff --git a/src/connman.service.in b/src/connman.service.in index 8c2368a7..e514c776 100644 --- a/src/connman.service.in +++ b/src/connman.service.in @@ -1,4 +1,4 @@ [D-BUS Service] -Name=org.freedesktop.connman +Name=org.moblin.connman Exec=@prefix@/sbin/connmand User=root diff --git a/test/get-state b/test/get-state index e5b130c8..f82b44c5 100755 --- a/test/get-state +++ b/test/get-state @@ -4,8 +4,8 @@ import dbus bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object('org.freedesktop.connman', "/"), - 'org.freedesktop.connman.Manager') +manager = dbus.Interface(bus.get_object('org.moblin.connman', "/"), + 'org.moblin.connman.Manager') state = manager.GetState() diff --git a/test/list-interfaces b/test/list-interfaces index 5a1d28fa..3a54a269 100755 --- a/test/list-interfaces +++ b/test/list-interfaces @@ -4,16 +4,16 @@ import dbus bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object('org.freedesktop.connman', "/"), - 'org.freedesktop.connman.Manager') +manager = dbus.Interface(bus.get_object('org.moblin.connman', "/"), + 'org.moblin.connman.Manager') interfaces = manager.ListInterfaces() for path in interfaces: print "[ %s ]" % (path) - interface = dbus.Interface(bus.get_object('org.freedesktop.connman', path), - 'org.freedesktop.connman.Interface') + interface = dbus.Interface(bus.get_object('org.moblin.connman', path), + 'org.moblin.connman.Interface') properties = interface.GetProperties() for key in properties.keys(): @@ -27,8 +27,8 @@ for path in interfaces: for i in networks: print " Network.Path = %s" % (i) - network = dbus.Interface(bus.get_object('org.freedesktop.connman', i), - 'org.freedesktop.connman.Network') + network = dbus.Interface(bus.get_object('org.moblin.connman', i), + 'org.moblin.connman.Network') print " Network.Identifier = %s" % (network.GetIdentifier()) print " Network.Passphrase = %s" % (network.GetPassphrase()) diff --git a/test/select-network b/test/select-network index e009d75b..7de8d65c 100755 --- a/test/select-network +++ b/test/select-network @@ -4,24 +4,24 @@ import dbus bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object('org.freedesktop.connman', "/"), - 'org.freedesktop.connman.Manager') +manager = dbus.Interface(bus.get_object('org.moblin.connman', "/"), + 'org.moblin.connman.Manager') interfaces = manager.ListInterfaces() for path in interfaces: print "[ %s ]" % (path) - interface = dbus.Interface(bus.get_object('org.freedesktop.connman', path), - 'org.freedesktop.connman.Interface') + interface = dbus.Interface(bus.get_object('org.moblin.connman', path), + 'org.moblin.connman.Interface') properties = interface.GetProperties() if (properties["Type"] == "80211"): networks = interface.ListNetworks() for i in networks: - network = dbus.Interface(bus.get_object('org.freedesktop.connman', i), - 'org.freedesktop.connman.Network') + network = dbus.Interface(bus.get_object('org.moblin.connman', i), + 'org.moblin.connman.Network') if (network.GetIdentifier() == "ConnMan Testing"): print " Selecting network %s" % (i) diff --git a/test/show-introspection b/test/show-introspection index 9acdd112..c1cb0ef9 100755 --- a/test/show-introspection +++ b/test/show-introspection @@ -4,18 +4,18 @@ import dbus bus = dbus.SystemBus() -object = dbus.Interface(bus.get_object('org.freedesktop.connman', '/'), +object = dbus.Interface(bus.get_object('org.moblin.connman', '/'), 'org.freedesktop.DBus.Introspectable') print object.Introspect() -manager = dbus.Interface(bus.get_object('org.freedesktop.connman', "/"), - 'org.freedesktop.connman.Manager') +manager = dbus.Interface(bus.get_object('org.moblin.connman', "/"), + 'org.moblin.connman.Manager') interfaces = manager.ListInterfaces() for path in interfaces: - object = dbus.Interface(bus.get_object('org.freedesktop.connman', path), + object = dbus.Interface(bus.get_object('org.moblin.connman', path), 'org.freedesktop.DBus.Introspectable') print object.Introspect() diff --git a/test/simple-agent b/test/simple-agent index 47a61f62..cb3a6751 100755 --- a/test/simple-agent +++ b/test/simple-agent @@ -7,7 +7,7 @@ import dbus.service import dbus.mainloop.glib class Agent(dbus.service.Object): - @dbus.service.method("org.freedesktop.connman.Agent", + @dbus.service.method("org.moblin.connman.Agent", in_signature='', out_signature='') def Release(self): print("Release") @@ -17,8 +17,8 @@ if __name__ == '__main__': dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) bus = dbus.SystemBus() - manager = dbus.Interface(bus.get_object('org.freedesktop.connman', "/"), - 'org.freedesktop.connman.Manager') + manager = dbus.Interface(bus.get_object('org.moblin.connman', "/"), + 'org.moblin.connman.Manager') path = "/test/agent" object = Agent(bus, path) diff --git a/test/start-scanning b/test/start-scanning index 712b3e93..b5933231 100755 --- a/test/start-scanning +++ b/test/start-scanning @@ -4,16 +4,16 @@ import dbus bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object('org.freedesktop.connman', "/"), - 'org.freedesktop.connman.Manager') +manager = dbus.Interface(bus.get_object('org.moblin.connman', "/"), + 'org.moblin.connman.Manager') interfaces = manager.ListInterfaces() for path in interfaces: print "[ %s ]" % (path) - interface = dbus.Interface(bus.get_object('org.freedesktop.connman', path), - 'org.freedesktop.connman.Interface') + interface = dbus.Interface(bus.get_object('org.moblin.connman', path), + 'org.moblin.connman.Interface') properties = interface.GetProperties() |