diff options
41 files changed, 122 insertions, 122 deletions
diff --git a/client/main.c b/client/main.c index 3d29c168..67194369 100644 --- a/client/main.c +++ b/client/main.c @@ -30,7 +30,7 @@ #include <dbus/dbus.h> -#define CONNMAN_SERVICE "org.moblin.connman" +#define CONNMAN_SERVICE "net.connman" #define CONNMAN_MANAGER_INTERFACE CONNMAN_SERVICE ".Manager" #define CONNMAN_MANAGER_PATH "/" diff --git a/doc/agent-api.txt b/doc/agent-api.txt index 1aa06b68..644b6783 100644 --- a/doc/agent-api.txt +++ b/doc/agent-api.txt @@ -2,7 +2,7 @@ Agent hierarchy =============== Service unique name -Interface org.moblin.connman.Agent +Interface net.connman.Agent Object path freely definable Methods void Release() diff --git a/doc/counter-api.txt b/doc/counter-api.txt index 5f286512..9ec5f21b 100644 --- a/doc/counter-api.txt +++ b/doc/counter-api.txt @@ -2,7 +2,7 @@ Counter hierarchy ================= Service unique name -Interface org.moblin.connman.Counter +Interface net.connman.Counter Object path freely definable Methods void Release() diff --git a/doc/manager-api.txt b/doc/manager-api.txt index d8f1f4e7..743ba188 100644 --- a/doc/manager-api.txt +++ b/doc/manager-api.txt @@ -1,8 +1,8 @@ Manager hierarchy ================= -Service org.moblin.connman -Interface org.moblin.connman.Manager +Service net.connman +Interface net.connman.Manager Object path / Methods dict GetProperties() diff --git a/doc/overview-api.txt b/doc/overview-api.txt index b83e89a1..926f9ebe 100644 --- a/doc/overview-api.txt +++ b/doc/overview-api.txt @@ -335,8 +335,8 @@ A simple way to retrieve all global properties looks like this: bus = dbus.SystemBus() - manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"), - "org.moblin.connman.Manager") + manager = dbus.Interface(bus.get_object("net.connman", "/"), + "net.connman.Manager") properties = manager.GetProperties() @@ -366,8 +366,8 @@ are the exact details users should care about. properties = manager.GetProperties() for path in properties["Services"]: - service = dbus.Interface(bus.get_object("org.moblin.connman", path), - "org.moblin.connman.Service") + service = dbus.Interface(bus.get_object("net.connman", path), + "net.connman.Service") service_properties = service.GetProperties() diff --git a/doc/profile-api.txt b/doc/profile-api.txt index b30f4187..eba56255 100644 --- a/doc/profile-api.txt +++ b/doc/profile-api.txt @@ -1,8 +1,8 @@ Profile hierarchy ================= -Service org.moblin.connman -Interface org.moblin.connman.Profile +Service net.connman +Interface net.connman.Profile Object path [variable prefix]/{profile0,profile1,...} Methods dict GetProperties() diff --git a/doc/service-api.txt b/doc/service-api.txt index d774507c..d3097364 100644 --- a/doc/service-api.txt +++ b/doc/service-api.txt @@ -1,8 +1,8 @@ Service hierarchy ================= -Service org.moblin.connman -Interface org.moblin.connman.Service +Service net.connman +Interface net.connman.Service Object path [variable prefix]/{service0,service1,...} Methods dict GetProperties() diff --git a/doc/technology-api.txt b/doc/technology-api.txt index 0c8789d3..497c988c 100644 --- a/doc/technology-api.txt +++ b/doc/technology-api.txt @@ -1,8 +1,8 @@ Technology hierarchy ==================== -Service org.moblin.connman -Interface org.moblin.connman.Technology +Service net.connman +Interface net.connman.Technology Object path [variable prefix]/{technology0,technology1,...} Methods dict GetProperties() diff --git a/include/dbus.h b/include/dbus.h index c321690f..9be76b2f 100644 --- a/include/dbus.h +++ b/include/dbus.h @@ -28,8 +28,8 @@ extern "C" { #endif -#define CONNMAN_SERVICE "org.moblin.connman" -#define CONNMAN_PATH "/org/moblin/connman" +#define CONNMAN_SERVICE "net.connman" +#define CONNMAN_PATH "/net/connman" #define CONNMAN_DEBUG_INTERFACE CONNMAN_SERVICE ".Debug" #define CONNMAN_ERROR_INTERFACE CONNMAN_SERVICE ".Error" diff --git a/plugins/dhclient.c b/plugins/dhclient.c index e63e1dc2..7e74a930 100644 --- a/plugins/dhclient.c +++ b/plugins/dhclient.c @@ -148,13 +148,13 @@ static void dhclient_died(struct connman_task *task, void *user_data) static void dhclient_setup(struct connman_task *task, const char *ifname) { - const char *path, *intf = "org.moblin.connman.Task"; + const char *path, *intf = "net.connman.Task"; path = connman_task_get_path(task); connman_task_add_argument(task, "-d", NULL); connman_task_add_argument(task, "-q", NULL); - connman_task_add_argument(task, "-e", "BUSNAME=org.moblin.connman"); + connman_task_add_argument(task, "-e", "BUSNAME=net.connman"); connman_task_add_argument(task, "-e", "BUSINTF=%s", intf); connman_task_add_argument(task, "-e", "BUSPATH=%s", path); connman_task_add_argument(task, "-pf", "%s/dhclient.%s.pid", diff --git a/plugins/polkit.c b/plugins/polkit.c index 137dc9b1..0b232d9d 100644 --- a/plugins/polkit.c +++ b/plugins/polkit.c @@ -30,10 +30,10 @@ #include <connman/dbus.h> static const GDBusSecurityTable polkit_security[] = { - { CONNMAN_PRIVILEGE_MODIFY, "org.moblin.connman.modify", + { CONNMAN_PRIVILEGE_MODIFY, "net.connman.modify", G_DBUS_SECURITY_FLAG_BUILTIN | G_DBUS_SECURITY_FLAG_ALLOW_INTERACTION }, - { CONNMAN_PRIVILEGE_SECRET, "org.moblin.connman.secret", + { CONNMAN_PRIVILEGE_SECRET, "net.connman.secret", G_DBUS_SECURITY_FLAG_BUILTIN | G_DBUS_SECURITY_FLAG_ALLOW_INTERACTION }, { } diff --git a/plugins/polkit.policy b/plugins/polkit.policy index 79d5c738..0c2629a3 100644 --- a/plugins/polkit.policy +++ b/plugins/polkit.policy @@ -8,7 +8,7 @@ <vendor>Connection Manager</vendor> <icon_name>network-wireless</icon_name> - <action id="org.moblin.connman.modify"> + <action id="net.connman.modify"> <description>Settings configuration</description> <message>Policy prevents modification of settings</message> <defaults> @@ -17,7 +17,7 @@ </defaults> </action> - <action id="org.moblin.connman.secret"> + <action id="net.connman.secret"> <description>Secrets configuration</description> <message>Policy prevents modification of secrets</message> <defaults> diff --git a/src/connman-dbus.conf b/src/connman-dbus.conf index 3b130d99..311f28c7 100644 --- a/src/connman-dbus.conf +++ b/src/connman-dbus.conf @@ -2,15 +2,15 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <busconfig> <policy user="root"> - <allow own="org.moblin.connman"/> - <allow send_destination="org.moblin.connman"/> - <allow send_interface="org.moblin.connman.Agent"/> - <allow send_interface="org.moblin.connman.Counter"/> + <allow own="net.connman"/> + <allow send_destination="net.connman"/> + <allow send_interface="net.connman.Agent"/> + <allow send_interface="net.connman.Counter"/> </policy> <policy at_console="true"> - <allow send_destination="org.moblin.connman"/> + <allow send_destination="net.connman"/> </policy> <policy context="default"> - <deny send_destination="org.moblin.connman"/> + <deny send_destination="net.connman"/> </policy> </busconfig> diff --git a/src/connman-polkit.conf b/src/connman-polkit.conf index 9e44b8b5..fdddb29f 100644 --- a/src/connman-polkit.conf +++ b/src/connman-polkit.conf @@ -2,10 +2,10 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <busconfig> <policy user="root"> - <allow own="org.moblin.connman"/> - <allow send_interface="org.moblin.connman.Agent"/> + <allow own="net.connman"/> + <allow send_interface="net.connman.Agent"/> </policy> <policy context="default"> - <allow send_destination="org.moblin.connman"/> + <allow send_destination="net.connman"/> </policy> </busconfig> diff --git a/src/connman.service.in b/src/connman.service.in index d600e409..a234a0cd 100644 --- a/src/connman.service.in +++ b/src/connman.service.in @@ -4,7 +4,7 @@ After=syslog.target [Service] Type=dbus -BusName=org.moblin.connman +BusName=net.connman ExecStart=@prefix@/sbin/connmand -n [Install] diff --git a/test/connect-service b/test/connect-service index 8dabdbad..2d88cb59 100755 --- a/test/connect-service +++ b/test/connect-service @@ -9,8 +9,8 @@ if (len(sys.argv) < 2): bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"), - "org.moblin.connman.Manager") +manager = dbus.Interface(bus.get_object("net.connman", "/"), + "net.connman.Manager") print "Attempting to connect service %s" % (sys.argv[1]) diff --git a/test/connect-vpn b/test/connect-vpn index 7722ee93..a43c4cdb 100755 --- a/test/connect-vpn +++ b/test/connect-vpn @@ -13,8 +13,8 @@ if (len(sys.argv) < 4): bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"), - "org.moblin.connman.Manager") +manager = dbus.Interface(bus.get_object("net.connman", "/"), + "net.connman.Manager") print "Attempting to connect service %s" % (sys.argv[3]) diff --git a/test/disable-tethering b/test/disable-tethering index 57c5575d..01cc96ca 100755 --- a/test/disable-tethering +++ b/test/disable-tethering @@ -4,7 +4,7 @@ import dbus bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object('org.moblin.connman', "/"), - 'org.moblin.connman.Manager') +manager = dbus.Interface(bus.get_object('net.connman', "/"), + 'net.connman.Manager') manager.SetProperty("Tethering", dbus.Boolean(0)); diff --git a/test/disconnect-vpn b/test/disconnect-vpn index 21b50d8e..9a6620c4 100755 --- a/test/disconnect-vpn +++ b/test/disconnect-vpn @@ -9,8 +9,8 @@ if (len(sys.argv) < 2): bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"), - "org.moblin.connman.Manager") +manager = dbus.Interface(bus.get_object("net.connman", "/"), + "net.connman.Manager") path = "" + sys.argv[1] diff --git a/test/enable-tethering b/test/enable-tethering index 49c4a4d0..51a9cca7 100755 --- a/test/enable-tethering +++ b/test/enable-tethering @@ -4,7 +4,7 @@ import dbus bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object('org.moblin.connman', "/"), - 'org.moblin.connman.Manager') +manager = dbus.Interface(bus.get_object('net.connman', "/"), + 'net.connman.Manager') manager.SetProperty("Tethering", dbus.Boolean(1)); diff --git a/test/find-service b/test/find-service index e9aad177..c53e6eb0 100755 --- a/test/find-service +++ b/test/find-service @@ -9,8 +9,8 @@ if (len(sys.argv) < 2): bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object('org.moblin.connman', '/'), - 'org.moblin.connman.Manager') +manager = dbus.Interface(bus.get_object('net.connman', '/'), + 'net.connman.Manager') path = manager.LookupService(sys.argv[1]) diff --git a/test/get-proxy-autoconfig b/test/get-proxy-autoconfig index a93605ab..6709a9e8 100755 --- a/test/get-proxy-autoconfig +++ b/test/get-proxy-autoconfig @@ -11,8 +11,8 @@ def get_pac(url): bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object('org.moblin.connman', '/'), - 'org.moblin.connman.Manager') +manager = dbus.Interface(bus.get_object('net.connman', '/'), + 'net.connman.Manager') services = manager.GetServices() diff --git a/test/get-services b/test/get-services index 3fec3940..29d4ea07 100755 --- a/test/get-services +++ b/test/get-services @@ -22,8 +22,8 @@ def extract_list(list): bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object('org.moblin.connman', '/'), - 'org.moblin.connman.Manager') +manager = dbus.Interface(bus.get_object('net.connman', '/'), + 'net.connman.Manager') services = manager.GetServices() diff --git a/test/get-state b/test/get-state index 38c1dc94..75d5a16a 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.moblin.connman', "/"), - 'org.moblin.connman.Manager') +manager = dbus.Interface(bus.get_object('net.connman', "/"), + 'net.connman.Manager') properties = manager.GetProperties() diff --git a/test/list-profiles b/test/list-profiles index 710a36c2..b9b9103a 100755 --- a/test/list-profiles +++ b/test/list-profiles @@ -4,8 +4,8 @@ import dbus bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"), - "org.moblin.connman.Manager") +manager = dbus.Interface(bus.get_object("net.connman", "/"), + "net.connman.Manager") properties = manager.GetProperties() @@ -17,8 +17,8 @@ for path in properties["Profiles"]: else: print "[ %s ]" % (path) - profile = dbus.Interface(bus.get_object("org.moblin.connman", path), - "org.moblin.connman.Profile") + profile = dbus.Interface(bus.get_object("net.connman", path), + "net.connman.Profile") properties = profile.GetProperties() for key in properties.keys(): diff --git a/test/list-services b/test/list-services index c4ae5d75..66dfe5cb 100755 --- a/test/list-services +++ b/test/list-services @@ -25,14 +25,14 @@ def extract_list(list): bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"), - "org.moblin.connman.Manager") +manager = dbus.Interface(bus.get_object("net.connman", "/"), + "net.connman.Manager") properties = manager.GetProperties() for path in properties["Services"]: - service = dbus.Interface(bus.get_object("org.moblin.connman", path), - "org.moblin.connman.Service") + service = dbus.Interface(bus.get_object("net.connman", path), + "net.connman.Service") properties = service.GetProperties() diff --git a/test/monitor-connman b/test/monitor-connman index 886373ac..9e2a8301 100755 --- a/test/monitor-connman +++ b/test/monitor-connman @@ -19,7 +19,7 @@ if __name__ == '__main__': bus = dbus.SystemBus() bus.add_signal_receiver(property_changed, - bus_name="org.moblin.connman", + bus_name="net.connman", signal_name = "PropertyChanged", path_keyword="path", interface_keyword="interface") diff --git a/test/monitor-manager b/test/monitor-manager index ebb53f72..05e1efd2 100755 --- a/test/monitor-manager +++ b/test/monitor-manager @@ -30,8 +30,8 @@ if __name__ == '__main__': bus = dbus.SystemBus() bus.add_signal_receiver(property_changed, - bus_name="org.moblin.connman", - dbus_interface="org.moblin.connman.Manager", + bus_name="net.connman", + dbus_interface="net.connman.Manager", signal_name = "PropertyChanged") mainloop = gobject.MainLoop() diff --git a/test/monitor-services b/test/monitor-services index 2f81c710..e4fe3284 100755 --- a/test/monitor-services +++ b/test/monitor-services @@ -49,8 +49,8 @@ if __name__ == '__main__': bus = dbus.SystemBus() bus.add_signal_receiver(property_changed, - bus_name="org.moblin.connman", - dbus_interface="org.moblin.connman.Service", + bus_name="net.connman", + dbus_interface="net.connman.Service", signal_name = "PropertyChanged", path_keyword="path") diff --git a/test/set-address b/test/set-address index 4933c601..92016784 100755 --- a/test/set-address +++ b/test/set-address @@ -9,14 +9,14 @@ if (len(sys.argv) < 3): bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object('org.moblin.connman', "/"), - 'org.moblin.connman.Manager') +manager = dbus.Interface(bus.get_object('net.connman', "/"), + 'net.connman.Manager') properties = manager.GetProperties() for path in properties["Services"]: - service = dbus.Interface(bus.get_object('org.moblin.connman', path), - 'org.moblin.connman.Service') + service = dbus.Interface(bus.get_object('net.connman', path), + 'net.connman.Service') properties = service.GetProperties() diff --git a/test/set-domains b/test/set-domains index c45034c8..3b5722cf 100755 --- a/test/set-domains +++ b/test/set-domains @@ -9,8 +9,8 @@ if (len(sys.argv) < 2): bus = dbus.SystemBus() path = "/profile/default/" + sys.argv[1] -service = dbus.Interface(bus.get_object('org.moblin.connman', path), - 'org.moblin.connman.Service') +service = dbus.Interface(bus.get_object('net.connman', path), + 'net.connman.Service') properties = service.GetProperties() diff --git a/test/set-ip-method b/test/set-ip-method index 9f202f75..576c8036 100755 --- a/test/set-ip-method +++ b/test/set-ip-method @@ -13,8 +13,8 @@ if (len(sys.argv) < 3): bus = dbus.SystemBus() path = "/profile/default/" + sys.argv[1] -service = dbus.Interface(bus.get_object('org.moblin.connman', path), - 'org.moblin.connman.Service') +service = dbus.Interface(bus.get_object('net.connman', path), + 'net.connman.Service') properties = service.GetProperties() diff --git a/test/set-nameservers b/test/set-nameservers index 9e513a5b..98930bd7 100755 --- a/test/set-nameservers +++ b/test/set-nameservers @@ -9,8 +9,8 @@ if (len(sys.argv) < 2): bus = dbus.SystemBus() path = "/profile/default/" + sys.argv[1] -service = dbus.Interface(bus.get_object('org.moblin.connman', path), - 'org.moblin.connman.Service') +service = dbus.Interface(bus.get_object('net.connman', path), + 'net.connman.Service') properties = service.GetProperties() diff --git a/test/set-proxy b/test/set-proxy index 6b39cb42..e8043db1 100755 --- a/test/set-proxy +++ b/test/set-proxy @@ -14,8 +14,8 @@ if (len(sys.argv) < 2): bus = dbus.SystemBus() path = "/profile/default/" + sys.argv[1] -service = dbus.Interface(bus.get_object('org.moblin.connman', path), - 'org.moblin.connman.Service') +service = dbus.Interface(bus.get_object('net.connman', path), + 'net.connman.Service') values = { "Method" : sys.argv[2] } diff --git a/test/show-introspection b/test/show-introspection index e64dd273..20e8a50c 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.moblin.connman", '/'), +object = dbus.Interface(bus.get_object("net.connman", '/'), "org.freedesktop.DBus.Introspectable") print object.Introspect() -manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"), - "org.moblin.connman.Manager") +manager = dbus.Interface(bus.get_object("net.connman", "/"), + "net.connman.Manager") properties = manager.GetProperties() for path in properties["Technologies"]: - object = dbus.Interface(bus.get_object("org.moblin.connman", path), + object = dbus.Interface(bus.get_object("net.connman", path), "org.freedesktop.DBus.Introspectable") print object.Introspect() diff --git a/test/simple-agent b/test/simple-agent index 7e1ce8b4..54e857a4 100755 --- a/test/simple-agent +++ b/test/simple-agent @@ -8,18 +8,18 @@ import dbus.mainloop.glib import sys class Canceled(dbus.DBusException): - _dbus_error_name = "org.moblin.connman.Error.Canceled" + _dbus_error_name = "net.connman.Error.Canceled" class Agent(dbus.service.Object): passphrase = "" - @dbus.service.method("org.moblin.connman.Agent", + @dbus.service.method("net.connman.Agent", in_signature='', out_signature='') def Release(self): print("Release") mainloop.quit() - @dbus.service.method("org.moblin.connman.Agent", + @dbus.service.method("net.connman.Agent", in_signature='oa{sv}', out_signature='a{sv}') def RequestInput(self, path, fields): @@ -32,7 +32,7 @@ class Agent(dbus.service.Object): return response - @dbus.service.method("org.moblin.connman.Agent", + @dbus.service.method("net.connman.Agent", in_signature='', out_signature='') def Cancel(self): print "Cancel" @@ -47,8 +47,8 @@ if __name__ == '__main__': dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) bus = dbus.SystemBus() - manager = dbus.Interface(bus.get_object('org.moblin.connman', "/"), - 'org.moblin.connman.Manager') + manager = dbus.Interface(bus.get_object('net.connman', "/"), + 'net.connman.Manager') path = "/test/agent" object = Agent(bus, path) diff --git a/test/test-connman b/test/test-connman index 4336e2da..c0a462db 100755 --- a/test/test-connman +++ b/test/test-connman @@ -5,8 +5,8 @@ import dbus bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"), - "org.moblin.connman.Manager") +manager = dbus.Interface(bus.get_object("net.connman", "/"), + "net.connman.Manager") if len(sys.argv) < 2: print "Usage: %s <command>" % (sys.argv[0]) @@ -28,8 +28,8 @@ if len(sys.argv) < 2: def print_services(services): for path in services: - service = dbus.Interface(bus.get_object("org.moblin.connman", path), - "org.moblin.connman.Service") + service = dbus.Interface(bus.get_object("net.connman", path), + "net.connman.Service") properties = service.GetProperties() @@ -64,8 +64,8 @@ elif sys.argv[1] in ["apn"]: path = "/profile/default/" + sys.argv[2] - service = dbus.Interface(bus.get_object("org.moblin.connman", path), - "org.moblin.connman.Service") + service = dbus.Interface(bus.get_object("net.connman", path), + "net.connman.Service") if (len(sys.argv) > 3): apn = sys.argv[3] @@ -95,8 +95,8 @@ elif sys.argv[1] in ["passphrase", "pass"]: path = "/profile/default/" + sys.argv[2] - service = dbus.Interface(bus.get_object("org.moblin.connman", path), - "org.moblin.connman.Service") + service = dbus.Interface(bus.get_object("net.connman", path), + "net.connman.Service") if (len(sys.argv) > 3): passphrase = sys.argv[3] @@ -126,8 +126,8 @@ elif sys.argv[1] in ["autoconnect", "autoconn"]: path = "/profile/default/" + sys.argv[2] - service = dbus.Interface(bus.get_object("org.moblin.connman", path), - "org.moblin.connman.Service") + service = dbus.Interface(bus.get_object("net.connman", path), + "net.connman.Service") if (len(sys.argv) > 3): flag = sys.argv[3].strip().lower() @@ -158,8 +158,8 @@ elif sys.argv[1] in ["connect", "conn"]: path = "/profile/default/" + sys.argv[2] - service = dbus.Interface(bus.get_object("org.moblin.connman", path), - "org.moblin.connman.Service") + service = dbus.Interface(bus.get_object("net.connman", path), + "net.connman.Service") try: service.Connect(timeout=60000) @@ -173,8 +173,8 @@ elif sys.argv[1] in ["disconnect", "disc"]: path = "/profile/default/" + sys.argv[2] - service = dbus.Interface(bus.get_object("org.moblin.connman", path), - "org.moblin.connman.Service") + service = dbus.Interface(bus.get_object("net.connman", path), + "net.connman.Service") try: service.Disconnect() @@ -188,8 +188,8 @@ elif sys.argv[1] in ["remove"]: path = "/profile/default/" + sys.argv[2] - service = dbus.Interface(bus.get_object("org.moblin.connman", path), - "org.moblin.connman.Service") + service = dbus.Interface(bus.get_object("net.connman", path), + "net.connman.Service") properties = service.GetProperties() diff --git a/test/test-counter b/test/test-counter index c05449a9..ce835802 100755 --- a/test/test-counter +++ b/test/test-counter @@ -39,13 +39,13 @@ def print_stats(stats): print str class Counter(dbus.service.Object): - @dbus.service.method("org.moblin.connman.Counter", + @dbus.service.method("net.connman.Counter", in_signature='', out_signature='') def Release(self): print("Release") mainloop.quit() - @dbus.service.method("org.moblin.connman.Counter", + @dbus.service.method("net.connman.Counter", in_signature='oa{sv}a{sv}', out_signature='') def Usage(self, path, home, roaming): print "%s" % (path) @@ -61,8 +61,8 @@ if __name__ == '__main__': dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) bus = dbus.SystemBus() - manager = dbus.Interface(bus.get_object('org.moblin.connman', "/"), - 'org.moblin.connman.Manager') + manager = dbus.Interface(bus.get_object('net.connman', "/"), + 'net.connman.Manager') period = 2 if len(sys.argv) > 1: diff --git a/test/test-manager b/test/test-manager index 6c694a09..b5642d0f 100755 --- a/test/test-manager +++ b/test/test-manager @@ -25,25 +25,25 @@ def extract_list(list): bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"), - "org.moblin.connman.Manager") +manager = dbus.Interface(bus.get_object("net.connman", "/"), + "net.connman.Manager") properties = manager.GetProperties() def print_properties(key, value): if key == "Profiles": - interface = "org.moblin.connman.Profile" + interface = "net.connman.Profile" elif key == "Services": - interface = "org.moblin.connman.Service" + interface = "net.connman.Service" elif key == "Technologies": - interface = "org.moblin.connman.Technology" + interface = "net.connman.Technology" else: return print "%s" % (key) for path in value: print " %s" % (path) - obj = dbus.Interface(bus.get_object("org.moblin.connman", path), + obj = dbus.Interface(bus.get_object("net.connman", path), interface) properties = obj.GetProperties() diff --git a/test/test-profile b/test/test-profile index 8f659551..f3af911a 100755 --- a/test/test-profile +++ b/test/test-profile @@ -5,8 +5,8 @@ import dbus bus = dbus.SystemBus() -manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"), - "org.moblin.connman.Manager") +manager = dbus.Interface(bus.get_object("net.connman", "/"), + "net.connman.Manager") if len(sys.argv) < 2: print "Usage: %s <command>" % (sys.argv[0]) @@ -20,8 +20,8 @@ if len(sys.argv) < 2: def print_profiles(profiles, active): for path in profiles: - profile = dbus.Interface(bus.get_object("org.moblin.connman", path), - "org.moblin.connman.Profile") + profile = dbus.Interface(bus.get_object("net.connman", path), + "net.connman.Profile") properties = profile.GetProperties() @@ -51,8 +51,8 @@ elif sys.argv[1] in ["name"]: path = "/profile/" + sys.argv[2] - profile = dbus.Interface(bus.get_object("org.moblin.connman", path), - "org.moblin.connman.Profile") + profile = dbus.Interface(bus.get_object("net.connman", path), + "net.connman.Profile") if (len(sys.argv) > 3): name = sys.argv[3] @@ -79,8 +79,8 @@ elif sys.argv[1] in ["create", "add"]: print "New profile created at %s" % (path) - profile = dbus.Interface(bus.get_object("org.moblin.connman", path), - "org.moblin.connman.Profile") + profile = dbus.Interface(bus.get_object("net.connman", path), + "net.connman.Profile") if (len(sys.argv) > 3): name = sys.argv[3] diff --git a/tools/dhclient-test.c b/tools/dhclient-test.c index dc99f28d..ca969195 100644 --- a/tools/dhclient-test.c +++ b/tools/dhclient-test.c @@ -96,7 +96,7 @@ static void start_dhclient(DBusConnection *conn, const char *ifname) const char *busname; busname = dbus_bus_get_unique_name(conn); - busname = "org.moblin.connman"; + busname = "net.connman"; argv = g_ptr_array_new(); add_argument(argv, DHCLIENT, NULL); @@ -215,7 +215,7 @@ int main(int argc, char *argv[]) dbus_error_init(&err); - conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, "org.moblin.connman", &err); + conn = g_dbus_setup_bus(DBUS_BUS_SYSTEM, "net.connman", &err); if (conn == NULL) { if (dbus_error_is_set(&err) == TRUE) { fprintf(stderr, "%s\n", err.message); |