From 867254ea7c2b193fecf8cd36cc6e5dc53c290d92 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 29 Jun 2012 20:12:44 +0200 Subject: Imported Upstream version 0.9.5.95 --- introspection/Makefile.am | 1 + introspection/Makefile.in | 12 +++++++++- introspection/all.xml.in | 1 + introspection/nm-device-adsl.xml | 21 ++++++++++++++++ introspection/nm-device-wifi.xml | 13 ++++++++++ introspection/nm-device.xml | 23 ++++++++++++++++++ introspection/nm-secret-agent.xml | 8 +++++++ introspection/nm-vpn-plugin.xml | 50 ++++++++++++++++++++++++++++++++++++++- 8 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 introspection/nm-device-adsl.xml (limited to 'introspection') 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. + 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 @@ + + + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + + Indicates whether the physical carrier is found. + + + + + 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 @@ + + + + + + Options of scan + + + + Request the device to scan + + + 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. + + + The version of the driver handling the device. + + + + + The firmware version for the device. + + Flags describing the capabilities of the device. @@ -91,6 +101,14 @@ Whether or not this device is managed by NetworkManager. + + + 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. + + If TRUE, indicates the device is likely missing firmware necessary for @@ -526,6 +544,11 @@ A dependency of the connection failed. + + + Problem with the RFC 2684 Ethernet over ADSL bridge. + + 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. + + + 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. + + 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 @@ + + + Set generic connection details on the connection. + + + + + Generic configuration details for the connection. + + + + Set IPv4 details on the connection. @@ -62,7 +74,21 @@ - Ip4Config details for the conneciton. + Ip4Config details for the connection. You must call + SetConfig() before calling this. + + + + + + + Set IPv6 details on the connection. + + + + + Ip6Config details for the connection. You must call + SetConfig() before calling this. @@ -96,6 +122,17 @@ + + + The plugin obtained generic configuration information. + + + + The configuration information. + + + + The plugin obtained an IPv4 configuration. @@ -107,6 +144,17 @@ + + + The plugin obtained an IPv6 configuration. + + + + The IPv6 configuration. + + + + Emitted when the plugin receives a login banner from the VPN service. -- cgit 1.3.0-6-gf8a5