Imported Upstream version 1.1.90 upstream/1.1.90

21 files changed, 229 insertions, 128 deletions

diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index 3cf08733..735921d3 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -17,6 +17,8 @@ nodist_libnmdbus_la_SOURCES = \
 	nmdbus-active-connection.h \
 	nmdbus-agent-manager.c \
 	nmdbus-agent-manager.h \
+	nmdbus-device-adsl.c \
+	nmdbus-device-adsl.h \
 	nmdbus-device-bond.c \
 	nmdbus-device-bond.h \
 	nmdbus-device-bridge.c \
@@ -29,12 +31,18 @@ nodist_libnmdbus_la_SOURCES = \
 	nmdbus-device.h \
 	nmdbus-device-generic.c \
 	nmdbus-device-generic.h \
-	nmdbus-device-gre.c \
-	nmdbus-device-gre.h \
 	nmdbus-device-infiniband.c \
 	nmdbus-device-infiniband.h \
+	nmdbus-device-ip-tunnel.c \
+	nmdbus-device-ip-tunnel.h \
 	nmdbus-device-macvlan.c \
 	nmdbus-device-macvlan.h \
+	nmdbus-device-modem.c \
+	nmdbus-device-modem.h \
+	nmdbus-device-olpc-mesh.c \
+	nmdbus-device-olpc-mesh.h \
+	nmdbus-device-team.c \
+	nmdbus-device-team.h \
 	nmdbus-device-tun.c \
 	nmdbus-device-tun.h \
 	nmdbus-device-veth.c \
@@ -100,8 +108,8 @@ EXTRA_DIST = \
 	nm-device-bt.xml \
 	nm-device-ethernet.xml \
 	nm-device-generic.xml \
-	nm-device-gre.xml \
 	nm-device-infiniband.xml \
+	nm-device-ip-tunnel.xml \
 	nm-device-macvlan.xml \
 	nm-device-modem.xml \
 	nm-device-olpc-mesh.xml \
diff --git a/introspection/Makefile.in b/introspection/Makefile.in
index 53c6447c..ac18d9ae 100644
--- a/introspection/Makefile.in
+++ b/introspection/Makefile.in
@@ -114,18 +114,21 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
 libnmdbus_la_LIBADD =
 nodist_libnmdbus_la_OBJECTS = nmdbus-access-point.lo \
 	nmdbus-active-connection.lo nmdbus-agent-manager.lo \
