Imported Upstream version 0.8.998 upstream/0.8.998

19 files changed, 700 insertions, 380 deletions

diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index 212da3ab..320245ee 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -8,21 +8,21 @@ EXTRA_DIST = \
 	nm-device-wifi.xml \
 	nm-device-olpc-mesh.xml \
 	nm-device-ethernet.xml \
-	nm-device-cdma.xml \
-	nm-device-gsm.xml \
-	nm-device-serial.xml \
+	nm-device-modem.xml \
+	nm-device-wimax.xml \
 	nm-device.xml \
 	nm-ip4-config.xml \
 	nm-ip6-config.xml \
 	nm-manager.xml \
-	nm-manager-client.xml \
 	nm-settings.xml \
-	nm-settings-system.xml \
-	nm-exported-connection.xml \
+	nm-settings-connection.xml \
 	nm-vpn-plugin.xml \
 	nm-vpn-connection.xml \
 	nm-ppp-manager.xml \
 	nm-active-connection.xml \
 	nm-dhcp4-config.xml \
-	nm-dhcp6-config.xml
+	nm-dhcp6-config.xml \
+	nm-agent-manager.xml \
+	nm-wimax-nsp.xml \
+	nm-secret-agent.xml
 
diff --git a/introspection/Makefile.in b/introspection/Makefile.in
index 3e4fb45e..fd64eca6 100644
--- a/introspection/Makefile.in
+++ b/introspection/Makefile.in
@@ -37,11 +37,16 @@ subdir = introspection
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
-	$(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \
-	$(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gtk-doc.m4 \
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libnl-check.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
+	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -58,7 +63,6 @@ SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -67,8 +71,6 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -85,6 +87,7 @@ DHCLIENT_PATH = @DHCLIENT_PATH@
 DHCLIENT_VERSION = @DHCLIENT_VERSION@
 DHCPCD_PATH = @DHCPCD_PATH@
 DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -93,6 +96,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GIO_CFLAGS = @GIO_CFLAGS@
 GIO_LIBS = @GIO_LIBS@
@@ -101,8 +105,8 @@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_LIBS = @GLIB_LIBS@
 GMODULE_CFLAGS = @GMODULE_CFLAGS@
 GMODULE_LIBS = @GMODULE_LIBS@
-GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
 GREP = @GREP@
@@ -117,13 +121,23 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
+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@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
@@ -131,6 +145,8 @@ LIBDL = @LIBDL@
 LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
 LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
 LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
 LIBM = @LIBM@
 LIBNL_CFLAGS = @LIBNL_CFLAGS@
 LIBNL_LIBS = @LIBNL_LIBS@
@@ -139,13 +155,15 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIPO = @LIPO@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -171,12 +189,9 @@ PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POFILES = @POFILES@
 POLKIT_CFLAGS = @POLKIT_CFLAGS@
 POLKIT_LIBS = @POLKIT_LIBS@
 POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 PPPD_PLUGIN_DIR = @PPPD_PLUGIN_DIR@
 RANLIB = @RANLIB@
 RESOLVCONF_PATH = @RESOLVCONF_PATH@
@@ -191,10 +206,13 @@ UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -253,23 +271,23 @@ EXTRA_DIST = \
 	nm-device-wifi.xml \
 	nm-device-olpc-mesh.xml \
 	nm-device-ethernet.xml \
-	nm-device-cdma.xml \
-	nm-device-gsm.xml \
-	nm-device-serial.xml \
+	nm-device-modem.xml \
+	nm-device-wimax.xml \
 	nm-device.xml \
 	nm-ip4-config.xml \
 	nm-ip6-config.xml \
 	nm-manager.xml \
-	nm-manager-client.xml \
 	nm-settings.xml \
-	nm-settings-system.xml \
-	nm-exported-connection.xml \
+	nm-settings-connection.xml \
 	nm-vpn-plugin.xml \
 	nm-vpn-connection.xml \
 	nm-ppp-manager.xml \
 	nm-active-connection.xml \
 	nm-dhcp4-config.xml \
-	nm-dhcp6-config.xml
+	nm-dhcp6-config.xml \
+	nm-agent-manager.xml \
+	nm-wimax-nsp.xml \
+	nm-secret-agent.xml
 
 all: all-am
 
diff --git a/introspection/all.xml b/introspection/all.xml
index 1c32f3f3..5d1baf01 100644
--- a/introspection/all.xml
+++ b/introspection/all.xml
@@ -3,10 +3,10 @@
   xmlns:xi="http://www.w3.org/2001/XInclude">
 
 <tp:title>NetworkManager D-Bus Interface Specification</tp:title>
-<tp:version>0.8</tp:version>
+<tp:version>0.9</tp:version>
 
 
-<tp:copyright>Copyright (C) 2008 - 2009 Red Hat, Inc.</tp:copyright>
+<tp:copyright>Copyright (C) 2008 - 2011 Red Hat, Inc.</tp:copyright>
 <tp:copyright>Copyright (C) 2008 - 2009 Novell, Inc.</tp:copyright>
 
 <tp:license xmlns="http://www.w3.org/1999/xhtml">
@@ -30,19 +30,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
 <xi:include href="nm-device.xml"/>
 <xi:include href="nm-device-ethernet.xml"/>
 <xi:include href="nm-device-wifi.xml"/>
-<xi:include href="nm-device-cdma.xml"/>
-<xi:include href="nm-device-gsm.xml"/>
-<xi:include href="nm-device-serial.xml"/>
+<xi:include href="nm-device-modem.xml"/>
 <xi:include href="nm-device-bt.xml"/>
 <xi:include href="nm-device-olpc-mesh.xml"/>
+<xi:include href="nm-device-wimax.xml"/>
+<xi:include href="nm-wimax-nsp.xml"/>
 <xi:include href="nm-ip4-config.xml"/>
 <xi:include href="nm-ip6-config.xml"/>
 <xi:include href="nm-dhcp4-config.xml"/>
 <xi:include href="nm-dhcp6-config.xml"/>
 <xi:include href="nm-settings.xml"/>
-<xi:include href="nm-settings-system.xml"/>
-<xi:include href="nm-exported-connection.xml"/>
+<xi:include href="nm-settings-connection.xml"/>
 <xi:include href="nm-active-connection.xml"/>
+<xi:include href="nm-agent-manager.xml"/>
 <xi:include href="nm-vpn-connection.xml"/>
 <xi:include href="nm-vpn-plugin.xml"/>
 
diff --git a/introspection/errors.xml b/introspection/errors.xml
index 444b325d..f2db8667 100644
--- a/introspection/errors.xml
+++ b/introspection/errors.xml
@@ -5,7 +5,7 @@
 
   <tp:error name="Unknown Connection">
     <tp:docstring>
-        Connection was not provided by any known settings service.
+        Connection was not provided by the settings service.
     </tp:docstring>
   </tp:error>
 
@@ -15,18 +15,6 @@
     </tp:docstring>
   </tp:error>
 
-  <tp:error name="Invalid Service">
-    <tp:docstring>
-        Invalid settings service (not a recognized system or user settings service name).
-    </tp:docstring>
-  </tp:error>
-
-  <tp:error name="System Connection">
-    <tp:docstring>
-        Connection was superseded by a system connection.
-    </tp:docstring>
-  </tp:error>
-
   <tp:error name="Permission Denied">
     <tp:docstring>
     User does not have the permission to activate this connection.
diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml
index 765830a1..41aeab62 100644
--- a/introspection/nm-active-connection.xml
+++ b/introspection/nm-active-connection.xml
@@ -2,9 +2,6 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <interface name="org.freedesktop.NetworkManager.Connection.Active">
-    <property name="ServiceName" type="s" access="read">
-      <tp:docstring>The D-Bus service name providing this connection.</tp:docstring>
-    </property>
     <property name="Connection" type="o" access="read">
       <tp:docstring>The path of the connection.</tp:docstring>
     </property>
@@ -51,6 +48,11 @@
           The connection is activated.
         </tp:docstring>
       </tp:enumvalue>
+      <tp:enumvalue suffix="DEACTIVATING" value="3">
+        <tp:docstring>
+          The connection is being torn down and cleaned up.
+        </tp:docstring>
+      </tp:enumvalue>
     </tp:enum>
   </interface>
 </node>
diff --git a/introspection/nm-agent-manager.xml b/introspection/nm-agent-manager.xml
new file mode 100644
index 00000000..0b1e3e6e
--- /dev/null
+++ b/introspection/nm-agent-manager.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <interface name="org.freedesktop.NetworkManager.AgentManager">
+
+    <method name="Register">
+      <tp:docstring>
+        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
+          same identifier.  Identifier formatting follows the same rules as
+          D-Bus bus names with the exception that the ':' character is not
+          allowed.  The valid set of characters is "[A-Z][a-z][0-9]_-." and the
+          identifier is limited in length to 255 characters with a minimum
+          of 3 characters.  An example valid identifier is 'org.gnome.nm-applet'
+          (without quotes).
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <method name="Unregister">
+      <tp:docstring>
+        Called by secret Agents to notify NetworkManager that they will no
+        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>
+</node>
+
diff --git a/introspection/nm-device-cdma.xml b/introspection/nm-device-cdma.xml
deleted file mode 100644
index 2b43f8fd..00000000
--- a/introspection/nm-device-cdma.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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.Cdma">
-
-    <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
-                A dictionary mapping property names to variant boxed values
-            </tp:docstring>
-        </arg>
-    </signal>
-
-  </interface>
-</node>
diff --git a/introspection/nm-device-gsm.xml b/introspection/nm-device-gsm.xml
deleted file mode 100644
index 650d656a..00000000
--- a/introspection/nm-device-gsm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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.Gsm">
-
-    <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
-                A dictionary mapping property names to variant boxed values
-            </tp:docstring>
-        </arg>
-    </signal>
-
-  </interface>
-</node>
diff --git a/introspection/nm-device-modem.xml b/introspection/nm-device-modem.xml
new file mode 100644
index 00000000..0ca101fd
--- /dev/null
+++ b/introspection/nm-device-modem.xml
@@ -0,0 +1,64 @@
+<?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.Modem">
+
+    <signal name="PropertiesChanged">
+        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
+            <tp:docstring>
+                A dictionary mapping property names to variant boxed values
+            </tp:docstring>
+        </arg>
+    </signal>
+
+    <property name="ModemCapabilities" type="u" access="read" tp:type="NM_DEVICE_MODEM_CAPABILITIES">
+      <tp:docstring>
+        The generic family of access technologies the modem supports.  Not all
+        capabilities are available at the same time however; some modems require
+        a firmware reload or other reinitialization to switch between eg CDMA/EVDO
+        and GSM/UMTS.
+      </tp:docstring>
+    </property>
+
+    <property name="CurrentCapabilities" type="u" access="read" tp:type="NM_DEVICE_MODEM_CAPABILITIES">
+      <tp:docstring>
+        The generic family of access technologies the modem currently supports
+        without a firmware reload or reinitialization.
+      </tp:docstring>
+    </property>
+
+    <tp:flags name="NM_DEVICE_MODEM_CAPABILITIES" value-prefix="NM_DEVICE_MODEM_CAPABILITY" type="u">
+      <tp:docstring>
+        Flags describing one or more of the general access technology families
+        that a modem device supports.
+      </tp:docstring>
+      <tp:flag suffix="NONE" value="0x0">
+        <tp:docstring>Modem has no capabilties.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="POTS" value="0x1">
+        <tp:docstring>
+          Modem supports the analog wired telephone network (ie 56k dialup) and
+          does not have wireless/cellular capabilities.
+        </tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="CDMA_EVDO" value="0x2">
+        <tp:docstring>
+          Modem supports at least one of CDMA 1xRTT, EVDO revision 0, EVDO
+          revision A, or EVDO revision B.
+        </tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="GSM_UMTS" value="0x4">
+        <tp:docstring>
+          Modem supports at least one of GSM, GPRS, EDGE, UMTS, HSDPA, HSUPA, or
+          HSPA+ packet switched data capability.
+        </tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="LTE" value="0x8">
+        <tp:docstring>
+          Modem has at LTE data capability.
+        </tp:docstring>
+      </tp:flag>
+    </tp:flags>
+
+  </interface>
+</node>
diff --git a/introspection/nm-device-serial.xml b/introspection/nm-device-serial.xml
deleted file mode 100644
index 13b08537..00000000
--- a/introspection/nm-device-serial.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.Serial">
-
-  <signal name="PppStats">
-    <arg name="in_bytes" type="u">
-      <tp:docstring>
-	Bytes received
-      </tp:docstring>
-    </arg>
-    <arg name="out_bytes" type="u">
-      <tp:docstring>
-	Bytes sent
-      </tp:docstring>
-    </arg>
-  </signal>
-
-  </interface>
-</node>
diff --git a/introspection/nm-device-wimax.xml b/introspection/nm-device-wimax.xml
new file mode 100644
index 00000000..6e414087
--- /dev/null
+++ b/introspection/nm-device-wimax.xml
@@ -0,0 +1,103 @@
+<?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.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
+        </tp:docstring>
+      </arg>
+      <tp:docstring>
+        Get the list of NSPs visible to this device.
+      </tp:docstring>
+    </method>
+
+    <property name="HwAddress" type="s" access="read">
+      <tp:docstring>
+        Hardware address of the device.
+      </tp:docstring>
+    </property>
+
+    <property name="CenterFrequency" type="u" access="read">
+      <tp:docstring>
+        Center frequency (in KHz) of the radio channel the device is using to
+        communicate with the network when connected.  Has no meaning when the
+        device is not connected.
+      </tp:docstring>
+    </property>
+
+    <property name="Rssi" type="i" access="read">
+      <tp:docstring>
+        RSSI of the current radio link in dBm.  This value indicates how strong
+        the raw received RF signal from the base station is, but does not
+        indicate the overall quality of the radio link.  Has no meaning when the
+        device is not connected.
+      </tp:docstring>
+    </property>
+
+    <property name="Cinr" type="i" access="read">
+      <tp:docstring>
+        CINR (Carrier to Interference + Noise Ratio) of the current radio link
+        in dB.  CINR is a more accurate measure of radio link quality.  Has no
+        meaning when the device is not connected.
+      </tp:docstring>
+    </property>
+
+    <property name="TxPower" type="i" access="read">
+      <tp:docstring>
+        Average power of the last burst transmitted by the device, in units of
+        0.5 dBm.  i.e. a TxPower of -11 represents an actual device TX power of
+        -5.5 dBm.  Has no meaning when the device is not connected.
+      </tp:docstring>
+    </property>
+
+    <property name="Bsid" type="s" access="read">
+      <tp:docstring>
+        The ID of the serving base station as received from the network.  Has
+        no meaning when the device is not connected.
+      </tp:docstring>
+    </property>
+
+    <property name="ActiveNsp" type="o" access="read">
+      <tp:docstring>
+        Object path of the NSP currently used by the WiMax device.
+      </tp:docstring>
+    </property>
+
+    <signal name="PropertiesChanged">
+        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
+            <tp:docstring>
+                A dictionary mapping property names to variant boxed values.
+            </tp:docstring>
+        </arg>
+        <tp:docstring>
+            Emitted when the WiMax device's properties changed.
+        </tp:docstring>
+    </signal>
+
+    <signal name="NspAdded">
+        <arg name="nsp" type="o">
+            <tp:docstring>
+                The object path of the newly found NSP.
+            </tp:docstring>
+        </arg>
+        <tp:docstring>
+            Emitted when a new NSP is found by the device.
+        </tp:docstring>
+    </signal>
+
+    <signal name="NspRemoved">
+      <arg name="nsp" type="o">
+            <tp:docstring>
+                The object path of the NSP that has disappeared.
+            </tp:docstring>
+        </arg>
+        <tp:docstring>
+            Emitted when an NSP disappears from view of the device.
+        </tp:docstring>
+    </signal>
+
+  </interface>
+</node>
diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml
index eaebdf35..13c542a6 100644
--- a/introspection/nm-device.xml
+++ b/introspection/nm-device.xml
@@ -4,7 +4,18 @@
   <interface name="org.freedesktop.NetworkManager.Device">
     <property name="Udi" type="s" access="read">
       <tp:docstring>
-        Unique Device Identifier.
+        Operating-system specific transient device hardware identifier.  This
+        is an opaque string representing the underlying hardware for the device,
+        and shouldn't be used to keep track of individual devices.  For some
+        device types (Bluetooth, Modems) it is an identifier used by the
+        hardware service (ie bluez or ModemManager) to refer to that device,
+        and client programs use it get additional information from those
+        services which NM does not provide.  The Udi is not guaranteed to be
+        consistent across reboots or hotplugs of the hardware. If you're looking
+        for a way to uniquely track each device in your application, use the
+        object path.  If you're looking for a way to track a specific piece of
+        hardware across reboot or hotplug, use a MAC address or USB serial
+        number.
       </tp:docstring>
     </property>
     <property name="Interface" type="s" access="read">
@@ -111,47 +122,62 @@
           The device is in an unknown state.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="UNMANAGED" value="1">
+      <tp:enumvalue suffix="UNMANAGED" value="10">
         <tp:docstring>
-          The device is not managed by NetworkManager.
+          The device is recognized but not managed by NetworkManager.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="UNAVAILABLE" value="2">
+      <tp:enumvalue suffix="UNAVAILABLE" value="20">
         <tp:docstring>
           The device cannot be used (carrier off, rfkill, etc).
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="DISCONNECTED" value="3">
+      <tp:enumvalue suffix="DISCONNECTED" value="30">
         <tp:docstring>
           The device is not connected.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="PREPARE" value="4">
+      <tp:enumvalue suffix="PREPARE" value="40">
         <tp:docstring>
           The device is preparing to connect.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="CONFIG" value="5">
+      <tp:enumvalue suffix="CONFIG" value="50">
         <tp:docstring>
           The device is being configured.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="NEED_AUTH" value="6">
+      <tp:enumvalue suffix="NEED_AUTH" value="60">
         <tp:docstring>
           The device is awaiting secrets necessary to continue connection.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="IP_CONFIG" value="7">
+      <tp:enumvalue suffix="IP_CONFIG" value="70">
         <tp:docstring>
           The IP settings of the device are being requested and configured.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="ACTIVATED" value="8">
+      <tp:enumvalue suffix="IP_CHECK" value="80">
+        <tp:docstring>
+          The device's IP connectivity ability is being determined.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="SECONDARIES" value="90">
+        <tp:docstring>
+          The device is waiting for secondary connections to be activated.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="ACTIVATED" value="100">
         <tp:docstring>
           The device is active.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="FAILED" value="9">
+      <tp:enumvalue suffix="DEACTIVATING" value="110">
+        <tp:docstring>
+          The device's network connection is being torn down.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="FAILED" value="120">
         <tp:docstring>
           The device is in a failure state following an attempt to activate it.
         </tp:docstring>
@@ -174,14 +200,32 @@
           The device is an 802.11 WiFi device.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="GSM" value="3">
+      <tp:enumvalue suffix="UNUSED1" value="3">
+        <tp:docstring>Unused</tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="UNUSED2" value="4">
+        <tp:docstring>Unused</tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="BT" value="5">
+        <tp:docstring>
+          The device is Bluetooth device that provides PAN or DUN capabilities.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="OLPC_MESH" value="6">
+        <tp:docstring>
+          The device is an OLPC mesh networking device.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="WIMAX" value="7">
         <tp:docstring>
-          The device is a GSM-based cellular WAN device.
+          The device is an 802.16e Mobile WiMAX device.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="CDMA" value="4">
+      <tp:enumvalue suffix="MODEM" value="8">
         <tp:docstring>
-          The device is a CDMA/IS-95-based cellular WAN device.
+          The device is a modem supporting one or more of analog telephone,
+          CDMA/EVDO, GSM/UMTS/HSPA, or LTE standards to access a cellular or
+          wireline data network.
         </tp:docstring>
       </tp:enumvalue>
     </tp:enum>
diff --git a/introspection/nm-manager-client.xml b/introspection/nm-manager-client.xml
deleted file mode 100644
index 24e4a29e..00000000
--- a/introspection/nm-manager-client.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- 
-READ ME! READ ME! READ ME! READ ME! READ ME!
-
-This file needs to be kept in sync with nm-manager.xml with the exception of
-the legacy methods at the end of nm-manager.xml.
-
-This file is only used to ensure that a few legacy 0.6 D-DBus methods that
-NM supports don't leak into libnm-glib, but are only exposed by the NMManager
-object.  dbus-glib generates the same bound function names for D-Bus the methods
-"sleep" and "Sleep", unfortunately.
--->
-
-<node name="/">
-  <interface name="org.freedesktop.NetworkManager">
-    <method name="GetDevices">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_devices"/>
-      <arg name="devices" type="ao" direction="out"/>
-    </method>
-
-    <method name="ActivateConnection">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_activate_connection"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg name="service_name" type="s" direction="in"/>
-      <arg name="connection" type="o" direction="in"/>
-      <arg name="device" type="o" direction="in"/>
-      <arg name="specific_object" type="o" direction="in"/>
-      <arg name="active_connection" type="o" direction="out"/>
-    </method>
-
-    <method name="DeactivateConnection">
-      <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"/>
-    </method>
-
-    <method name="Sleep">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_sleep"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg name="sleep" type="b" direction="in"/>
-    </method>
-
-    <method name="Enable">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_enable"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg name="enable" type="b" direction="in"/>
-    </method>
-
-    <method name="GetPermissions">
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_permissions"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg name="permissions" type="a{ss}" direction="out"/>
-    </method>
-
-    <signal name="CheckPermissions"/>
-
-    <property name="NetworkingEnabled" type="b" access="read"/>
-    <property name="WirelessEnabled" type="b" access="readwrite"/>
-    <property name="WirelessHardwareEnabled" type="b" access="read"/>
-    <property name="WwanEnabled" type="b" access="readwrite"/>
-    <property name="WwanHardwareEnabled" type="b" access="read"/>
-    <property name="ActiveConnections" type="ao" access="read"/>
-    <property name="Version" type="s" access="read"/>
-    <property name="State" type="u" access="read"/>
-
-    <signal name="StateChanged">
-      <arg name="state" type="u"/>
-    </signal>
-
-    <signal name="PropertiesChanged">
-      <arg name="properties" type="a{sv}"/>
-    </signal>
-
-    <signal name="DeviceAdded">
-      <arg name="state" type="o"/>
-    </signal>
-
-    <signal name="DeviceRemoved">
-      <arg name="state" type="o"/>
-    </signal>
-  </interface>
-</node>
diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml
index f281d9d2..5eb4614f 100644
--- a/introspection/nm-manager.xml
+++ b/introspection/nm-manager.xml
@@ -27,11 +27,6 @@
       <tp:docstring>
         Activate a connection using the supplied device.
       </tp:docstring>
-      <arg name="service_name" type="s" direction="in">
-        <tp:docstring>
-          The D-Bus service name of the settings service that provides this connection.
-        </tp:docstring>
-      </arg>
       <arg name="connection" type="o" direction="in">
         <tp:docstring>
           The connection to activate the devices with.
@@ -62,7 +57,6 @@
       <tp:possible-errors>
         <tp:error name="org.freedesktop.NetworkManager.Error.UnknownConnection"/>
         <tp:error name="org.freedesktop.NetworkManager.Error.UnknownDevice"/>
-        <tp:error name="org.freedesktop.NetworkManager.Error.InvalidService"/>
         <tp:error name="org.freedesktop.NetworkManager.Error.ConnectionActivating">
           <tp:docstring>Another connection is already activating or the same connection is already active.  FIXME: check if the error name is correct.  FIXME: split into 2 errors?</tp:docstring>
         </tp:error>
@@ -72,6 +66,55 @@
       </tp:possible-errors>
     </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
+        given device and specific object), then activate the new connection.
+        Cannot be used for VPN connections at this time.
+      </tp:docstring>
+      <arg name="connection" type="a{sa{sv}}" direction="in">
+        <tp:docstring>
+          Connection settings and properties; if incomplete missing settings will
+          be automatically completed using the given device and specific object.
+        </tp:docstring>
+      </arg>
+      <arg name="device" type="o" direction="in">
+        <tp:docstring>
+          The object path of device to be activated using the given connection.
+        </tp:docstring>
+      </arg>
+      <arg name="specific_object" type="o" direction="in">
+        <tp:docstring>
+          The path of a connection-type-specific object this activation should use. 
+          This parameter is currently ignored for wired and mobile broadband connections,
+          and the value of "/" should be used (ie, no specific object).  For WiFi
+          connections, pass the object path of a specific AP from the card's scan
+          list, which will be used to complete the details of the newly added
+          connection.
+        </tp:docstring>
+      </arg>
+      <arg name="path" type="o" direction="out">
+        <tp:docstring>
+          Object path of the new connection that was just added.
+        </tp:docstring>
+      </arg>
+      <arg name="active_connection" type="o" direction="out">
+        <tp:docstring>
+          The path of the active connection object representing this active connection.
+        </tp:docstring>
+      </arg>
+      <tp:possible-errors>
+        <tp:error name="org.freedesktop.NetworkManager.Error.UnknownConnection"/>
+        <tp:error name="org.freedesktop.NetworkManager.Error.UnknownDevice"/>
+        <tp:error name="org.freedesktop.NetworkManager.Error.ConnectionInvalid">
+          <tp:docstring>The connection is invalid for this device.</tp:docstring>
+        </tp:error>
+      </tp:possible-errors>
+    </method>
+
     <method name="DeactivateConnection">
       <tp:docstring>
         Deactivate an active connection.
@@ -169,6 +212,15 @@
       </arg>
     </method>
 
+    <method name="state">
+      <tp:docstring>
+        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="NetworkingEnabled" type="b" access="read">
       <tp:docstring>
         Indicates if overall networking is currently enabled or not.  See the
@@ -200,6 +252,18 @@
       </tp:docstring>
     </property>
 
+    <property name="WimaxEnabled" type="b" access="readwrite">
+      <tp:docstring>
+        Indicates if WiMAX devices are currently enabled or not.
+      </tp:docstring>
+    </property>
+
+    <property name="WimaxHardwareEnabled" type="b" access="read">
+      <tp:docstring>
+        Indicates if the WiMAX hardware is currently enabled, i.e. the state of the RF kill switch.
+      </tp:docstring>
+    </property>
+
     <property name="ActiveConnections" type="ao" access="read">
       <tp:docstring>
         List of active connection object paths.
@@ -268,67 +332,46 @@
       </tp:docstring>
       <tp:enumvalue suffix="UNKNOWN" value="0">
         <tp:docstring>
-          The NetworkManager daemon is in an unknown state.
+          Networking state is unknown.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="ASLEEP" value="1">
+      <tp:enumvalue suffix="ASLEEP" value="10">
         <tp:docstring>
-          The NetworkManager daemon is asleep and all interfaces managed by it are inactive.
+          Networking is inactive and all devices are disabled.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECTING" value="2">
+      <tp:enumvalue suffix="DISCONNECTED" value="20">
         <tp:docstring>
-          The NetworkManager daemon is connecting a device.  FIXME: What does this mean when one device is active and another is connecting?
+          There is no active network connection.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="CONNECTED" value="3">
+      <tp:enumvalue suffix="DISCONNECTING" value="30">
         <tp:docstring>
-          The NetworkManager daemon is connected.
+          Network connections are being cleaned up.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="DISCONNECTED" value="4">
+      <tp:enumvalue suffix="CONNECTING" value="40">
         <tp:docstring>
-          The NetworkManager daemon is disconnected.
+          A network device is connecting to a network and there is no other
+          available network connection.
         </tp:docstring>
       </tp:enumvalue>
-    </tp:enum>
-
-    <!-- Legacy methods to maintain backwards compatibility for 0.6 branch. -->
-
-    <signal name="StateChange">
-      <tp:docstring>
-        DEPRECATED.  NetworkManager's state changed.  Use the 'StateChanged' signal instead.
-      </tp:docstring>
-      <arg name="state" type="u" tp:type="NM_STATE">
+      <tp:enumvalue suffix="CONNECTED_LOCAL" value="50">
         <tp:docstring>
-          The new state of NetworkManager.
+          A network device is connected, but there is only link-local connectivity.
         </tp:docstring>
-      </arg>
-    </signal>
-
-    <method name="sleep">
-      <tp:docstring>
-        DEPRECATED.  Control the NetworkManager daemon's sleep state.  When asleep, all interfaces that it manages are deactivated.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_legacy_sleep"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-    </method>
-
-    <method name="wake">
-      <tp:docstring>
-        DEPRECATED.  Control the NetworkManager daemon's sleep state.  When awake, all known interfaces are available to be activated.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_legacy_wake"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-    </method>
-
-    <method name="state">
-      <tp:docstring>
-        DEPRECATED.  The overall state of the NetworkManager daemon.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_legacy_state"/>
-      <arg name="state" type="u" direction="out" tp:type="NM_STATE"/>
-    </method>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="CONNECTED_SITE" value="60">
+        <tp:docstring>
+          A network device is connected, but there is only site-local connectivity.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="CONNECTED_GLOBAL" value="70">
+        <tp:docstring>
+          A network device is connected, with global network connectivity.
+        </tp:docstring>
+      </tp:enumvalue>
+    </tp:enum>
 
   </interface>
 </node>
diff --git a/introspection/nm-secret-agent.xml b/introspection/nm-secret-agent.xml
new file mode 100644
index 00000000..9655c2b9
--- /dev/null
+++ b/introspection/nm-secret-agent.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+
+    <interface name="org.freedesktop.NetworkManager.SecretAgent">
+        <tp:docstring>
+            Private D-Bus interface used by secret agents that store and provide
+            secrets to NetworkManager.
+        </tp:docstring>
+
+        <method name="GetSecrets">
+            <tp:docstring>
+                Retrieve and return stored secrets, if any, or request new
+                secrets from the agent's user.
+            </tp:docstring>
+            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_get_secrets"/>
+            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+            <arg name="connection" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map">
+                <tp:docstring>
+                    Nested settings maps containing the connection for which
+                    secrets are being requested.  This may contain system-owned
+                    secrets if the agent has successfully authenticated to
+                    modify system network settings and the GetSecrets request
+                    flags allow user interaction.
+                </tp:docstring>
+            </arg>
+            <arg name="connection_path" type="o" direction="in">
+                <tp:docstring>
+                    Object path of the connection for which secrets are being
+                    requested.
+                </tp:docstring>
+            </arg>
+            <arg name="setting_name" type="s" direction="in">
+                <tp:docstring>
+                    Setting name for which secrets are being requested.
+                </tp:docstring>
+            </arg>
+            <arg name="hints" type="as" direction="in">
+                <tp:docstring>
+                    Array of strings of key names in the requested setting for
+                    which NetworkManager thinks a secrets may be required.  The
+                    Agent should return any secrets it has, or that it thinks
+                    are required, regardless of what hints NetworkManager sends
+                    in this request.
+                </tp:docstring>
+            </arg>
+            <arg name="flags" type="u" direction="in" tp:type="NM_SECRET_AGENT_GET_SECRETS_FLAGS">
+                <tp:docstring>
+                    Flags which modify the behavior of the secrets request.
+                    If true, new secrets are assumed to be invalid or incorrect,
+                    and the agent should ask the user for new secrets.  If false,
+                    existing secrets should be retrieved from storage and 
+                    returned without interrupting the user.
+                </tp:docstring>
+            </arg>
+
+            <arg name="secrets" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map">
+                <tp:docstring>
+                    Nested settings maps containing secrets.  Each setting MUST
+                    contain at least the 'name' field, containing the name of
+                    the setting, and one or more secrets.
+                </tp:docstring>
+            </arg>
+        </method>
+
+        <tp:flags name="NM_SECRET_AGENT_GET_SECRETS_FLAGS" value-prefix="NM_SECRET_AGENT_GET_SECRETS_FLAG" type="u">
+          <tp:docstring>
+            Flags modifying the behavior of GetSecrets request.
+          </tp:docstring>
+          <tp:flag suffix="NONE" value="0x0">
+            <tp:docstring>
+              No special behavior; by default no user interaction is allowed and
+              requests for secrets are fulfilled from persistent storage, or
+              if no secrets are available an error is returned.
+            </tp:docstring>
+          </tp:flag>
+          <tp:flag suffix="ALLOW_INTERACTION" value="0x1">
+            <tp:docstring>
+              Allows the request to interact with the user, possibly prompting
+              via UI for secrets if any are required, or if none are found in
+              persistent storage.
+            </tp:docstring>
+          </tp:flag>
+          <tp:flag suffix="REQUEST_NEW" value="0x2">
+            <tp:docstring>
+              Explicitly prompt for new secrets from the user.  This flag
+              signals that NetworkManager thinks any existing secrets are
+              invalid or wrong.  This flag implies that interaction is allowed.
+            </tp:docstring>
+          </tp:flag>
+        </tp:flags>
+
+        <method name="CancelGetSecrets">
+            <tp:docstring>
+                Cancel a pending GetSecrets request for secrets of the given
+                connection.  Any matching request should be canceled.
+            </tp:docstring>
+            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_cancel_get_secrets"/>
+            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+            <arg name="connection_path" type="o" direction="in">
+                <tp:docstring>
+                    Object path of the connection for which, if secrets are being
+                    requested, the request should be canceled.
+                </tp:docstring>
+            </arg>
+            <arg name="setting_name" type="s" direction="in">
+                <tp:docstring>
+                    Setting name for which secrets for this connection were
+                    originally being requested.
+                </tp:docstring>
+            </arg>
+        </method>
+
+        <method name="SaveSecrets">
+            <tp:docstring>
+                Save given secrets to backing storage.
+            </tp:docstring>
+            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_save_secrets"/>
+            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+            <arg name="connection" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map">
+                <tp:docstring>
+                    Nested settings maps containing the entire connection
+                    (including secrets), for which the agent should save the
+                    secrets to backing storage.
+                </tp:docstring>
+            </arg>
+            <arg name="connection_path" type="o" direction="in">
+                <tp:docstring>
+                    Object path of the connection for which the agent should
+                    save secrets to backing storage.
+                </tp:docstring>
+            </arg>
+        </method>
+
+        <method name="DeleteSecrets">
+            <tp:docstring>
+                Delete secrets from backing storage.
+            </tp:docstring>
+            <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_secret_agent_delete_secrets"/>
+            <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+            <arg name="connection" type="a{sa{sv}}" direction="in" tp:type="String_String_Variant_Map_Map">
+                <tp:docstring>
+                    Nested settings maps containing the connection properties
+                    (sans secrets), for which the agent should delete the
+                    secrets from backing storage.
+                </tp:docstring>
+            </arg>
+            <arg name="connection_path" type="o" direction="in">
+                <tp:docstring>
+                    Object path of the connection for which the agent should
+                    delete secrets from backing storage.
+                </tp:docstring>
+            </arg>
+        </method>
+
+    </interface>
+
+</node>
diff --git a/introspection/nm-exported-connection.xml b/introspection/nm-settings-connection.xml
index 46907c05..9089b009 100644
--- a/introspection/nm-exported-connection.xml
+++ b/introspection/nm-settings-connection.xml
@@ -2,20 +2,23 @@
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
-    <interface name="org.freedesktop.NetworkManagerSettings.Connection">
+    <interface name="org.freedesktop.NetworkManager.Settings.Connection">
         <tp:docstring>
             Represents a single network connection configuration.
         </tp:docstring>
 
         <method name="Update">
           <tp:docstring>
-            Update the connection with new settings and properties, replacing all previous settings and properties.
+            Update the connection with new settings and properties, replacing
+            all previous settings and properties.  Secrets may be part of the
+            update request, and will be either stored in persistent storage or
+            given to a Secret Agent for storage, depending on the request.
           </tp:docstring>
-          <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_exported_connection_update"/>
+          <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 properties.
+              New connection settings, properties, and (optionally) secrets.
             </tp:docstring>
           </arg>
         </method>
@@ -24,15 +27,19 @@
           <tp:docstring>
             Delete the connection.
           </tp:docstring>
-          <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_exported_connection_delete"/>
+          <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_connection_delete"/>
           <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
         </method>
 
         <method name="GetSettings">
             <tp:docstring>
-                Get the settings maps describing this object.
+                Get the settings maps describing this network configuration.
+                This will never include any secrets required for connection
+                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_exported_connection_get_settings"/>
+            <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.
@@ -40,60 +47,47 @@
             </arg>
         </method>
 
-        <signal name="Updated">
-            <tp:docstring>
-                Emitted when some settings changed.
-            </tp:docstring>
-            <arg name="settings" type="a{sa{sv}}" tp:type="String_String_Variant_Map_Map">
-                <tp:docstring>
-                    Contains complete connection setting parameters, including changes.
-                </tp:docstring>
-            </arg>
-        </signal>
-
-        <signal name="Removed">
-            <tp:docstring>
-                Emitted when this connection has been deleted/removed.  After receipt of this signal, the object no longer exists.
-            </tp:docstring>
-        </signal>
-
-    </interface>
-
-    <interface name="org.freedesktop.NetworkManagerSettings.Connection.Secrets">
-        <tp:docstring>
-            Secrets have a separate interface so that they can be locked down.
-        </tp:docstring>
-
         <method name="GetSecrets">
             <tp:docstring>
-                Get the secrets encapsulated in this object.
+                Get the secrets belonging to this network configuration.  Only
+                secrets from persistent storage or a Secret Agent running in
+                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_exported_connection_get_secrets"/>
+            <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.
-                </tp:docstring>
-            </arg>
-            <arg name="hints" type="as" direction="in">
-                <tp:docstring>
-                    Array of strings of key names in the Setting for which NM thinks
-                    a secrets may be required.
-                </tp:docstring>
-            </arg>
-            <arg name="request_new" type="b" direction="in">
-                <tp:docstring>
-                    Indicates whether new secrets should be requested or if the request can be fulfilled from storage.
+                    Name of the setting to return secrets for.  If empty, all
+                    all secrets will be returned.
                 </tp:docstring>
             </arg>
 
             <arg name="secrets" type="a{sa{sv}}" direction="out" tp:type="String_String_Variant_Map_Map">
                 <tp:docstring>
-                    Nested settings maps containing secrets.  Each setting MUST contain at least the 'name' field, containing the name of the setting, and one or more secrets.
+                    Nested settings maps containing secrets.
                 </tp:docstring>
             </arg>
         </method>
 
+        <signal name="Updated">
+            <tp:docstring>
+                Emitted when any settings or permissions change.  When handling
+                this signal, clients should re-read the connection using the
+                GetSettings method to get the changes and to ensure the client
+                still has permission to access the connection.
+            </tp:docstring>
+        </signal>
+
+        <signal name="Removed">
+            <tp:docstring>
+                Emitted when this connection is no longer available.  This
+                happens when the connection is deleted or if it is no longer
+                accessable by any of the system's logged-in users.  After
+                receipt of this signal, the object no longer exists.
+            </tp:docstring>
+        </signal>
+
     </interface>
 
 </node>
diff --git a/introspection/nm-settings-system.xml b/introspection/nm-settings-system.xml
deleted file mode 100644
index 598274c0..00000000
--- a/introspection/nm-settings-system.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManagerSettings.System">
-    <tp:docstring>
-      Implemented by the system settings service to provide additional settings to NetworkManager.
-    </tp:docstring>
-
-    <method name="SaveHostname">
-      <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.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <property name="Hostname" type="s" access="read">
-      <tp:docstring>
-        The machine hostname stored in persistent configuration.
-      </tp:docstring>
-    </property>
-
-    <property name="CanModify" type="b" access="read">
-      <tp:docstring>
-        If true, adding and modifying connections is supported.
-      </tp:docstring>
-    </property>
-
-    <signal name="PropertiesChanged">
-        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
-            <tp:docstring>
-                A dictionary mapping property names to variant boxed values
-            </tp:docstring>
-        </arg>
-    </signal>
-
-    <signal name="CheckPermissions">
-      <tp:docstring>
-        Emitted when system authorization details change, indicating that clients may wish to recheck permissions with GetPermissions.
-      </tp:docstring>
-    </signal>
-
-    <method name="GetPermissions">
-      <tp:docstring>
-        Returns a bitfield indicating certain operations the caller is permitted to perform.  Some of these operations may require authorization by the user.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_settings_get_permissions"/>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <arg name="permissions" type="u" direction="out" tp:type="NM_SETTINGS_SYSTEM_PERMISSIONS">
-        <tp:docstring>
-          A bitfield of permitted operations.  Some of these operations may require the user to authorize via password entry or other means.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <tp:flags name="NM_SETTINGS_SYSTEM_PERMISSIONS" value-prefix="NM_SETTINGS_SYSTEM_PERMISSION" type="u">
-      <tp:flag suffix="NONE" value="0x0">
-        <tp:docstring>No permissions.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="CONNECTION_MODIFY" value="0x1">
-        <tp:docstring>Can modify/add/delete connections.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="WIFI_SHARING_PROTECTED" value="0x2">
-        <tp:docstring>Can share connections via a encrypted user-created WiFi network.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="WIFI_SHARING_OPEN" value="0x4">
-        <tp:docstring>Can share connections via a open/unencrypted user-created WiFi network.</tp:docstring>
-      </tp:flag>
-      <tp:flag suffix="HOSTNAME_MODIFY" value="0x8">
-        <tp:docstring>Can modify the persistent system hostname.</tp:docstring>
-      </tp:flag>
-    </tp:flags>
-
-  </interface>
-</node>
-
diff --git a/introspection/nm-settings.xml b/introspection/nm-settings.xml
index b252c00d..f816b087 100644
--- a/introspection/nm-settings.xml
+++ b/introspection/nm-settings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.NetworkManagerSettings">
+  <interface name="org.freedesktop.NetworkManager.Settings">
     <tp:docstring>
-      The NetworkManagerSettings interface is provided by the service which provides connections to NetworkManager.
+      The Settings interface allows clients to view and administrate the connections stored and used by NetworkManager.
     </tp:docstring>
 
     <method name="ListConnections">
@@ -29,8 +29,46 @@
           Connection settings and properties.
         </tp:docstring>
       </arg>
+      <arg name="path" type="o" direction="out">
+        <tp:docstring>
+          Object path of the new connection that was just added.
+        </tp:docstring>
+      </arg>
     </method>
 
+    <method name="SaveHostname">
+      <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.
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <property name="Hostname" type="s" access="read">
+      <tp:docstring>
+        The machine hostname stored in persistent configuration.
+      </tp:docstring>
+    </property>
+
+    <property name="CanModify" type="b" access="read">
+      <tp:docstring>
+        If true, adding and modifying connections is supported.
+      </tp:docstring>
+    </property>
+
+    <signal name="PropertiesChanged">
+        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
+            <tp:docstring>
+                A dictionary mapping property names to variant boxed values
+            </tp:docstring>
+        </arg>
+    </signal>
+
     <signal name="NewConnection">
       <tp:docstring>
         Emitted when a new connection has been added.
diff --git a/introspection/nm-wimax-nsp.xml b/introspection/nm-wimax-nsp.xml
new file mode 100644
index 00000000..55ac4abc
--- /dev/null
+++ b/introspection/nm-wimax-nsp.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <interface name="org.freedesktop.NetworkManager.WiMax.Nsp">
+
+    <property name="Name" type="s" access="read">
+      <tp:docstring>The name of the NSP.</tp:docstring>
+    </property>
+    <property name="SignalQuality" type="u" access="read">
+      <tp:docstring>The current signal quality of the NSP, in percent.</tp:docstring>
+    </property>
+    <property name="NetworkType" type="u" access="read" tp:type="NM_WIMAX_NSP_NETWORK_TYPE">
+      <tp:docstring>The network type of the NSP.</tp:docstring>
+    </property>
+
+    <signal name="PropertiesChanged">
+        <arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
+            <tp:docstring>
+                A dictionary mapping property names to variant boxed values.
+            </tp:docstring>
+        </arg>
+    </signal>
+
+    <tp:flags name="NM_WIMAX_NSP_NETWORK_TYPE" value-prefix="NM_WIMAX_NSP_NETWORK_TYPE" type="u">
+      <tp:docstring>
+        Network type of the NSP.
+      </tp:docstring>
+      <tp:flag suffix="UNKNOWN" value="0x0">
+        <tp:docstring>Unknown network.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="HOME" value="0x1">
+        <tp:docstring>Home network.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="PARTNER" value="0x2">
+        <tp:docstring>Partner network.</tp:docstring>
+      </tp:flag>
+      <tp:flag suffix="ROAMING_PARTNER" value="0x3">
+        <tp:docstring>Roaming partner network.</tp:docstring>
+      </tp:flag>
+
+    </tp:flags>
+
+  </interface>
+</node>