Philipp Hörist pushed to branch master at gajim / gajim
Commits: 5e8c9fe5 by Jörg Sommer at 2017-05-02T10:15:23+02:00 network_watcher: Add support for systemd-networkd - - - - - 30d3f0c2 by Philipp Hörist at 2017-05-02T15:32:37+02:00 Merge branch 'new' into 'master' Add support for systemd's networkd See merge request !91 - - - - - 1 changed file: - src/network_watcher.py Changes: ===================================== src/network_watcher.py ===================================== --- a/src/network_watcher.py +++ b/src/network_watcher.py @@ -2,6 +2,7 @@ ## src/network_watcher.py ## ## Copyright (C) 2017 Philipp Hoerist <philipp AT hoerist.com> +## Copyright © 2017 Jörg Sommer <[email protected]> ## ## This file is part of Gajim. ## @@ -47,6 +48,11 @@ def signal_received(connection, sender_name, object_path, if interface_name == 'org.freedesktop.NetworkManager': # https://people.freedesktop.org/~lkundrak/nm-docs/nm-dbus-types.html connected = parameters[0] == 70 + elif interface_name == 'org.freedesktop.DBus.Properties' and len(parameters) >= 2 \ + and parameters[0] == 'org.freedesktop.network1.Manager' \ + and 'OperationalState' in parameters[1]: + connected = parameters[1]['OperationalState'] == 'routable' + if connected is not None: GLib.timeout_add_seconds( 2, update_connection_state, @@ -67,6 +73,16 @@ def appeared(connection, name, name_owner, *user_data): Gio.DBusSignalFlags.NONE, signal_received, None) + elif name == 'org.freedesktop.network1': + connection.signal_subscribe( + 'org.freedesktop.network1', + None, + 'PropertiesChanged', + '/org/freedesktop/network1', + None, + Gio.DBusSignalFlags.NONE, + signal_received, + None) def update_connection_state(connected): @@ -82,3 +98,4 @@ def update_connection_state(connected): watch_name('org.freedesktop.NetworkManager') +watch_name('org.freedesktop.network1') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2cd6634c0e2a41e60169362daa487a5c7d465c8f...30d3f0c2ba41dbc988165e164ac60dbea8060bd6
_______________________________________________ Commits mailing list [email protected] https://lists.gajim.org/cgi-bin/listinfo/commits