-	nmdbus-device-bond.lo nmdbus-device-bridge.lo \
-	nmdbus-device-bt.lo nmdbus-device-ethernet.lo nmdbus-device.lo \
-	nmdbus-device-generic.lo nmdbus-device-gre.lo \
-	nmdbus-device-infiniband.lo nmdbus-device-macvlan.lo \
-	nmdbus-device-tun.lo nmdbus-device-veth.lo \
-	nmdbus-device-vlan.lo nmdbus-device-vxlan.lo \
-	nmdbus-device-wifi.lo nmdbus-device-wimax.lo \
-	nmdbus-dhcp4-config.lo nmdbus-dhcp6-config.lo \
-	nmdbus-ip4-config.lo nmdbus-ip6-config.lo nmdbus-manager.lo \
-	nmdbus-ppp-manager.lo nmdbus-secret-agent.lo \
-	nmdbus-settings-connection.lo nmdbus-settings.lo \
-	nmdbus-vpn-connection.lo nmdbus-vpn-plugin.lo
+	nmdbus-device-adsl.lo nmdbus-device-bond.lo \
+	nmdbus-device-bridge.lo nmdbus-device-bt.lo \
+	nmdbus-device-ethernet.lo nmdbus-device.lo \
+	nmdbus-device-generic.lo nmdbus-device-infiniband.lo \
+	nmdbus-device-ip-tunnel.lo nmdbus-device-macvlan.lo \
+	nmdbus-device-modem.lo nmdbus-device-olpc-mesh.lo \
+	nmdbus-device-team.lo nmdbus-device-tun.lo \
+	nmdbus-device-veth.lo nmdbus-device-vlan.lo \
+	nmdbus-device-vxlan.lo nmdbus-device-wifi.lo \
+	nmdbus-device-wimax.lo nmdbus-dhcp4-config.lo \
+	nmdbus-dhcp6-config.lo nmdbus-ip4-config.lo \
+	nmdbus-ip6-config.lo nmdbus-manager.lo nmdbus-ppp-manager.lo \
+	nmdbus-secret-agent.lo nmdbus-settings-connection.lo \
+	nmdbus-settings.lo nmdbus-vpn-connection.lo \
+	nmdbus-vpn-plugin.lo
 libnmdbus_la_OBJECTS = $(nodist_libnmdbus_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -209,7 +212,6 @@ BLUEZ5_LIBS = @BLUEZ5_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CKDB_PATH = @CKDB_PATH@
 CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
 CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
 CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
@@ -221,8 +223,6 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DBUS_CFLAGS = @DBUS_CFLAGS@
-DBUS_GLIB_100_CFLAGS = @DBUS_GLIB_100_CFLAGS@
-DBUS_GLIB_100_LIBS = @DBUS_GLIB_100_LIBS@
 DBUS_LIBS = @DBUS_LIBS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEFS = @DEFS@
@@ -232,6 +232,7 @@ DHCPCD_PATH = @DHCPCD_PATH@
 DISTRO_NETWORK_SERVICE = @DISTRO_NETWORK_SERVICE@
 DLLTOOL = @DLLTOOL@
 DNSMASQ_PATH = @DNSMASQ_PATH@
+DNSSEC_TRIGGER_SCRIPT = @DNSSEC_TRIGGER_SCRIPT@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -286,16 +287,13 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
 INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
 INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
 IPTABLES_PATH = @IPTABLES_PATH@
-IWMX_SDK_CFLAGS = @IWMX_SDK_CFLAGS@
-IWMX_SDK_LIBS = @IWMX_SDK_LIBS@
 KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@
 LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBAUDIT_CFLAGS = @LIBAUDIT_CFLAGS@
+LIBAUDIT_LIBS = @LIBAUDIT_LIBS@
 LIBDL = @LIBDL@
-LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
-LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
-LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
 LIBM = @LIBM@
@@ -332,6 +330,8 @@ NEWT_LIBS = @NEWT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@
+NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT = @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@
+NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT = @NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@
 NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
 NM_MICRO_VERSION = @NM_MICRO_VERSION@
 NM_MINOR_VERSION = @NM_MINOR_VERSION@
@@ -360,7 +360,6 @@ POLKIT_LIBS = @POLKIT_LIBS@
 POSUB = @POSUB@
 PPPD_PATH = @PPPD_PATH@
 PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
-PPPOE_PATH = @PPPOE_PATH@
 QT_CFLAGS = @QT_CFLAGS@
 QT_LIBS = @QT_LIBS@
 RANLIB = @RANLIB@
@@ -375,6 +374,8 @@ SYSTEMD_200_CFLAGS = @SYSTEMD_200_CFLAGS@
 SYSTEMD_200_LIBS = @SYSTEMD_200_LIBS@
 SYSTEMD_INHIBIT_CFLAGS = @SYSTEMD_INHIBIT_CFLAGS@
 SYSTEMD_INHIBIT_LIBS = @SYSTEMD_INHIBIT_LIBS@
+SYSTEMD_JOURNAL_CFLAGS = @SYSTEMD_JOURNAL_CFLAGS@
+SYSTEMD_JOURNAL_LIBS = @SYSTEMD_JOURNAL_LIBS@
 SYSTEMD_LOGIN_CFLAGS = @SYSTEMD_LOGIN_CFLAGS@
 SYSTEMD_LOGIN_LIBS = @SYSTEMD_LOGIN_LIBS@
 SYSTEM_CA_PATH = @SYSTEM_CA_PATH@
@@ -435,6 +436,7 @@ mkdir_p = @mkdir_p@
 nmbinary = @nmbinary@
 nmconfdir = @nmconfdir@
 nmdatadir = @nmdatadir@
+nmlibdir = @nmlibdir@
 nmrundir = @nmrundir@
 nmstatedir = @nmstatedir@
 oldincludedir = @oldincludedir@
@@ -442,6 +444,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -476,6 +479,8 @@ nodist_libnmdbus_la_SOURCES = \
 	nmdbus-active-connection.h \
 	nmdbus-agent-manager.c \
 	nmdbus-agent-manager.h \
+	nmdbus-device-adsl.c \
+	nmdbus-device-adsl.h \
 	nmdbus-device-bond.c \
 	nmdbus-device-bond.h \
 	nmdbus-device-bridge.c \
@@ -488,12 +493,18 @@ nodist_libnmdbus_la_SOURCES = \
 	nmdbus-device.h \
 	nmdbus-device-generic.c \
 	nmdbus-device-generic.h \
-	nmdbus-device-gre.c \
-	nmdbus-device-gre.h \
 	nmdbus-device-infiniband.c \
 	nmdbus-device-infiniband.h \
+	nmdbus-device-ip-tunnel.c \
+	nmdbus-device-ip-tunnel.h \
 	nmdbus-device-macvlan.c \
 	nmdbus-device-macvlan.h \
+	nmdbus-device-modem.c \
+	nmdbus-device-modem.h \
+	nmdbus-device-olpc-mesh.c \
+	nmdbus-device-olpc-mesh.h \
+	nmdbus-device-team.c \
+	nmdbus-device-team.h \
 	nmdbus-device-tun.c \
 	nmdbus-device-tun.h \
 	nmdbus-device-veth.c \
@@ -544,8 +555,8 @@ EXTRA_DIST = \
 	nm-device-bt.xml \
 	nm-device-ethernet.xml \
 	nm-device-generic.xml \
-	nm-device-gre.xml \
 	nm-device-infiniband.xml \
+	nm-device-ip-tunnel.xml \
 	nm-device-macvlan.xml \
 	nm-device-modem.xml \
 	nm-device-olpc-mesh.xml \
@@ -629,14 +640,18 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-access-point.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-active-connection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-agent-manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-adsl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-bond.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-bridge.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-bt.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-ethernet.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-generic.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-gre.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-infiniband.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-ip-tunnel.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-macvlan.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-modem.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-olpc-mesh.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-team.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-tun.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-veth.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nmdbus-device-vlan.Plo@am__quote@
diff --git a/introspection/nm-access-point.xml b/introspection/nm-access-point.xml
index ef5af6ab..16eae044 100644
--- a/introspection/nm-access-point.xml
+++ b/introspection/nm-access-point.xml
@@ -12,6 +12,10 @@
       <tp:docstring>Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.</tp:docstring>
     </property>
     <property name="Ssid" type="ay" access="read">
+      <!-- gdbus-codegen assumes that "ay" means "non-UTF-8 string" and
+           won't deal with '\0' bytes correctly.
+      -->
+      <annotation name="org.gtk.GDBus.C.ForceGVariant" value="1"/>
       <tp:docstring>The Service Set Identifier identifying the access point.</tp:docstring>
     </property>
     <property name="Frequency" type="u" access="read">
diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml
index cbecdfce..4d5d15a1 100644
--- a/introspection/nm-active-connection.xml
+++ b/introspection/nm-active-connection.xml
@@ -2,6 +2,7 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.Connection.Active">
+    <annotation name="org.gtk.GDBus.C.Name" value="ActiveConnection"/>
     <tp:docstring>
       Objects that implement the Connection.Active interface represent an attempt
       to connect to a network using the details provided by a Connection object.
diff --git a/introspection/nm-agent-manager.xml b/introspection/nm-agent-manager.xml
index d1074428..4b53675c 100644
--- a/introspection/nm-agent-manager.xml
+++ b/introspection/nm-agent-manager.xml
@@ -8,8 +8,6 @@
         Called by secret Agents to register their ability to provide and save
         network secrets.
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_agent_manager_register"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="identifier" type="s" direction="in">
         <tp:docstring>
           Identifies this agent; only one agent in each user session may use the
@@ -27,8 +25,6 @@
       <tp:docstring>
         Like Register() but indicates agent capabilities to NetworkManager.
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_agent_manager_register_with_capabilities"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="identifier" type="s" direction="in">
         <tp:docstring>
             See the Register() method's identifier argument.
@@ -47,8 +43,6 @@
         longer handle requests for network secrets.  Agents are automatically
         unregistered when they disconnect from D-Bus.
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_agent_manager_unregister"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
     </method>
 
   </interface>
diff --git a/introspection/nm-device-ethernet.xml b/introspection/nm-device-ethernet.xml
index 2554bda1..86d68a35 100644
--- a/introspection/nm-device-ethernet.xml
+++ b/introspection/nm-device-ethernet.xml
@@ -22,6 +22,12 @@
       </tp:docstring>
     </property>
 
+    <property name="S390Subchannels" type="as" access="read">
+      <tp:docstring>
+        Array of S/390 subchannels for S/390 or z/Architecture devices.
+      </tp:docstring>
+    </property>
+
     <property name="Carrier" type="b" access="read">
       <tp:docstring>
         Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not).
