diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2016-04-04 23:51:45 +0200 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-04-05 14:37:51 +0200 |
commit | ccf1d5bd94f61a53f4a954693985957c1a08e6e4 (patch) | |
tree | 20d6a97f8264f52af66188ee3182a23ef0ac91d1 /introspection | |
parent | 0fc0cc68fc976f2e70befd23b9839969d731160a (diff) | |
download | NetworkManager-ccf1d5bd94f61a53f4a954693985957c1a08e6e4.tar.gz |
dbus: remove the telepathy annotations
We now generate documentation with gdbus-codegen and these are now
useless.
Diffstat (limited to 'introspection')
-rw-r--r-- | introspection/Makefile.am | 4 | ||||
-rw-r--r-- | introspection/all.xml.in | 74 | ||||
-rw-r--r-- | introspection/errors.xml | 24 | ||||
-rw-r--r-- | introspection/generic-types.xml | 50 | ||||
-rw-r--r-- | introspection/vpn-errors.xml | 60 |
5 files changed, 0 insertions, 212 deletions
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 @@ -<tp:spec - xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0" - xmlns:xi="http://www.w3.org/2001/XInclude"> - -<tp:title>NetworkManager D-Bus Interface Specification</tp:title> -<tp:version>@VERSION@</tp:version> - - -<tp:copyright>Copyright (C) 2008 - 2016 Red Hat, Inc.</tp:copyright> -<tp:copyright>Copyright (C) 2008 - 2009 Novell, Inc.</tp:copyright> - -<tp:license xmlns="http://www.w3.org/1999/xhtml"> -<p>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.</p> - -<p>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.</p> - -<p>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.</p> -</tp:license> - -<xi:include href="nm-manager.xml"/> -<xi:include href="nm-access-point.xml"/> -<xi:include href="nm-device.xml"/> -<xi:include href="nm-device-adsl.xml"/> -<xi:include href="nm-device-bond.xml"/> -<xi:include href="nm-device-bridge.xml"/> -<xi:include href="nm-device-bt.xml"/> -<xi:include href="nm-device-ethernet.xml"/> -<xi:include href="nm-device-generic.xml"/> -<xi:include href="nm-device-infiniband.xml"/> -<xi:include href="nm-device-ip-tunnel.xml"/> -<xi:include href="nm-device-macvlan.xml"/> -<xi:include href="nm-device-modem.xml"/> -<xi:include href="nm-device-olpc-mesh.xml"/> -<xi:include href="nm-device-team.xml"/> -<xi:include href="nm-device-tun.xml"/> -<xi:include href="nm-device-veth.xml"/> -<xi:include href="nm-device-vlan.xml"/> -<xi:include href="nm-device-vxlan.xml"/> -<xi:include href="nm-device-wifi.xml"/> -<xi:include href="nm-device-wimax.xml"/> -<xi:include href="nm-wimax-nsp.xml"/> -<xi:include href="nm-ip4-config.xml"/> -<xi:include href="nm-ip6-config.xml"/> -<xi:include href="nm-dhcp4-config.xml"/> -<xi:include href="nm-dhcp6-config.xml"/> -<xi:include href="nm-settings.xml"/> -<xi:include href="nm-settings-connection.xml"/> -<xi:include href="nm-active-connection.xml"/> -<xi:include href="nm-agent-manager.xml"/> -<xi:include href="nm-secret-agent.xml"/> -<xi:include href="nm-vpn-connection.xml"/> -<xi:include href="nm-vpn-plugin.xml"/> - -<xi:include href="errors.xml"/> -<xi:include href="vpn-errors.xml"/> -<xi:include href="generic-types.xml"/> - -<!-- -<xi:include href="extensions.xml"> - <xi:fallback> - <!- - absence of non-spec extensions is OK - -> - </xi:fallback> -</xi:include> ---> - -</tp:spec> 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 @@ -<?xml version="1.0" ?> -<tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0" - namespace="org.freedesktop.NetworkManager.Error"> - <tp:copyright>Copyright (C) 2008 Novell, Inc.</tp:copyright> - - <tp:error name="Unknown Connection"> - <annotation name="org.gtk.GDBus.DocString" value=" - Connection was not provided by the settings service. - " /> - </tp:error> - - <tp:error name="Unknown Device"> - <annotation name="org.gtk.GDBus.DocString" value=" - Unknown device. - " /> - </tp:error> - - <tp:error name="Permission Denied"> - <annotation name="org.gtk.GDBus.DocString" value=" - User does not have the permission to activate this connection. - " /> - </tp:error> - -</tp:errors> 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 @@ -<tp:generic-types - xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> - <tp:mapping name="String_Variant_Map"> - <annotation name="org.gtk.GDBus.DocString" value="A mapping from strings to variants representing extra - key-value pairs." /> - <tp:member type="s" name="Key"/> - <tp:member type="v" name="Value"/> - </tp:mapping> - - <tp:mapping name="String_String_Map"> - <annotation name="org.gtk.GDBus.DocString" value="A mapping from strings to strings representing extra - key-value pairs." /> - <tp:member type="s" name="Key"/> - <tp:member type="s" name="Value"/> - </tp:mapping> - - <tp:mapping name="String_String_Variant_Map_Map"> - <annotation name="org.gtk.GDBus.DocString" value="A mapping from strings to a map of string to variant." /> - <tp:member type="s" name="Key"/> - <tp:member type="a{sv}" name="Value" tp:type="String_Variant_Map"/> - </tp:mapping> - - <tp:enum name="NM_802_11_MODE" type="u"> - <annotation name="org.gtk.GDBus.DocString" value="" /> - <tp:enumvalue suffix="UNKNOWN" value="0"> - <annotation name="org.gtk.GDBus.DocString" value="Mode is unknown." /> - </tp:enumvalue> - <tp:enumvalue suffix="ADHOC" value="1"> - <annotation name="org.gtk.GDBus.DocString" value=" - For both devices and access point objects, indicates the object is - part of an Ad-Hoc 802.11 network without a central coordinating access - point. - " /> - </tp:enumvalue> - <tp:enumvalue suffix="INFRA" value="2"> - <annotation name="org.gtk.GDBus.DocString" value=" - The wireless device or access point is in infrastructure mode. For - devices, this indicates the device is an 802.11 client/station. For - access point objects, this indicates the object is an access point that - provides connectivity to clients. - " /> - </tp:enumvalue> - <tp:enumvalue suffix="AP" value="3"> - <annotation name="org.gtk.GDBus.DocString" value=" - The device is an access point/hotspot. Not valid for access point - objects themselves. - " /> - </tp:enumvalue> - </tp:enum> -</tp:generic-types> 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 @@ -<?xml version="1.0" ?> -<tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0" - namespace="org.freedesktop.NetworkManager.VPN.Error"> - <tp:error name="General"> - <annotation name="org.gtk.GDBus.DocString" value="General failure without further details." /> - </tp:error> - <tp:error name="StartingInProgress"> - <annotation name="org.gtk.GDBus.DocString" value=" - The plugin is already starting, and another connect request was received. - " /> - </tp:error> - <tp:error name="AlreadyStarted"> - <annotation name="org.gtk.GDBus.DocString" value=" - The plugin is already connected, and another connect request was received. - " /> - </tp:error> - <tp:error name="StoppingInProgress"> - <annotation name="org.gtk.GDBus.DocString" value=" - The plugin is already stopping, and another stop request was received. - " /> - </tp:error> - <tp:error name="AlreadyStopped"> - <annotation name="org.gtk.GDBus.DocString" value=" - The plugin is already stopped, and another disconnect request was received. - " /> - </tp:error> - <tp:error name="WrongState"> - <annotation name="org.gtk.GDBus.DocString" value=" - The request could not be processed because the VPN plugin is in the wrong - state for this type of request. - " /> - </tp:error> - <tp:error name="BadArguments"> - <annotation name="org.gtk.GDBus.DocString" value=" - The request could not be processed because it contained malformed - arguments, or arguments of unexpected type. It usually means that one of - the VPN setting data items or secrets was not of the expected type (i.e. - int, string, bool, etc). - " /> - </tp:error> - <tp:error name="LaunchFailed"> - <annotation name="org.gtk.GDBus.DocString" value=" - A binary providing the service failed to launch. - " /> - </tp:error> - <tp:error name="ConnectionInvalid"> - <annotation name="org.gtk.GDBus.DocString" value=" - The request could not be processed because the connection was invalid. It - usually means that the connection's VPN setting was missing some required - data item or secret. - " /> - </tp:error> - <tp:error name="InteractiveNotSupported"> - <annotation name="org.gtk.GDBus.DocString" value=" - The request could not be processed because the plugin does not support - interactive operations, such as ConnectInteractive() or NewSecrets(). - " /> - </tp:error> -</tp:errors> - |