all: port everything to libnm

Since the API has not changed at this point, this is mostly just a
matter of updating Makefiles, and changing references to the library
name in comments.

NetworkManager cannot link to libnm due to the duplicated type/symbol
names. So it links to libnm-core.la directly, which means that
NetworkManager gets a separate copy of that code from libnm.so.
Everything else links to libnm.
This commit is contained in:
Dan Winship
2014-05-19 13:44:02 -04:00
parent c5daa4c4df
commit a7c4d53d03
62 changed files with 179 additions and 233 deletions

View File

@@ -20,13 +20,13 @@
#
# This example updates a connection's IPv4 method with the Update() method
# using the libnm-glib GObject-based convenience APIs.
# using the libnm GObject-based convenience APIs.
#
# Configuration settings are described at
# https://developer.gnome.org/NetworkManager/0.9/ref-settings.html
#
from gi.repository import GLib, NetworkManager, NMClient
from gi.repository import GLib, NM
import sys, struct, socket
def ip_to_int(ip_string):
@@ -51,17 +51,17 @@ def connections_read_cb(settings, data):
# add IPv4 setting if it doesn't yet exist
s_ip4 = c.get_setting_ip4_config()
if not s_ip4:
s_ip4 = NetworkManager.SettingIP4Config.new()
s_ip4 = NM.SettingIP4Config.new()
c.add_setting(s_ip4)
# set the method and change properties
s_ip4.set_property(NetworkManager.SETTING_IP4_CONFIG_METHOD, method)
s_ip4.set_property(NM.SETTING_IP4_CONFIG_METHOD, method)
if method == "auto":
# remove addresses
s_ip4.clear_addresses()
elif method == "manual":
# Add the static IP address, prefix, and (optional) gateway
addr = NetworkManager.IP4Address.new()
addr = NM.IP4Address.new()
addr.set_address(ip_to_int(sys.argv[3]))
addr.set_prefix(int(sys.argv[4]))
if len(sys.argv) == 6:
@@ -89,7 +89,7 @@ if __name__ == "__main__":
# create RemoteSettings object and attach to the "connections-read" signal
# to wait for connections to be loaded asynchronously
settings = NMClient.RemoteSettings.new(None)
settings = NM.RemoteSettings.new(None)
settings.connect('connections-read', connections_read_cb, (sys.argv[1], method, sys.argv))
main_loop.run()