diff --git a/introspection/nm-device-gre.xml b/introspection/nm-device-ip-tunnel.xml
index ae418aab..fcb42ce2 100644
--- a/introspection/nm-device-gre.xml
+++ b/introspection/nm-device-ip-tunnel.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManager.Device.Gre">
+  <interface name="org.freedesktop.NetworkManager.Device.IPTunnel">
+
+    <property name="Mode" type="u" access="read">
+      <tp:docstring>
+        The tunneling mode.
+      </tp:docstring>
+    </property>
 
     <property name="Parent" type="o" access="read">
       <tp:docstring>
@@ -9,63 +15,62 @@
       </tp:docstring>
     </property>
 
-    <property name="InputFlags" type="q" access="read">
+    <property name="Local" type="s" access="read">
       <tp:docstring>
-        The expected set of GRE flags for incoming packets. (The
-        values are specified by the GRE specification. On Linux, they
-        are defined in &lt;linux/if_tunnel.h&gt;. Eg, GRE_KEY for the
-        'Key Present' bit.)
+        The local endpoint of the tunnel.
       </tp:docstring>
     </property>
 
-    <property name="OutputFlags" type="q" access="read">
+    <property name="Remote" type="s" access="read">
       <tp:docstring>
-        The set of GRE flags to use for outgoing packets. (The
-        values are specified by the GRE specification. On Linux, they
-        are defined in &lt;linux/if_tunnel.h&gt;. Eg, GRE_KEY for the
-        'Key Present' bit.)
+        The remote endpoint of the tunnel.
       </tp:docstring>
     </property>
 
