diff options
Diffstat (limited to 'introspection')
| -rw-r--r-- | introspection/Makefile.in | 13 | ||||
| -rw-r--r-- | introspection/nm-device-ethernet.xml | 8 | ||||
| -rw-r--r-- | introspection/nm-device-wifi.xml | 9 | ||||
| -rw-r--r-- | introspection/nm-device.xml | 19 | ||||
| -rw-r--r-- | introspection/nm-manager-client.xml | 12 | ||||
| -rw-r--r-- | introspection/nm-manager.xml | 39 |
6 files changed, 95 insertions, 5 deletions
diff --git a/introspection/Makefile.in b/introspection/Makefile.in index e99bc4a0..3644aad6 100644 --- a/introspection/Makefile.in +++ b/introspection/Makefile.in @@ -48,6 +48,12 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -55,6 +61,7 @@ ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -75,6 +82,7 @@ DBUS_SYS_DIR = @DBUS_SYS_DIR@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DHCLIENT_PATH = @DHCLIENT_PATH@ +DHCLIENT_VERSION = @DHCLIENT_VERSION@ DHCPCD_PATH = @DHCPCD_PATH@ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DSYMUTIL = @DSYMUTIL@ @@ -116,6 +124,7 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ IPTABLES_PATH = @IPTABLES_PATH@ +KERNEL_FIRMWARE_DIR = @KERNEL_FIRMWARE_DIR@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDL = @LIBDL@ @@ -155,6 +164,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ 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@ @@ -211,7 +222,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -223,6 +233,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ +systemdsystemunitdir = @systemdsystemunitdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ diff --git a/introspection/nm-device-ethernet.xml b/introspection/nm-device-ethernet.xml index 5b7c88eb..000caf75 100644 --- a/introspection/nm-device-ethernet.xml +++ b/introspection/nm-device-ethernet.xml @@ -5,7 +5,13 @@ <property name="HwAddress" type="s" access="read"> <tp:docstring> - Hardware address of the device. + Active hardware address of the device. + </tp:docstring> + </property> + + <property name="PermHwAddress" type="s" access="read"> + <tp:docstring> + Permanent hardware address of the device. </tp:docstring> </property> diff --git a/introspection/nm-device-wifi.xml b/introspection/nm-device-wifi.xml index 21ace0a4..fb507624 100644 --- a/introspection/nm-device-wifi.xml +++ b/introspection/nm-device-wifi.xml @@ -16,9 +16,16 @@ <property name="HwAddress" type="s" access="read"> <tp:docstring> - The hardware address of the device. + The active hardware address of the device. </tp:docstring> </property> + + <property name="PermHwAddress" type="s" access="read"> + <tp:docstring> + The permanent hardware address of the device. + </tp:docstring> + </property> + <property name="Mode" type="u" access="read" tp:type="NM_802_11_MODE"> <tp:docstring> The operating mode of the wireless device. diff --git a/introspection/nm-device.xml b/introspection/nm-device.xml index 0d0a9508..016c121e 100644 --- a/introspection/nm-device.xml +++ b/introspection/nm-device.xml @@ -9,7 +9,15 @@ </property> <property name="Interface" type="s" access="read"> <tp:docstring> - The network interface offered by the device. + The name of the device's control (and often data) interface. + </tp:docstring> + </property> + <property name="IpInterface" type="s" access="read"> + <tp:docstring> + The name of the device's data interface when available. This property + may not refer to the actual data interface until the device has + successfully established a data connection, indicated by the device's + State becoming ACTIVATED. </tp:docstring> </property> <property name="Driver" type="s" access="read"> @@ -52,6 +60,12 @@ Whether or not this device is managed by NetworkManager. </tp:docstring> </property> + <property name="FirmwareMissing" type="b" access="read"> + <tp:docstring> + If TRUE, indicates the device is likely missing firmware necessary for + its operation. + </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. @@ -59,10 +73,11 @@ </property> <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> - <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_disconnect"/> </method> <signal name="StateChanged"> diff --git a/introspection/nm-manager-client.xml b/introspection/nm-manager-client.xml index 7a9e311c..24e4a29e 100644 --- a/introspection/nm-manager-client.xml +++ b/introspection/nm-manager-client.xml @@ -31,25 +31,37 @@ object. dbus-glib generates the same bound function names for D-Bus the methods <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"> diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml index 46db5afd..f281d9d2 100644 --- a/introspection/nm-manager.xml +++ b/introspection/nm-manager.xml @@ -77,6 +77,7 @@ 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. @@ -86,6 +87,7 @@ <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 @@ -101,6 +103,7 @@ <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, @@ -116,6 +119,34 @@ </arg> </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 + WiFi, WWAN, and WiMAX state, etc. + </tp:docstring> + <arg name="permissions" type="a{ss}" direction="out"> + <tp:docstring> + Dictionary of available permissions and results. Each permission + is represented by a name (ie "org.freedesktop.NetworkManager.Foobar") + and each result is one of the following values: "yes" (the permission + is available), "auth" (the permission is available after a successful + authentication), or "no" (the permission is denied). Clients may use + these values in the UI to indicate the ability to perform certain + operations. + </tp:docstring> + </arg> + </method> + + <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="SetLogging"> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_set_logging"/> <tp:docstring> @@ -175,6 +206,12 @@ </tp:docstring> </property> + <property name="Version" type="s" access="read"> + <tp:docstring> + NetworkManager version. + </tp:docstring> + </property> + <property name="State" type="u" access="read" tp:type="NM_STATE"> <tp:docstring> The overall state of the NetworkManager daemon. @@ -274,6 +311,7 @@ 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"> @@ -281,6 +319,7 @@ 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"> |