From de06e5715e780baade318f3490ac7a4c9ce84e32 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 24 Mar 2012 01:37:02 +0100 Subject: Imported Upstream version 0.9.4.0 --- introspection/Makefile.am | 3 ++ introspection/Makefile.in | 12 +++++++ introspection/all.xml.in | 3 ++ introspection/nm-active-connection.xml | 3 ++ introspection/nm-device-bond.xml | 27 +++++++++++++++ introspection/nm-device-infiniband.xml | 27 +++++++++++++++ introspection/nm-device-vlan.xml | 33 ++++++++++++++++++ introspection/nm-device.xml | 62 ++++++++++++++++++++++++++++++++++ 8 files changed, 170 insertions(+) create mode 100644 introspection/nm-device-bond.xml create mode 100644 introspection/nm-device-infiniband.xml create mode 100644 introspection/nm-device-vlan.xml (limited to 'introspection') diff --git a/introspection/Makefile.am b/introspection/Makefile.am index 7b549c12..ea1c51ba 100644 --- a/introspection/Makefile.am +++ b/introspection/Makefile.am @@ -10,6 +10,9 @@ EXTRA_DIST = \ nm-device-ethernet.xml \ nm-device-modem.xml \ nm-device-wimax.xml \ + nm-device-infiniband.xml \ + nm-device-bond.xml \ + nm-device-vlan.xml \ nm-device.xml \ nm-ip4-config.xml \ nm-ip6-config.xml \ diff --git a/introspection/Makefile.in b/introspection/Makefile.in index 9e74d391..382cd5ab 100644 --- a/introspection/Makefile.in +++ b/introspection/Makefile.in @@ -108,6 +108,8 @@ GIO_LIBS = @GIO_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_LIBS = @GLIB_LIBS@ +GLIB_MAKEFILE = @GLIB_MAKEFILE@ +GLIB_MKENUMS = @GLIB_MKENUMS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMSGFMT = @GMSGFMT@ @@ -162,11 +164,15 @@ LIBNL2_LIBS = @LIBNL2_LIBS@ LIBNL3_CFLAGS = @LIBNL3_CFLAGS@ LIBNL3_LIBS = @LIBNL3_LIBS@ LIBNL_CFLAGS = @LIBNL_CFLAGS@ +LIBNL_GENL3_CFLAGS = @LIBNL_GENL3_CFLAGS@ +LIBNL_GENL3_LIBS = @LIBNL_GENL3_LIBS@ LIBNL_LIBS = @LIBNL_LIBS@ LIBNL_ROUTE3_CFLAGS = @LIBNL_ROUTE3_CFLAGS@ LIBNL_ROUTE3_LIBS = @LIBNL_ROUTE3_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ +LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ +LIBSOUP_LIBS = @LIBSOUP_LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ @@ -177,6 +183,7 @@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ +MOC = @MOC@ MSGFMT = @MSGFMT@ MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ @@ -216,6 +223,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ SYSTEM_CA_PATH = @SYSTEM_CA_PATH@ UDEV_BASE_DIR = @UDEV_BASE_DIR@ USE_NLS = @USE_NLS@ @@ -291,6 +300,9 @@ EXTRA_DIST = \ nm-device-ethernet.xml \ nm-device-modem.xml \ nm-device-wimax.xml \ + nm-device-infiniband.xml \ + nm-device-bond.xml \ + nm-device-vlan.xml \ nm-device.xml \ nm-ip4-config.xml \ nm-ip6-config.xml \ diff --git a/introspection/all.xml.in b/introspection/all.xml.in index bcb8d045..406140e9 100644 --- a/introspection/all.xml.in +++ b/introspection/all.xml.in @@ -34,6 +34,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + + diff --git a/introspection/nm-active-connection.xml b/introspection/nm-active-connection.xml index a150b2c8..ef01ab16 100644 --- a/introspection/nm-active-connection.xml +++ b/introspection/nm-active-connection.xml @@ -37,6 +37,9 @@ Whether this active connection is also a VPN connection. + + The path to the master device if the connection is a slave. + diff --git a/introspection/nm-device-bond.xml b/introspection/nm-device-bond.xml new file mode 100644 index 00000000..9d200ef8 --- /dev/null +++ b/introspection/nm-device-bond.xml @@ -0,0 +1,27 @@ + + + + + + + + Hardware address of the device. + + + + + + Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + diff --git a/introspection/nm-device-infiniband.xml b/introspection/nm-device-infiniband.xml new file mode 100644 index 00000000..097714c6 --- /dev/null +++ b/introspection/nm-device-infiniband.xml @@ -0,0 +1,27 @@ + + + + + + + + Hardware address of the device. + + + + + + Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + diff --git a/introspection/nm-device-vlan.xml b/introspection/nm-device-vlan.xml new file mode 100644 index 00000000..54b7bbe4 --- /dev/null +++ b/introspection/nm-device-vlan.xml @@ -0,0 +1,33 @@ + + + + + + + + Hardware address of the device. + + + + + + Indicates whether the physical carrier is found (e.g. whether a cable is plugged in or not). + + + + + + The VLAN ID of this VLAN interface. + + + + + + + A dictionary mapping property names to variant boxed values + + + + + + diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml index 5fdda96d..d12d4778 100644 --- a/introspection/nm-device.xml +++ b/introspection/nm-device.xml @@ -51,6 +51,11 @@ The current state of the device. + + + The current state and reason for changing to that state. + + Object path of an ActiveConnection object that "owns" this device during @@ -236,6 +241,21 @@ wireline data network. + + + The device is an IP-capable InfiniBand interface. + + + + + The device is a bond master interface. + + + + + The device is a VLAN interface. + + @@ -476,7 +496,49 @@ The Bluetooth connection timed out or failed. + + + GSM Modem's SIM Card not inserted. + + + + + GSM Modem's SIM Pin required. + + + + + GSM Modem's SIM Puk required. + + + + + GSM Modem's SIM wrong + + + + + InfiniBand device does not support connected mode. + + + + + A dependency of the connection failed. + + + + + + The device state. + + + + + The reason for originally changing to the device state. + + + -- cgit 1.3.0-6-gf8a5