-    <property name="InputKey" type="u" access="read">
+    <property name="Ttl" type="y" access="read">
       <tp:docstring>
-        Expected input key (if the "Key Present" bit is set in the input flags).
+        The TTL assigned to tunneled packets. 0 is a special value
+        meaning that packets inherit the TTL value
       </tp:docstring>
     </property>
 
-    <property name="OutputKey" type="u" access="read">
+    <property name="Tos" type="y" access="read">
       <tp:docstring>
-        Output key (if the "Key Present" bit is set in the output flags).
+        The type of service (IPv4) or traffic class (IPv6) assigned to
+        tunneled packets.
       </tp:docstring>
     </property>
 
-    <property name="Local" type="s" access="read">
+    <property name="PathMtuDiscovery" type="b" access="read">
       <tp:docstring>
-        The local end of the tunnel.
+        Whether path MTU discovery is enabled on this tunnel.
       </tp:docstring>
     </property>
 
-    <property name="Remote" type="s" access="read">
+    <property name="InputKey" type="s" access="read">
       <tp:docstring>
-        The remote end of the tunnel.
+        The key used for incoming packets.
       </tp:docstring>
     </property>
 
-    <property name="Ttl" type="y" access="read">
+    <property name="OutputKey" type="s" access="read">
       <tp:docstring>
-        The value to use in the IP TTL field for tunnel packets.
+        The key used for outgoing packets.
       </tp:docstring>
     </property>
 
-    <property name="Tos" type="y" access="read">
+    <property name="EncapsulationLimit" type="y" access="read">
       <tp:docstring>
-        The value to use in the IP ToS field for tunnel packets.
+        How many additional levels of encapsulation are permitted to
+        be prepended to packets. This property applies only to IPv6
+        tunnels.
       </tp:docstring>
     </property>
 
-    <property name="PathMtuDiscovery" type="b" access="read">
+    <property name="FlowLabel" type="u" access="read">
       <tp:docstring>
-        Whether path MTU discovery is performed.
+        The flow label to assign to tunnel packets. This property
+        applies only to IPv6 tunnels.
       </tp:docstring>
     </property>
 
diff --git a/introspection/nm-device-macvlan.xml b/introspection/nm-device-macvlan.xml
index a387bf56..c4dcb4e6 100644
--- a/introspection/nm-device-macvlan.xml
+++ b/introspection/nm-device-macvlan.xml
@@ -21,6 +21,12 @@
       </tp:docstring>
     </property>
 
+    <property name="Tap" type="b" access="read">
+      <tp:docstring>
+        Whether the device is a macvtap.
+      </tp:docstring>
+    </property>
+
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
             <tp:docstring>
diff --git a/introspection/nm-device-tun.xml b/introspection/nm-device-tun.xml
index 8b0f81fb..2b3ae2f5 100644
--- a/introspection/nm-device-tun.xml
+++ b/introspection/nm-device-tun.xml
@@ -43,6 +43,12 @@
       </tp:docstring>
     </property>
 
+    <property name="HwAddress" type="s" access="read">
+      <tp:docstring>
+        Hardware address of the device.
+      </tp:docstring>
+    </property>
+
     <signal name="PropertiesChanged">
         <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
             <tp:docstring>
diff --git a/introspection/nm-device-vxlan.xml b/introspection/nm-device-vxlan.xml
index 053eea4d..4dd254a2 100644
--- a/introspection/nm-device-vxlan.xml
+++ b/introspection/nm-device-vxlan.xml
@@ -10,6 +10,12 @@
       </tp:docstring>
     </property>
 
+    <property name="HwAddress" type="s" access="read">
+      <tp:docstring>
+        Hardware address of the device.
+      </tp:docstring>
+    </property>
+
     <property name="Id" type="u" access="read">
       <tp:docstring>
         The VXLAN Network Identifier (VNI).
