diff --git a/.gitignore b/.gitignore index 78a9130a24..6ca88f8067 100644 --- a/.gitignore +++ b/.gitignore @@ -138,7 +138,6 @@ test-*.trs /shared/nm-version-macros.h -/introspection/all.xml /introspection/nmdbus-*.c /introspection/nmdbus-*.h /introspection/nmdbus-*.xml diff --git a/configure.ac b/configure.ac index 35193c5e32..6446f3f079 100644 --- a/configure.ac +++ b/configure.ac @@ -1075,7 +1075,6 @@ clients/cli/Makefile clients/tui/Makefile clients/tui/newt/Makefile introspection/Makefile -introspection/all.xml man/Makefile man/common.ent po/Makefile.in diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index 957977239d..aeba9d29b0 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -3,13 +3,6 @@ AUTOMAKE_OPTIONS = 1.7 XSLTPROC = xsltproc --xinclude --nonet XMLS = $(wildcard $(top_srcdir)/introspection/nm-*.xml) -OTHER_FILES= \ - $(top_builddir)/introspection/all.xml \ - $(top_srcdir)/introspection/generic-types.xml \ - $(top_srcdir)/introspection/errors.xml \ - $(top_srcdir)/introspection/vpn-errors.xml \ - $(top_srcdir)/introspection/generic-types.xml - GENERATED_FILES = if SETTING_DOCS_AVAILABLE diff --git a/introspection/Makefile.am b/introspection/Makefile.am index 4d2e129834..3a627930b9 100644 --- a/introspection/Makefile.am +++ b/introspection/Makefile.am @@ -136,10 +136,6 @@ BUILT_SOURCES = $(nodist_libnmdbus_la_SOURCES) $(DBUS_INTERFACE_DOCS) CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = \ - all.xml.in \ - generic-types.xml \ - errors.xml \ - vpn-errors.xml \ nm-access-point.xml \ nm-active-connection.xml \ nm-agent-manager.xml \ diff --git a/introspection/all.xml.in b/introspection/all.xml.in deleted file mode 100644 index 273c0fda4d..0000000000 --- a/introspection/all.xml.in +++ /dev/null @@ -1,74 +0,0 @@ - - -NetworkManager D-Bus Interface Specification -@VERSION@ - - -Copyright (C) 2008 - 2016 Red Hat, Inc. -Copyright (C) 2008 - 2009 Novell, Inc. - - -

This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version.

- -

This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details.

- -

