Imported Upstream version 0.9.5.95 upstream/0.9.5.95

8 files changed, 127 insertions, 2 deletions

diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index ea1c51ba..a267b51a 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -8,6 +8,7 @@ EXTRA_DIST = \
 	nm-device-wifi.xml \
 	nm-device-olpc-mesh.xml \
 	nm-device-ethernet.xml \
+	nm-device-adsl.xml \
 	nm-device-modem.xml \
 	nm-device-wimax.xml \
 	nm-device-infiniband.xml \
diff --git a/introspection/Makefile.in b/introspection/Makefile.in
index 382cd5ab..31078f0f 100644
--- a/introspection/Makefile.in
+++ b/introspection/Makefile.in
@@ -47,7 +47,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.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
+	$(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -135,6 +135,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
 INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
@@ -230,6 +234,9 @@ UDEV_BASE_DIR = @UDEV_BASE_DIR@
 USE_NLS = @USE_NLS@
 UUID_CFLAGS = @UUID_CFLAGS@
 UUID_LIBS = @UUID_LIBS@
+VAPIGEN = @VAPIGEN@
+VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@
+VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
@@ -268,6 +275,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -298,6 +307,7 @@ EXTRA_DIST = \
 	nm-device-wifi.xml \
 	nm-device-olpc-mesh.xml \
 	nm-device-ethernet.xml \
+	nm-device-adsl.xml \
 	nm-device-modem.xml \
 	nm-device-wimax.xml \
 	nm-device-infiniband.xml \
diff --git a/introspection/all.xml.in b/introspection/all.xml.in
index 406140e9..e9e7b0e0 100644
--- a/introspection/all.xml.in
+++ b/introspection/all.xml.in
@@ -37,6 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
 <xi:include href="nm-device-infiniband.xml"/>
 <xi:include href="nm-device-bond.xml"/>
 <xi:include href="nm-device-vlan.xml"/>
+<xi:include href="nm-device-adsl.xml"/>
 <xi:include href="nm-wimax-nsp.xml"/>
 <xi:include href="nm-ip4-config.xml"/>
 <xi:include href="nm-ip6-config.xml"/>
diff --git a/introspection/nm-device-adsl.xml b/introspection/nm-device-adsl.xml
new file mode 100644
index 00000000..ec50d110
--- /dev/null
+++ b/introspection/nm-device-adsl.xml
@@ -0,0 +1,21 @@
+<?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.Adsl">
+
+    <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="Carrier" type="b" access="read">
+      <tp:docstring>
+        Indicates whether the physical carrier is found.
+      </tp:docstring>
+    </property>
+
+  </interface>
+</node>
diff --git a/introspection/nm-device-wifi.xml b/introspection/nm-device-wifi.xml
index fb507624..531fc893 100644
--- a/introspection/nm-device-wifi.xml
+++ b/introspection/nm-device-wifi.xml
@@ -14,6 +14,19 @@
       </tp:docstring>
     </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
+        </tp:docstring>
+      </arg>
+      <tp:docstring>
+        Request the device to scan
+      </tp:docstring>
+    </method>
+
     <property name="HwAddress" type="s" access="read">
       <tp:docstring>
         The active hardware address of the device.
diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml
index d12d4778..7f6a0a07 100644
--- a/introspection/nm-device.xml
+++ b/introspection/nm-device.xml
@@ -36,6 +36,16 @@
         The driver handling the device.
       </tp:docstring>
     </property>
+    <property name="DriverVersion" type="s" access="read">
+      <tp:docstring>
+        The version of the driver handling the device.
+      </tp:docstring>
+    </property>
+    <property name="FirmwareVersion" type="s" access="read">
+      <tp:docstring>
+        The firmware version for the device.
+      </tp:docstring>
+    </property>
     <property name="Capabilities" type="u" access="read" tp:type="NM_DEVICE_CAP">
       <tp:docstring>
         Flags describing the capabilities of the device.
@@ -91,6 +101,14 @@
         Whether or not this device is managed by NetworkManager.
       </tp:docstring>
     </property>
+    <property name="Autoconnect" type="b" access="readwrite">
+      <tp:docstring>
+        If TRUE, indicates the device is allowed to autoconnect.  If FALSE,
+        manual intervention is required before the device will automatically
+        connect to a known network, such as activating a connection using the
+        device, or setting this property to TRUE.
+      </tp:docstring>
+    </property>
     <property name="FirmwareMissing" type="b" access="read">
       <tp:docstring>
         If TRUE, indicates the device is likely missing firmware necessary for
@@ -526,6 +544,11 @@
           A dependency of the connection failed.
         </tp:docstring>
       </tp:enumvalue>
+      <tp:enumvalue suffix="BR2684_FAILED" value="50">
+        <tp:docstring>
+          Problem with the RFC 2684 Ethernet over ADSL bridge.
+        </tp:docstring>
+      </tp:enumvalue>
     </tp:enum>
 
     <tp:struct name="NM_DEVICE_STATE_REASON_STRUCT">
diff --git a/introspection/nm-secret-agent.xml b/introspection/nm-secret-agent.xml
index 0a67efdc..81a1321b 100644
--- a/introspection/nm-secret-agent.xml
+++ b/introspection/nm-secret-agent.xml
@@ -96,6 +96,14 @@
               invalid or wrong.  This flag implies that interaction is allowed.
             </tp:docstring>
           </tp:flag>
+          <tp:flag suffix="USER_REQUESTED" value="0x4">
+            <tp:docstring>
+              Set if the request was initiated by user-requested action via the
+              D-Bus interface, as opposed to automatically initiated by
+              NetworkManager in response to (for example) scan results or
+              carrier changes.
+            </tp:docstring>
+          </tp:flag>
         </tp:flags>
 
         <method name="CancelGetSecrets">
diff --git a/introspection/nm-vpn-plugin.xml b/introspection/nm-vpn-plugin.xml
index 72861f26..5fb11622 100644
--- a/introspection/nm-vpn-plugin.xml
+++ b/introspection/nm-vpn-plugin.xml
@@ -55,6 +55,18 @@
       </tp:possible-errors>
     </method>
 
+    <method name="SetConfig">
+      <tp:docstring>
+        Set generic connection details on the connection.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_set_config"/>
+      <arg name="config" type="a{sv}" direction="in" tp:type="String_Variant_Map">
+        <tp:docstring>
+          Generic configuration details for the connection.
+        </tp:docstring>
+      </arg>
+    </method>
+
     <method name="SetIp4Config">
       <tp:docstring>
         Set IPv4 details on the connection.
@@ -62,7 +74,21 @@
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_set_ip4_config"/>
       <arg name="config" type="a{sv}" direction="in" tp:type="String_Variant_Map">
         <tp:docstring>
-          Ip4Config details for the conneciton.
+          Ip4Config details for the connection. You must call
+	  SetConfig() before calling this.
+        </tp:docstring>
+      </arg>
+    </method>
+
+    <method name="SetIp6Config">
+      <tp:docstring>
+        Set IPv6 details on the connection.
+      </tp:docstring>
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_vpn_plugin_set_ip6_config"/>
+      <arg name="config" type="a{sv}" direction="in" tp:type="String_Variant_Map">
+        <tp:docstring>
+          Ip6Config details for the connection. You must call
+	  SetConfig() before calling this.
         </tp:docstring>
       </arg>
     </method>
@@ -96,6 +122,17 @@
       </arg>
     </signal>
 
+    <signal name="Config">
+      <tp:docstring>
+        The plugin obtained generic configuration information.
+      </tp:docstring>
+      <arg name="config" type="a{sv}" tp:type="String_Variant_Map">
+        <tp:docstring>
+          The configuration information.
+        </tp:docstring>
+      </arg>
+    </signal>
+
     <signal name="Ip4Config">
       <tp:docstring>
         The plugin obtained an IPv4 configuration.
@@ -107,6 +144,17 @@
       </arg>
     </signal>
 
+    <signal name="Ip6Config">
+      <tp:docstring>
+        The plugin obtained an IPv6 configuration.
+      </tp:docstring>
+      <arg name="ip6config" type="a{sv}" tp:type="String_Variant_Map">
+        <tp:docstring>
+          The IPv6 configuration.
+        </tp:docstring>
+      </arg>
+    </signal>
+
     <signal name="LoginBanner">
       <tp:docstring>
         Emitted when the plugin receives a login banner from the VPN service.