diff --git a/introspection/nm-device-wifi.xml b/introspection/nm-device-wifi.xml
index b94aae84..27f3eb90 100644
--- a/introspection/nm-device-wifi.xml
+++ b/introspection/nm-device-wifi.xml
@@ -5,7 +5,6 @@
     <annotation name="org.gtk.GDBus.C.Name" value="DeviceWifi"/>
 
     <method name="GetAccessPoints">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_get_access_points"/>
       <arg name="access_points" type="ao" direction="out">
         <tp:docstring>
           List of access point object paths.
@@ -20,7 +19,6 @@
     </method>
 
     <method name="GetAllAccessPoints">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_get_all_access_points"/>
       <arg name="access_points" type="ao" direction="out">
         <tp:docstring>
           List of access point object paths.
@@ -33,8 +31,6 @@
     </method>
 
     <method name="RequestScan">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_request_scan"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="options" type="a{sv}" direction="in">
         <tp:docstring>
           Options of scan.
diff --git a/introspection/nm-device-wimax.xml b/introspection/nm-device-wimax.xml
index b48ffe94..3bad6245 100644
--- a/introspection/nm-device-wimax.xml
+++ b/introspection/nm-device-wimax.xml
@@ -3,7 +3,6 @@
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.Device.WiMax">
     <method name="GetNspList">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_get_nsp_list"/>
       <arg name="nsps" type="ao" direction="out">
         <tp:docstring>
           List of NSP object paths
diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml
index b2e3827e..2930cf06 100644
--- a/introspection/nm-device.xml
+++ b/introspection/nm-device.xml
@@ -96,9 +96,13 @@
         NM_DEVICE_STATE_ACTIVATED state.
       </tp:docstring>
     </property>
-    <property name="Managed" type="b" access="read">
+    <property name="Managed" type="b" access="readwrite">
       <tp:docstring>
-        Whether or not this device is managed by NetworkManager.
+        Whether or not this device is managed by NetworkManager. Setting this
+        property has a similar effect to configuring the device as unmanaged
+        via the keyfile.unmanaged-devices setting in NetworkManager.conf.
+        Changes to this value are not persistent and lost after NetworkManager
+        restart.
       </tp:docstring>
     </property>
     <property name="Autoconnect" type="b" access="readwrite">
@@ -116,6 +120,12 @@
         its operation.
       </tp:docstring>
     </property>
+    <property name="NmPluginMissing" type="b" access="read">
+      <tp:docstring>
+        If TRUE, indicates the NetworkManager plugin for the device is likely
+        missing or misconfigured.
+      </tp:docstring>
+    </property>
     <property name="DeviceType" type="u" access="read" tp:type="NM_DEVICE_TYPE">
       <tp:docstring>
         The general type of the network device; ie Ethernet, WiFi, etc.
@@ -145,18 +155,48 @@
         subject to limitations, for example set by service providers.
       </tp:docstring>
     </property>
+    <property name="LldpNeighbors" type="aa{sv}" access="read">
+      <tp:docstring>
+        Array of LLDP neighbors; each element is a dictionary mapping
+        LLDP TLV names to variant boxed values.
+      </tp:docstring>
+    </property>
+    <property name="Real" type="b" access="read">
+      <tp:docstring>
+        True if the device exists, or False for placeholder devices that
+        do not yet exist but could be automatically created by NetworkManager
+        if one of their AvailableConnections was activated.
+      </tp:docstring>
+    </property>
+
+    <method name="Reapply">
+      <arg name="connection" type="a{sa{sv}}" direction="in">
+        <tp:docstring>
+          The effective connection settings and properties to use. If empty, the connection
+          settings from the connection that is active on the device will be used.
+        </tp:docstring>
+      </arg>
+      <arg name="flags" type="u" direction="in">
+        <tp:docstring>
+          Flags which would modify the behavior of the Reapply call.
+          There are no flags defined currently and the users should use the value of 0.
+        </tp:docstring>
+      </arg>
+      <tp:docstring>
+        Attempts to update the configuration of a device without deactivating it.
+        You can either modify the configuration by passing the desired setup via "connection"
+        argument or just omit the argument to bring it in sync with the connection that
+        has been activated but could have been modified  since.
+      </tp:docstring>
+    </method>
 
     <method name="Disconnect">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_disconnect"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <tp:docstring>
         Disconnects a device and prevents the device from automatically activating further connections without user intervention.
       </tp:docstring>
     </method>
 
     <method name="Delete">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_delete"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <tp:docstring>
         Deletes a software device from NetworkManager and removes the interface from the system.
         The method returns an error when called for a hardware device.
diff --git a/introspection/nm-dhcp4-config.xml b/introspection/nm-dhcp4-config.xml
index c0821ada..379c50f9 100644
--- a/introspection/nm-dhcp4-config.xml
+++ b/introspection/nm-dhcp4-config.xml
@@ -2,6 +2,7 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
     <interface name="org.freedesktop.NetworkManager.DHCP4Config">