You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/introspection/errors.xml b/introspection/errors.xml deleted file mode 100644 index 34a0a7b96f..0000000000 --- a/introspection/errors.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - Copyright (C) 2008 Novell, Inc. - - - - - - - - - - - - - - diff --git a/introspection/generic-types.xml b/introspection/generic-types.xml deleted file mode 100644 index 2fb680af92..0000000000 --- a/introspection/generic-types.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/introspection/vpn-errors.xml b/introspection/vpn-errors.xml deleted file mode 100644 index c1e02aacb2..0000000000 --- a/introspection/vpn-errors.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index d76c564061..d576c703ab 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/libnm-core/nm-dbus-interface.h @@ -94,8 +94,6 @@ * @NM_STATE_CONNECTED_GLOBAL: there is global IPv4 and/or IPv6 Internet connectivity * * #NMState values indicate the current overall networking state. - * - * (Corresponds to the NM_STATE type in nm-manager.xml.) **/ typedef enum { NM_STATE_UNKNOWN = 0, @@ -118,8 +116,6 @@ typedef enum { * does not appear to be able to reach the full Internet. * @NM_CONNECTIVITY_FULL: The host is connected to a network, and * appears to be able to reach the full Internet. - * - * (Corresponds to the NM_CONNECTIVITY type in nm-manager.xml.) */ typedef enum { NM_CONNECTIVITY_UNKNOWN, @@ -156,8 +152,6 @@ typedef enum { * * #NMDeviceType values indicate the type of hardware represented by * an #NMDevice. - * - * (Corresponds to the NM_DEVICE_TYPE type in nm-device.xml.) **/ typedef enum { NM_DEVICE_TYPE_UNKNOWN = 0, @@ -191,8 +185,6 @@ typedef enum { * @NM_DEVICE_CAP_IS_SOFTWARE: this device is a software device * * General device capability flags. - * - * (Corresponds to the NM_DEVICE_CAP type in nm-device-wifi.xml.) **/ typedef enum { /*< flags >*/ NM_DEVICE_CAP_NONE = 0x00000000, @@ -218,8 +210,6 @@ typedef enum { /*< flags >*/ * @NM_WIFI_DEVICE_CAP_FREQ_5GHZ: device supports 5GHz frequencies * * 802.11 specific device encryption and authentication capabilities. - * - * (Corresponds to the NM_802_11_DEVICE_CAP type in nm-device-wifi.xml.) **/ typedef enum { /*< flags >*/ NM_WIFI_DEVICE_CAP_NONE = 0x00000000, @@ -244,8 +234,6 @@ typedef enum { /*< flags >*/ * encryption (usually means WEP) * * 802.11 access point flags. - * - * (Corresponds to the NM_802_11_AP_FLAGS type in nm-access-point.xml.) **/ typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/ NM_802_11_AP_FLAGS_NONE = 0x00000000, @@ -276,8 +264,6 @@ typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/ * 802.11 access point security and authentication flags. These flags describe * the current security requirements of an access point as determined from the * access point's beacon. - * - * (Corresponds to the NM_802_11_AP_SEC type in nm-access-point.xml.) **/ typedef enum { /*< underscore_name=nm_802_11_ap_security_flags, flags >*/ NM_802_11_AP_SEC_NONE = 0x00000000, @@ -307,8 +293,6 @@ typedef enum { /*< underscore_name=nm_802_11_ap_security_flags, flags >*/ * access point objects; used only for hotspot mode on the local machine. * * Indicates the 802.11 mode an access point or device is currently in. - * - * (Corresponds to the NM_802_11_MODE type in generic-types.xml.) **/ typedef enum { /*< underscore_name=nm_802_11_mode >*/ NM_802_11_MODE_UNKNOWN = 0, @@ -325,8 +309,6 @@ typedef enum { /*< underscore_name=nm_802_11_mode >*/ * * #NMBluetoothCapabilities values indicate the usable capabilities of a * Bluetooth device. - * - * (Corresponds to the NM_BT_CAPABILITY type in nm-device-bt.xml.) **/ typedef enum { /*< flags >*/ NM_BT_CAPABILITY_NONE = 0x00000000, @@ -349,8 +331,6 @@ typedef enum { /*< flags >*/ * technology families a modem device supports. For more information on the * specific access technologies the device supports use the ModemManager D-Bus * API. - * - * (Corresponds to the NM_DEVICE_MODEM_CAPABILITY type in nm-device-modem.xml.) **/ typedef enum { /*< flags >*/ NM_DEVICE_MODEM_CAPABILITY_NONE = 0x00000000, @@ -398,8 +378,6 @@ typedef enum { /*< flags >*/ * that connection. The network connection may still be valid. * @NM_DEVICE_STATE_FAILED: the device failed to connect to the requested * network and is cleaning up the connection request - * - * (Corresponds to the NM_DEVICE_STATE type in nm-device.xml.) **/ typedef enum { NM_DEVICE_STATE_UNKNOWN = 0, @@ -484,8 +462,6 @@ typedef enum { * @NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED: the device parent's management changed * * Device state change reason codes - * - * (Corresponds to the NM_DEVICE_STATE_REASON type in nm-device.xml.) */ typedef enum { NM_DEVICE_STATE_REASON_NONE = 0, @@ -561,8 +537,6 @@ typedef enum { * @NM_METERED_GUESS_YES: Metered, the value was guessed * @NM_METERED_GUESS_NO: Not metered, the value was guessed * - * (Corresponds to the NM_METERED type in nm-device.xml.) - * * Since: 1.2 **/ NM_AVAILABLE_IN_1_2 @@ -587,8 +561,6 @@ typedef enum { * #NMActiveConnectionState values indicate the state of a connection to a * specific network while it is starting, connected, or disconnecting from that * network. - * - * (Corresponds to the NM_ACTIVE_CONNECTION_STATE type in nm-active-connection.xml.) **/ typedef enum { NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0, @@ -620,8 +592,6 @@ typedef enum { * the D-Bus API. * * #NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request. - * - * (Corresponds to the NM_SECRET_AGENT_GET_SECRETS_FLAGS type in nm-secret-agent.xml.) */ typedef enum { /*< flags >*/ NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE = 0x0, @@ -642,8 +612,6 @@ typedef enum { /*< flags >*/ * @NM_SECRET_AGENT_CAPABILITY_LAST: bounds checking value; should not be used. * * #NMSecretAgentCapabilities indicate various capabilities of the agent. - * - * (Corresponds to the NM_SECRET_AGENT_CAPABILITIES type in nm-secret-agent.xml.) */ typedef enum /*< flags >*/ { NM_SECRET_AGENT_CAPABILITY_NONE = 0x0, diff --git a/libnm-core/nm-vpn-dbus-interface.h b/libnm-core/nm-vpn-dbus-interface.h index c4099be2ad..9226458d30 100644 --- a/libnm-core/nm-vpn-dbus-interface.h +++ b/libnm-core/nm-vpn-dbus-interface.h @@ -78,8 +78,6 @@ * @NM_VPN_SERVICE_STATE_STOPPED: The plugin has disconnected from the VPN server. * * VPN daemon states - * - * (Corresponds to the NM_VPN_SERVICE_STATE type in nm-vpn-connection.xml.) */ typedef enum { NM_VPN_SERVICE_STATE_UNKNOWN = 0, @@ -108,8 +106,6 @@ typedef enum { * @NM_VPN_CONNECTION_STATE_DISCONNECTED: The VPN connection is disconnected. * * VPN connection states - * - * (Corresponds to the NM_VPN_CONNECTION_STATE type in nm-vpn-connection.xml.) */ typedef enum { NM_VPN_CONNECTION_STATE_UNKNOWN = 0, @@ -150,8 +146,6 @@ typedef enum { * deleted from settings. * * VPN connection state reasons - * - * (Corresponds to the NM_VPN_CONNECTION_STATE_REASON type in nm-vpn-connection.xml.) */ typedef enum { NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0, @@ -176,8 +170,6 @@ typedef enum { * the VPN plugin. * * VPN plugin failure reasons - * - * (Corresponds to the NM_VPN_PLUGIN_FAILURE type in nm-vpn-plugin.xml.) */ typedef enum { NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED, diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h index c4105fd4c0..9053fad27b 100644 --- a/libnm-util/NetworkManager.h +++ b/libnm-util/NetworkManager.h @@ -92,8 +92,6 @@ * @NM_STATE_CONNECTED_GLOBAL: there is global IPv4 and/or IPv6 Internet connectivity * * #NMState values indicate the current overall networking state. - * - * (Corresponds to the NM_STATE type in nm-manager.xml.) **/ typedef enum { NM_STATE_UNKNOWN = 0, @@ -120,8 +118,6 @@ typedef enum { * @NM_CONNECTIVITY_FULL: The host is connected to a network, and * appears to be able to reach the full Internet. * - * (Corresponds to the NM_CONNECTIVITY type in nm-manager.xml.) - * * Since: 0.9.8.6 */ typedef enum { @@ -159,8 +155,6 @@ typedef enum { * * #NMDeviceType values indicate the type of hardware represented by * an #NMDevice. - * - * (Corresponds to the NM_DEVICE_TYPE type in nm-device.xml.) **/ typedef enum { NM_DEVICE_TYPE_UNKNOWN = 0, @@ -194,8 +188,6 @@ typedef enum { * @NM_DEVICE_CAP_IS_SOFTWARE: this device is a software device * * General device capability flags. - * - * (Corresponds to the NM_DEVICE_CAP type in nm-device-wifi.xml.) **/ typedef enum { /*< flags >*/ NM_DEVICE_CAP_NONE = 0x00000000, @@ -221,8 +213,6 @@ typedef enum { /*< flags >*/ * @NM_WIFI_DEVICE_CAP_FREQ_5GHZ: device supports 5GHz frequencies * * 802.11 specific device encryption and authentication capabilities. - * - * (Corresponds to the NM_802_11_DEVICE_CAP type in nm-device-wifi.xml.) **/ typedef enum { /*< flags >*/ NM_WIFI_DEVICE_CAP_NONE = 0x00000000, @@ -247,8 +237,6 @@ typedef enum { /*< flags >*/ * encryption (usually means WEP) * * 802.11 access point flags. - * - * (Corresponds to the NM_802_11_AP_FLAGS type in nm-access-point.xml.) **/ typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/ NM_802_11_AP_FLAGS_NONE = 0x00000000, @@ -279,8 +267,6 @@ typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/ * 802.11 access point security and authentication flags. These flags describe * the current security requirements of an access point as determined from the * access point's beacon. - * - * (Corresponds to the NM_802_11_AP_SEC type in nm-access-point.xml.) **/ typedef enum { /*< underscore_name=nm_802_11_ap_security_flags, flags >*/ NM_802_11_AP_SEC_NONE = 0x00000000, @@ -310,8 +296,6 @@ typedef enum { /*< underscore_name=nm_802_11_ap_security_flags, flags >*/ * access point objects; used only for hotspot mode on the local machine. * * Indicates the 802.11 mode an access point or device is currently in. - * - * (Corresponds to the NM_802_11_MODE type in generic-types.xml.) **/ typedef enum { /*< underscore_name=nm_802_11_mode >*/ NM_802_11_MODE_UNKNOWN = 0, @@ -328,8 +312,6 @@ typedef enum { /*< underscore_name=nm_802_11_mode >*/ * * #NMBluetoothCapabilities values indicate the usable capabilities of a * Bluetooth device. - * - * (Corresponds to the NM_BT_CAPABILITY type in nm-device-bt.xml.) **/ typedef enum { /*< flags >*/ NM_BT_CAPABILITY_NONE = 0x00000000, @@ -352,8 +334,6 @@ typedef enum { /*< flags >*/ * technology families a modem device supports. For more information on the * specific access technologies the device supports use the ModemManager D-Bus * API. - * - * (Corresponds to the NM_DEVICE_MODEM_CAPABILITY type in nm-device-modem.xml.) **/ typedef enum { /*< flags >*/ NM_DEVICE_MODEM_CAPABILITY_NONE = 0x00000000, @@ -401,8 +381,6 @@ typedef enum { /*< flags >*/ * that connection. The network connection may still be valid. * @NM_DEVICE_STATE_FAILED: the device failed to connect to the requested * network and is cleaning up the connection request - * - * (Corresponds to the NM_DEVICE_STATE type in nm-device.xml.) **/ typedef enum { NM_DEVICE_STATE_UNKNOWN = 0, @@ -488,8 +466,6 @@ typedef enum { * @NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED: the device parent's management changed * * Device state change reason codes - * - * (Corresponds to the NM_DEVICE_STATE_REASON type in nm-device.xml.) */ typedef enum { NM_DEVICE_STATE_REASON_NONE = 0, @@ -573,8 +549,6 @@ typedef enum { * #NMActiveConnectionState values indicate the state of a connection to a * specific network while it is starting, connected, or disconnecting from that * network. - * - * (Corresponds to the NM_ACTIVE_CONNECTION_STATE type in nm-active-connection.xml.) **/ typedef enum { NM_ACTIVE_CONNECTION_STATE_UNKNOWN = 0, diff --git a/libnm-util/NetworkManagerVPN.h b/libnm-util/NetworkManagerVPN.h index 882d39739c..756619864f 100644 --- a/libnm-util/NetworkManagerVPN.h +++ b/libnm-util/NetworkManagerVPN.h @@ -78,8 +78,6 @@ * @NM_VPN_SERVICE_STATE_STOPPED: The plugin has disconnected from the VPN server. * * VPN daemon states - * - * (Corresponds to the NM_VPN_SERVICE_STATE type in nm-vpn-connection.xml.) */ typedef enum NMVPNServiceState { NM_VPN_SERVICE_STATE_UNKNOWN = 0, @@ -108,8 +106,6 @@ typedef enum NMVPNServiceState { * @NM_VPN_CONNECTION_STATE_DISCONNECTED: The VPN connection is disconnected. * * VPN connection states - * - * (Corresponds to the NM_VPN_CONNECTION_STATE type in nm-vpn-connection.xml.) */ typedef enum NMVPNConnectionState { NM_VPN_CONNECTION_STATE_UNKNOWN = 0, @@ -150,8 +146,6 @@ typedef enum NMVPNConnectionState { * deleted from settings. * * VPN connection state reasons - * - * (Corresponds to the NM_VPN_CONNECTION_STATE_REASON type in nm-vpn-connection.xml.) */ typedef enum NMVPNConnectionStateReason { NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0, @@ -176,8 +170,6 @@ typedef enum NMVPNConnectionStateReason { * the VPN plugin. * * VPN plugin failure reasons - * - * (Corresponds to the NM_VPN_PLUGIN_FAILURE type in nm-vpn-plugin.xml.) */ typedef enum { NM_VPN_PLUGIN_FAILURE_LOGIN_FAILED,