diff options
| author | Daniel Gnoutcheff <daniel@gnoutcheff.name> | 2010-08-06 21:21:24 -0400 |
|---|---|---|
| committer | Daniel Gnoutcheff <daniel@gnoutcheff.name> | 2010-08-07 01:19:46 -0400 |
| commit | fb96309899a5ca853e206f52905df540719c7c5b (patch) | |
| tree | 78a1051cac64e1e507d03666d6a767c0a615d756 /examples/python | |
| parent | 8b1cac703cfd1e21d3e85cc9cd9ab0837ffd3d67 (diff) | |
| download | NetworkManager-fb96309899a5ca853e206f52905df540719c7c5b.tar.gz | |
DBus: merge NetworkManger{,SystemSettings}
Remove the org.freedesktop.NetworkManagerSystemSettings bus name and
have everybody talk to org.freedesktop.NetworkManager. Now that we have
a single settings service that's embedded in the main daemon, we don't
need separate names anymore.
Diffstat (limited to 'examples/python')
| -rwxr-xr-x | examples/python/add-system-connection.py | 2 | ||||
| -rw-r--r-- | examples/python/nm-state.py | 2 | ||||
| -rw-r--r-- | examples/python/vpn.py | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/examples/python/add-system-connection.py b/examples/python/add-system-connection.py index 39eaabee0d..447ffd8294 100755 --- a/examples/python/add-system-connection.py +++ b/examples/python/add-system-connection.py @@ -41,7 +41,7 @@ con = dbus.Dictionary({ bus = dbus.SystemBus() -proxy = bus.get_object("org.freedesktop.NetworkManagerSystemSettings", "/org/freedesktop/NetworkManagerSettings") +proxy = bus.get_object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManagerSettings") settings = dbus.Interface(proxy, "org.freedesktop.NetworkManagerSettings") settings.AddConnection(con) diff --git a/examples/python/nm-state.py b/examples/python/nm-state.py index 1ee4752814..179143c2f8 100644 --- a/examples/python/nm-state.py +++ b/examples/python/nm-state.py @@ -53,7 +53,7 @@ for a in active: # needed to connect to a specific network. Lets get those details so we # can find the user-readable name of the connection. con_path = prop_iface.Get("org.freedesktop.NetworkManager.ActiveConnection", "Connection") - service_proxy = bus.get_object("org.freedesktop.NetworkManagerSystemSettings", con_path) + service_proxy = bus.get_object("org.freedesktop.NetworkManager", con_path) con_iface = dbus.Interface(service_proxy, "org.freedesktop.NetworkManagerSettings.Connection") con_details = con_iface.GetSettings() con_name = con_details['connection']['id'] diff --git a/examples/python/vpn.py b/examples/python/vpn.py index 7e53f4bd9c..892d4bd559 100644 --- a/examples/python/vpn.py +++ b/examples/python/vpn.py @@ -37,7 +37,7 @@ DBusGMainLoop(set_as_default=True) def get_connections(): bus = dbus.SystemBus() - proxy = bus.get_object('org.freedesktop.NetworkManagerSystemSettings', '/org/freedesktop/NetworkManagerSettings') + proxy = bus.get_object('org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManagerSettings') iface = dbus.Interface(proxy, dbus_interface='org.freedesktop.NetworkManagerSettings') return iface.ListConnections() @@ -45,7 +45,7 @@ def get_connections(): def get_connection_by_uuid(uuid): bus = dbus.SystemBus() for c in get_connections(): - proxy = bus.get_object('org.freedesktop.NetworkManagerSystemSettings', c) + proxy = bus.get_object('org.freedesktop.NetworkManager', c) iface = dbus.Interface(proxy, dbus_interface='org.freedesktop.NetworkManagerSettings.Connection') settings = iface.GetSettings() if settings['connection']['uuid'] == uuid: @@ -57,7 +57,7 @@ def get_connection_by_uuid(uuid): def list_uuids(): bus = dbus.SystemBus() for c in get_connections(): - proxy = bus.get_object('org.freedesktop.NetworkManagerSystemSettings', c) + proxy = bus.get_object('org.freedesktop.NetworkManager', c) iface = dbus.Interface(proxy, dbus_interface='org.freedesktop.NetworkManagerSettings.Connection') settings = iface.GetSettings() conn = settings['connection'] @@ -76,7 +76,7 @@ def get_active_connection_path(uuid): iface = dbus.Interface(proxy, dbus_interface='org.freedesktop.DBus.Properties') path = iface.Get('org.freedesktop.NetworkManager.Connection.Active', 'Connection') - proxy = bus.get_object('org.freedesktop.NetworkManagerSystemSettings', path) + proxy = bus.get_object('org.freedesktop.NetworkManager', path) iface = dbus.Interface(proxy, dbus_interface='org.freedesktop.NetworkManagerSettings.Connection') settings = iface.GetSettings() @@ -112,7 +112,7 @@ def activate_connection(connection_path, device_path): bus = dbus.SystemBus() proxy = bus.get_object('org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManager') iface = dbus.Interface(proxy, dbus_interface='org.freedesktop.NetworkManager') - iface.ActivateConnection('org.freedesktop.NetworkManagerSystemSettings', + iface.ActivateConnection('org.freedesktop.NetworkManager', connection_path, device_path, "/", |