+        <annotation name="org.gtk.GDBus.C.Name" value="Dhcp4Config"/>
         <tp:docstring>
             Options and configuration returned by the IPv4 DHCP server.
         </tp:docstring>
diff --git a/introspection/nm-dhcp6-config.xml b/introspection/nm-dhcp6-config.xml
index 93b0f1c8..df75660a 100644
--- a/introspection/nm-dhcp6-config.xml
+++ b/introspection/nm-dhcp6-config.xml
@@ -2,6 +2,7 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
     <interface name="org.freedesktop.NetworkManager.DHCP6Config">
+        <annotation name="org.gtk.GDBus.C.Name" value="Dhcp6Config"/>
         <tp:docstring>
             Options and configuration returned by the IPv6 DHCP server.
         </tp:docstring>
diff --git a/introspection/nm-ip4-config.xml b/introspection/nm-ip4-config.xml
index 98076534..5a9e8ea1 100644
--- a/introspection/nm-ip4-config.xml
+++ b/introspection/nm-ip4-config.xml
@@ -49,6 +49,13 @@
     <property name="Searches" type="as" access="read">
       <tp:docstring>A list of dns searches.</tp:docstring>
     </property>
+    <property name="DnsOptions" type="as" access="read">
+      <tp:docstring>
+	A list of DNS options that modify the behavior of the DNS
+	resolver. See resolv.conf(5) manual page for the list of
+	supported options.
+      </tp:docstring>
+    </property>
     <property name="WinsServers" type="au" access="read">
       <tp:docstring>The Windows Internet Name Service servers associated with the connection.  Each address is in network byte order.</tp:docstring>
     </property>
diff --git a/introspection/nm-ip6-config.xml b/introspection/nm-ip6-config.xml
index 985dd2e3..1a107bf2 100644
--- a/introspection/nm-ip6-config.xml
+++ b/introspection/nm-ip6-config.xml
@@ -35,6 +35,10 @@
       </tp:docstring>
     </property>
     <property name="Nameservers" type="aay" access="read">
+      <!-- gdbus-codegen assumes that "aay" means "array of non-UTF-8
+	   string" and so would make this a char **.
+      -->
+      <annotation name="org.gtk.GDBus.C.ForceGVariant" value="1"/>
       <tp:docstring>The nameservers in use.</tp:docstring>
     </property>
     <property name="Domains" type="as" access="read">
@@ -43,6 +47,13 @@
     <property name="Searches" type="as" access="read">
       <tp:docstring>A list of dns searches.</tp:docstring>
     </property>
+    <property name="DnsOptions" type="as" access="read">
+      <tp:docstring>
+	A list of DNS options that modify the behavior of the DNS
+	resolver. See resolv.conf(5) manual page for the list of
+	supported options.
+      </tp:docstring>
+    </property>
 
     <signal name="PropertiesChanged">
       <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index db68214d..dd6fc4bd 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -6,12 +6,27 @@
 
     <method name="GetDevices">
       <tp:docstring>
-        Get the list of network devices.
+        Get the list of realized network devices.
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_devices"/>
       <arg name="devices" type="ao" direction="out">
         <tp:docstring>
-          List of object paths of network devices known to the system.
+          List of object paths of network devices known to the system.  This
+          list does not include device placeholders (see GetAllDevices()).
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <method name="GetAllDevices">
+      <tp:docstring>
+        Get the list of all network devices.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_all_devices"/>
+      <arg name="devices" type="ao" direction="out">
+        <tp:docstring>
+          List of object paths of network devices and device placeholders
+          (eg, devices that do not yet exist but which can be automatically
+          created by NetworkManager if one of their AvailableConnections
+          was activated).
         </tp:docstring>
       </arg>
     </method>
@@ -22,7 +37,6 @@
         interface name.  Note that some devices (usually modems) only have an
         IP interface name when they are connected.
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_device_by_ip_iface"/>
       <arg name="iface" type="s" direction="in">
         <tp:docstring>
           Interface name of the device to find.
@@ -36,8 +50,6 @@
     </method>
 
     <method name="ActivateConnection">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_activate_connection"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <tp:docstring>
         Activate a connection using the supplied device.
       </tp:docstring>
@@ -76,8 +88,6 @@
     </method>
 
     <method name="AddAndActivateConnection">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_add_and_activate_connection"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <tp:docstring>
         Adds a new connection using the given details (if any) as a template
         (automatically filling in missing settings with the capabilities of the
@@ -121,8 +131,6 @@
       <tp:docstring>
         Deactivate an active connection.
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_deactivate_connection"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="active_connection" type="o" direction="in">
         <tp:docstring>
           The currently active connection to deactivate.
@@ -131,8 +139,6 @@
     </method>
 
     <method name="Sleep">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_sleep"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <tp:docstring>
         Control the NetworkManager daemon's sleep state.  When asleep, all
         interfaces that it manages are deactivated.  When awake, devices are
@@ -147,8 +153,6 @@
     </method>
 
     <method name="Enable">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_enable"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <tp:docstring>
         Control whether overall networking is enabled or disabled.  When
         disabled, all interfaces that NM manages are deactivated.  When enabled,
@@ -165,8 +169,6 @@
     </method>
 
     <method name="GetPermissions">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_permissions"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <tp:docstring>
         Returns the permissions a caller has for various authenticated operations
         that NetworkManager provides, like Enable/Disable networking, changing
@@ -193,14 +195,18 @@
     </signal>
 
     <method name="SetLogging">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_set_logging"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <tp:docstring>
         Set logging verbosity and which operations are logged.
       </tp:docstring>
       <arg name="level" type="s" direction="in">
         <tp:docstring>
-          One of [ERR, WARN, INFO, DEBUG, TRACE].
+          One of [ERR, WARN, INFO, DEBUG, TRACE, OFF, KEEP].
+          This level is applied to the domains as specified in the domains
+          argument. Except for the special level "KEEP", all unmentioned
+          domains are disabled entirely. "KEEP" is special and allows
+          not to change the current setting except for the specified
+          domains. E.g. level=KEEP and domains=PLATFORM:DEBUG will only
+          touch the platform domain.
         </tp:docstring>
       </arg>
       <arg name="domains" type="s" direction="in">
@@ -223,7 +229,6 @@
     </method>
 
     <method name="GetLogging">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_logging"/>
       <tp:docstring>
         Get current logging verbosity level and operations domains.
       </tp:docstring>
@@ -240,8 +245,6 @@
     </method>
 
     <method name="CheckConnectivity">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_check_connectivity"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <tp:docstring>
 	Re-check the network connectivity state.
       </tp:docstring>
@@ -257,13 +260,23 @@
         The overall networking state as determined by the NetworkManager daemon,
         based on the state of network devices under it's management.
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_state"/>
       <arg name="state" type="u" direction="out" tp:type="NM_STATE"/>
     </method>
 
     <property name="Devices" type="ao" access="read">
       <tp:docstring>
-        The list of network devices/interfaces NetworkManager knows about.
+        The list of realized network devices. Realized devices are those which
+        have backing resources (eg from the kernel or a management daemon like
+        ModemManager, teamd, etc).
+      </tp:docstring>
+    </property>
+
+    <property name="AllDevices" type="ao" access="read">
+      <tp:docstring>
+        The list of both realized and un-realized network devices. Un-realized
+        devices are software devices which do not yet have backing resources,
+        but for which backing resources can be created if the device is
+        activated.
       </tp:docstring>
     </property>
 
@@ -337,8 +350,8 @@
 
     <property name="Metered" type="u" access="read" tp:type="NM_METERED">
       <tp:docstring>
-        Wheter the connectivity is metered. This is equivalent to the
-        metered property of the device associated with the primary
+        Indicates whether the connectivity is metered. This is equivalent
+        to the metered property of the device associated with the primary
         connection.
       </tp:docstring>
     </property>
@@ -388,6 +401,20 @@
       </tp:docstring>
     </property>
 
+    <property name="GlobalDnsConfiguration" type="a{sv}" access="readwrite">
+      <tp:docstring>
+        Dictionary of global DNS settings where the key is one of
+        "searches", "options" and "domains".  The values for the
+        "searches" and "options" keys are string arrays describing the
+        list of search domains and resolver options, respectively.
+        The value of the "domains" key is a second-level dictionary,
+        where each key is a domain name, and each key's value is a
+        third-level dictionary with the keys "servers" and
+        "options". "servers" is a string array of DNS servers,
+        "options" is a string array of domain-specific options.
+      </tp:docstring>
+    </property>
+
     <signal name="PropertiesChanged">
       <tp:docstring>
         NetworkManager's properties changed.
diff --git a/introspection/nm-ppp-manager.xml b/introspection/nm-ppp-manager.xml
index 5ea1e8b1..e4c6a2c8 100644
--- a/introspection/nm-ppp-manager.xml
+++ b/introspection/nm-ppp-manager.xml
@@ -5,24 +5,19 @@
     <annotation name="org.gtk.GDBus.C.Name" value="PPP_Manager"/>
 
     <method name="NeedSecrets">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_ppp_manager_need_secrets"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="username" type="s" direction="out"/>
       <arg name="password" type="s" direction="out"/>
     </method>
 
     <method name="SetIp4Config">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_ppp_manager_set_ip4_config"/>
       <arg name="config" type="a{sv}" direction="in"/>
     </method>
 
     <method name="SetIp6Config">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_ppp_manager_set_ip6_config"/>
       <arg name="config" type="a{sv}" direction="in"/>
     </method>
 
     <method name="SetState">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_ppp_manager_set_state"/>
       <arg name="state" type="u" direction="in"/>
     </method>
   </interface>
diff --git a/introspection/nm-settings-connection.xml b/introspection/nm-settings-connection.xml
index b02762d6..2d919619 100644
--- a/introspection/nm-settings-connection.xml
+++ b/introspection/nm-settings-connection.xml
@@ -15,8 +15,6 @@
             stored in persistent storage or sent to a Secret Agent for storage,
             depending on the flags associated with each secret.
           </tp:docstring>
-          <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_update"/>
-          <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
           <arg name="properties" type="a{sa{sv}}" direction="in">
             <tp:docstring>
               New connection settings, properties, and (optionally) secrets.
@@ -37,8 +35,6 @@
             reloaded from disk (either automatically on file change or
             due to an explicit ReloadConnections call).
           </tp:docstring>
-          <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_update_unsaved"/>
-          <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
           <arg name="properties" type="a{sa{sv}}" direction="in">
             <tp:docstring>
               New connection settings, properties, and (optionally) secrets.
@@ -50,8 +46,6 @@
           <tp:docstring>
             Delete the connection.
           </tp:docstring>
-          <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_delete"/>
-          <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
         </method>
 
         <method name="GetSettings">
@@ -61,8 +55,6 @@
                 to the network, as those are often protected.  Secrets must
                 be requested separately using the GetSecrets() call.
             </tp:docstring>
-            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_get_settings"/>
-            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
             <arg name="settings" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map">
                 <tp:docstring>
                     The nested settings maps describing this object.
@@ -77,8 +69,6 @@
                 the requestor's session will be returned.  The user will never
                 be prompted for secrets as a result of this request.
             </tp:docstring>
-            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_get_secrets"/>
-            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
             <arg name="setting_name" type="s" direction="in">
                 <tp:docstring>
                     Name of the setting to return secrets for.  If empty, all
@@ -97,8 +87,6 @@
           <tp:docstring>
             Clear the secrets belonging to this network connection profile.
           </tp:docstring>
-          <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_clear_secrets"/>
-          <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
         </method>
 
         <method name="Save">
@@ -106,8 +94,6 @@
                 Saves a "dirty" connection (that had previously been
                 updated with UpdateUnsaved) to persistent storage.
             </tp:docstring>
-            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_save"/>
-            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
         </method>
 
         <signal name="Updated">
diff --git a/introspection/nm-settings.xml b/introspection/nm-settings.xml
index 3a71959c..b6ab8260 100644
--- a/introspection/nm-settings.xml
+++ b/introspection/nm-settings.xml
@@ -10,7 +10,6 @@
       <tp:docstring>
         List the saved network connections known to NetworkManager.
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_list_connections"/>
       <arg name="connections" type="ao" direction="out">
         <tp:docstring>
           List of connections.
@@ -22,8 +21,6 @@
       <tp:docstring>
         Retrieve the object path of a connection, given that connection's UUID.
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_get_connection_by_uuid"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="uuid" type="s" direction="in">
         <tp:docstring>
           The UUID to find the connection object path for.
@@ -43,8 +40,6 @@
         the network described by the new connection, and (2) the connection
         is allowed to be started automatically.
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_add_connection"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="connection" type="a{sa{sv}}" direction="in">
         <tp:docstring>
           Connection settings and properties.
@@ -69,8 +64,6 @@
         connection is reloaded from disk (either automatically on file
         change or due to an explicit ReloadConnections call).
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_add_connection_unsaved"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="connection" type="a{sa{sv}}" direction="in">
         <tp:docstring>
           Connection settings and properties.
@@ -93,8 +86,6 @@
         harmless.) As with AddConnection(), this operation does not
         necessarily start the network connection.
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_load_connections"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="filenames" type="as" direction="in">
         <tp:docstring>
           Array of paths to on-disk connection profiles in directories
@@ -125,8 +116,6 @@
         change, so you only need to use this command if you have set
         "monitor-connection-files=false" in NetworkManager.conf.
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_reload_connections"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="status" type="b" direction="out">
         <tp:docstring>
           Success or failure.
@@ -138,8 +127,6 @@
       <tp:docstring>
         Save the hostname to persistent configuration.
       </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_save_hostname"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <arg name="hostname" type="s" direction="in">
         <tp:docstring>
           The hostname to save to persistent configuration.  If blank, the persistent hostname is cleared.