From d6201f5d8daada3d64a0a3e0038e14eebec683ce Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 3 Aug 2016 22:59:23 +0200 Subject: Imported Upstream version 1.2.4 --- docs/libnm/html/NMClient.html | 17 ++- docs/libnm/html/NMConnection.html | 2 +- docs/libnm/html/NMDevice.html | 2 +- docs/libnm/html/NMSetting.html | 4 +- docs/libnm/html/NMSetting8021x.html | 2 +- docs/libnm/html/NMSettingConnection.html | 2 +- docs/libnm/html/NMSettingDcb.html | 2 +- docs/libnm/html/NMSettingIP6Config.html | 2 +- docs/libnm/html/NMSettingIPConfig.html | 151 +++++++++++++++++------ docs/libnm/html/NMSettingMacvlan.html | 2 +- docs/libnm/html/NMSettingSerial.html | 2 +- docs/libnm/html/NMSettingTun.html | 2 +- docs/libnm/html/NMSettingVlan.html | 4 +- docs/libnm/html/NMSettingWired.html | 2 +- docs/libnm/html/NMSettingWireless.html | 2 +- docs/libnm/html/NMSettingWirelessSecurity.html | 2 +- docs/libnm/html/NMVpnEditorPlugin.html | 4 +- docs/libnm/html/api-index-full.html | 22 ++-- docs/libnm/html/index.html | 2 +- docs/libnm/html/index.sgml | 10 +- docs/libnm/html/libnm-nm-dbus-interface.html | 4 +- docs/libnm/html/libnm-nm-errors.html | 9 +- docs/libnm/html/libnm-nm-utils.html | 2 +- docs/libnm/html/libnm-nm-version.html | 28 +---- docs/libnm/html/libnm-nm-vpn-dbus-interface.html | 2 +- docs/libnm/html/libnm.devhelp2 | 10 +- docs/libnm/html/object-tree.html | 8 +- 27 files changed, 191 insertions(+), 110 deletions(-) (limited to 'docs/libnm/html') diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html index e5449080..06167333 100644 --- a/docs/libnm/html/NMClient.html +++ b/docs/libnm/html/NMClient.html @@ -798,7 +798,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMClientError
     ├── NMClientPermission
     ╰── NMClientPermissionResult
@@ -3251,6 +3251,21 @@ clients can obtain to perform certain tasks on behalf of the current user.

  
 
 
+
NM_CLIENT_PERMISSION_SETTINGS_MODIFY_GLOBAL_DNS

+
+
modify persistent global
+ DNS configuration

+
+ 
+
+
+
NM_CLIENT_PERMISSION_RELOAD

+
+
controls access to Reload.

+
+ 
+
+
 
NM_CLIENT_PERMISSION_LAST

 
 
a reserved boundary value

diff --git a/docs/libnm/html/NMConnection.html b/docs/libnm/html/NMConnection.html
index b5b09562..bf8587db 100644
--- a/docs/libnm/html/NMConnection.html
+++ b/docs/libnm/html/NMConnection.html
@@ -542,7 +542,7 @@

Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── NMConnectionSerializationFlags
diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html index 016bad3d..e6e7bbec 100644 --- a/docs/libnm/html/NMDevice.html +++ b/docs/libnm/html/NMDevice.html @@ -791,7 +791,7 @@

Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── NMLldpNeighbor
     GObject
     ╰── NMObject
diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html
index c392ec1f..09859dd6 100644
--- a/docs/libnm/html/NMSetting.html
+++ b/docs/libnm/html/NMSetting.html
@@ -219,11 +219,11 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingCompareFlags
     ├── NMSettingDiffResult
     ╰── NMSettingMacRandomization
-    GFlags
+    GFlags
     ╰── NMSettingSecretFlags
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMSetting8021x.html b/docs/libnm/html/NMSetting8021x.html
index 16c019d5..3596bce3 100644
--- a/docs/libnm/html/NMSetting8021x.html
+++ b/docs/libnm/html/NMSetting8021x.html
@@ -961,7 +961,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSetting8021xCKFormat
     ╰── NMSetting8021xCKScheme
     GObject
diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html
index 89b3f606..e69e8221 100644
--- a/docs/libnm/html/NMSettingConnection.html
+++ b/docs/libnm/html/NMSettingConnection.html
@@ -473,7 +473,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingConnectionAutoconnectSlaves
     ╰── NMSettingConnectionLldp
     GObject
diff --git a/docs/libnm/html/NMSettingDcb.html b/docs/libnm/html/NMSettingDcb.html
index 78829261..cfc5515a 100644
--- a/docs/libnm/html/NMSettingDcb.html
+++ b/docs/libnm/html/NMSettingDcb.html
@@ -406,7 +406,7 @@

Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── NMSettingDcbFlags
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMSettingIP6Config.html b/docs/libnm/html/NMSettingIP6Config.html
index 0fa2bb56..285780a6 100644
--- a/docs/libnm/html/NMSettingIP6Config.html
+++ b/docs/libnm/html/NMSettingIP6Config.html
@@ -151,7 +151,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMSettingIP6ConfigAddrGenMode
     ╰── NMSettingIP6ConfigPrivacy
     GObject
diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html
index 61034747..98cd3a82 100644
--- a/docs/libnm/html/NMSettingIPConfig.html
+++ b/docs/libnm/html/NMSettingIPConfig.html
@@ -509,6 +509,14 @@
 
 
 
+gint
+
+
+nm_setting_ip_config_get_dns_priority ()
+
+
+
+
 guint
 
 
@@ -731,6 +739,11 @@
 Read / Write
 
 
+gint
+dns-priority
+Read / Write / Construct
+
+
 GStrv
 dns-search
 Read / Write
@@ -811,6 +824,10 @@
 
 
 #define
+NM_SETTING_IP_CONFIG_DNS_PRIORITY
+
+
+#define
 NM_SETTING_IP_CONFIG_ADDRESSES
 
 
@@ -926,7 +943,7 @@

Object Hierarchy

-
    GBoxed
+
    GBoxed
     ├── NMIPAddress
     ╰── NMIPRoute
     GObject
@@ -2888,12 +2905,38 @@ Specify how to clear the options.
+

nm_setting_ip_config_get_dns_priority ()

+
gint
+nm_setting_ip_config_get_dns_priority (NMSettingIPConfig *setting);
+
+

Parameters

+
+++++ + + + + + +

setting

the NMSettingIPConfig

 
+
+
+

Returns

+

the priority of DNS servers

+
+

Since: 1.2.4

+
+
+

nm_setting_ip_config_get_num_addresses ()

guint
 nm_setting_ip_config_get_num_addresses
                                (NMSettingIPConfig *setting);
-

Parameters

+

Parameters

@@ -2908,7 +2951,7 @@ nm_setting_ip_config_get_num_addresses
-

Returns

+

Returns

the number of configured addresses

@@ -2919,7 +2962,7 @@ nm_setting_ip_config_get_num_addresses nm_setting_ip_config_get_address (NMSettingIPConfig *setting, int idx);
-

Parameters

+

Parameters

@@ -2941,7 +2984,7 @@ nm_setting_ip_config_get_address (
-

Returns

+

Returns

the address at index idx .

[transfer none]

@@ -2956,7 +2999,7 @@ nm_setting_ip_config_add_address (Adds a new IP address and associated information to the setting. The given address is duplicated internally and is not changed by this function.

-

Parameters

+

Parameters

@@ -2978,7 +3021,7 @@ given address is duplicated internally and is not changed by this function.

-

Returns

+

Returns

TRUE if the address was added; FALSE if the address was already known.

@@ -2992,7 +3035,7 @@ nm_setting_ip_config_remove_address (Removes the address at index idx .

-

Parameters

+

Parameters

@@ -3024,7 +3067,7 @@ nm_setting_ip_config_remove_address_by_value

Removes the address address .

-

Parameters

+

Parameters

@@ -3046,7 +3089,7 @@ nm_setting_ip_config_remove_address_by_value
-

Returns

+

Returns

TRUE if the address was found and removed; FALSE if it was not.

@@ -3057,7 +3100,7 @@ nm_setting_ip_config_remove_address_by_value nm_setting_ip_config_clear_addresses (NMSettingIPConfig *setting);

Removes all configured addresses.

-

Parameters

+

Parameters

@@ -3078,7 +3121,7 @@ nm_setting_ip_config_clear_addresses (const char * nm_setting_ip_config_get_gateway (NMSettingIPConfig *setting);
-

Parameters

+

Parameters

@@ -3093,7 +3136,7 @@ nm_setting_ip_config_get_gateway (
-

Returns

+

Returns

the IP address of the gateway associated with this configuration, or NULL.

@@ -3104,7 +3147,7 @@ nm_setting_ip_config_get_gateway (guint nm_setting_ip_config_get_num_routes (NMSettingIPConfig *setting);
-

Parameters

+

Parameters

@@ -3119,7 +3162,7 @@ nm_setting_ip_config_get_num_routes (
-

Returns

+

Returns

the number of configured routes

@@ -3130,7 +3173,7 @@ nm_setting_ip_config_get_num_routes (NMSettingIPConfig *setting, int idx);
-

Parameters

+

Parameters

@@ -3152,7 +3195,7 @@ nm_setting_ip_config_get_route (
-

Returns

+

Returns

the route at index idx .

[transfer none]

@@ -3167,7 +3210,7 @@ nm_setting_ip_config_add_route (Adds a new route and associated information to the setting. The given route is duplicated internally and is not changed by this function.

-

Parameters

+

Parameters

@@ -3189,7 +3232,7 @@ given route is duplicated internally and is not changed by this function.

-

Returns

+

Returns

TRUE if the route was added; FALSE if the route was already known.

@@ -3202,7 +3245,7 @@ nm_setting_ip_config_remove_route (Removes the route at index idx .

-

Parameters

+

Parameters

@@ -3234,7 +3277,7 @@ nm_setting_ip_config_remove_route_by_value

Removes the route route .

-

Parameters

+

Parameters

@@ -3256,7 +3299,7 @@ nm_setting_ip_config_remove_route_by_value
-

Returns

+

Returns

TRUE if the route was found and removed; FALSE if it was not.

@@ -3267,7 +3310,7 @@ nm_setting_ip_config_remove_route_by_value nm_setting_ip_config_clear_routes (NMSettingIPConfig *setting);

Removes all configured routes.

-

Parameters

+

Parameters

@@ -3290,7 +3333,7 @@ nm_setting_ip_config_get_route_metric (“route-metric” property.

-

Parameters

+

Parameters

@@ -3305,7 +3348,7 @@ property.

-

Returns

+

Returns

the route metric that is used for routes that don't explicitly specify a metric. See “route-metric” for more details.

@@ -3319,7 +3362,7 @@ nm_setting_ip_config_get_ignore_auto_routes

Returns the value contained in the “ignore-auto-routes” property.

-

Parameters

+

Parameters

@@ -3334,7 +3377,7 @@ property.

-

Returns

+

Returns

TRUE if automatically configured (ie via DHCP) routes should be ignored.

@@ -3348,7 +3391,7 @@ nm_setting_ip_config_get_ignore_auto_dns

Returns the value contained in the “ignore-auto-dns” property.

-

Parameters

+

Parameters

@@ -3363,7 +3406,7 @@ property.

-

Returns

+

Returns

TRUE if automatically configured (ie via DHCP) DNS information should be ignored.

@@ -3377,7 +3420,7 @@ nm_setting_ip_config_get_dhcp_hostname

Returns the value contained in the “dhcp-hostname” property.

-

Parameters

+

Parameters

@@ -3392,7 +3435,7 @@ property.

-

Returns

+

Returns

the configured hostname to send to the DHCP server

@@ -3405,7 +3448,7 @@ nm_setting_ip_config_get_dhcp_send_hostname

Returns the value contained in the “dhcp-send-hostname” property.

-

Parameters

+

Parameters

@@ -3420,7 +3463,7 @@ property.

-

Returns

+

Returns

TRUE if NetworkManager should send the machine hostname to the DHCP server when requesting addresses to allow the server to automatically update DNS information for this machine.

@@ -3435,7 +3478,7 @@ nm_setting_ip_config_get_never_default

Returns the value contained in the “never-default” property.

-

Parameters

+

Parameters

@@ -3450,7 +3493,7 @@ property.

-

Returns

+

Returns

TRUE if this connection should never be the default connection

@@ -3463,7 +3506,7 @@ nm_setting_ip_config_get_may_fail (Returns the value contained in the “may-fail” property.

-

Parameters

+

Parameters

@@ -3478,7 +3521,7 @@ property.

-

Returns

+

Returns

TRUE if this connection doesn't require this type of IP addressing to complete for the connection to succeed.

@@ -3489,7 +3532,7 @@ addressing to complete for the connection to succeed.

gint
 nm_setting_ip_config_get_dad_timeout (NMSettingIPConfig *setting);
-

Parameters

+

Parameters

@@ -3504,7 +3547,7 @@ nm_setting_ip_config_get_dad_timeout ( -

Returns

+

Returns

the “dad-timeout” property.

Since: 1.2

@@ -3517,7 +3560,7 @@ nm_setting_ip_config_get_dhcp_timeout (“dhcp-timeout” property.

-

Parameters

+

Parameters

@@ -3532,7 +3575,7 @@ property.

-

Returns

+

Returns

the configured DHCP timeout in seconds. 0 = default for the particular kind of device.

@@ -3572,6 +3615,12 @@ the particular kind of device.

+

NM_SETTING_IP_CONFIG_DNS_PRIORITY

+
#define NM_SETTING_IP_CONFIG_DNS_PRIORITY       "dns-priority"
+
+
+
+

NM_SETTING_IP_CONFIG_ADDRESSES

#define NM_SETTING_IP_CONFIG_ADDRESSES          "addresses"
@@ -3814,6 +3863,26 @@ distinct from an empty list of properties.

+

The “dns-priority” property

+
  “dns-priority”             gint
+

DNS priority.

+

The relative priority to be used when determining the order of DNS +servers in resolv.conf. A lower value means that servers will be on top +of the file. Zero selects the default value, which is 50 for VPNs and +100 for other connections. When multiple devices have configurations +with the same priority, the one with an active default route will be +preferred. Note that when using dns=dnsmasq the order is meaningless +since dnsmasq forwards queries to all known servers at the same time.

+

Negative values have the special effect of excluding other configurations +with a greater priority value; so in presence of at least a negative +priority, only DNS servers from configurations with the lowest priority +value will be used.

+

Flags: Read / Write / Construct

+

Default value: 0

+

Since: 1.2.4

+
+
+

The “dns-search” property

  “dns-search”               GStrv

Array of DNS search domains.

diff --git a/docs/libnm/html/NMSettingMacvlan.html b/docs/libnm/html/NMSettingMacvlan.html index d5d1a207..d924b0f9 100644 --- a/docs/libnm/html/NMSettingMacvlan.html +++ b/docs/libnm/html/NMSettingMacvlan.html @@ -157,7 +157,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingMacvlanMode
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMSettingSerial.html b/docs/libnm/html/NMSettingSerial.html
index 07f82316..b31f0715 100644
--- a/docs/libnm/html/NMSettingSerial.html
+++ b/docs/libnm/html/NMSettingSerial.html
@@ -175,7 +175,7 @@ serial communications

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingSerialParity
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMSettingTun.html b/docs/libnm/html/NMSettingTun.html
index 9a7a9fc5..41837ea7 100644
--- a/docs/libnm/html/NMSettingTun.html
+++ b/docs/libnm/html/NMSettingTun.html
@@ -191,7 +191,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingTunMode
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html
index 61e4bf45..25807d63 100644
--- a/docs/libnm/html/NMSettingVlan.html
+++ b/docs/libnm/html/NMSettingVlan.html
@@ -230,9 +230,9 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMVlanPriorityMap
-    GFlags
+    GFlags
     ╰── NMVlanFlags
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html
index cdb857f4..568b9d5e 100644
--- a/docs/libnm/html/NMSettingWired.html
+++ b/docs/libnm/html/NMSettingWired.html
@@ -394,7 +394,7 @@

Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── NMSettingWiredWakeOnLan
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html
index b9cb002e..a58e847c 100644
--- a/docs/libnm/html/NMSettingWireless.html
+++ b/docs/libnm/html/NMSettingWireless.html
@@ -426,7 +426,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMSettingWirelessPowersave
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html
index 9e5098f2..b8e8f37f 100644
--- a/docs/libnm/html/NMSettingWirelessSecurity.html
+++ b/docs/libnm/html/NMSettingWirelessSecurity.html
@@ -483,7 +483,7 @@ use WEP, LEAP, WPA or WPA2/RSN security

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMWepKeyType
     GObject
     ╰── NMSetting
diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html
index 1e807951..d49d5fea 100644
--- a/docs/libnm/html/NMVpnEditorPlugin.html
+++ b/docs/libnm/html/NMVpnEditorPlugin.html
@@ -192,9 +192,9 @@

Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── NMVpnEditorPluginCapability
-    GInterface
+    GInterface
     ├── NMVpnEditor
     ╰── NMVpnEditorPlugin
 

diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html
index 277b9132..5450ce1f 100644
--- a/docs/libnm/html/api-index-full.html
+++ b/docs/libnm/html/api-index-full.html
@@ -415,7 +415,7 @@
 
 

 

-NM_AVAILABLE_IN_1_4, macro in nm-version
+NM_AVAILABLE_IN_1_2_4, macro in nm-version
 

 

 
B

@@ -1470,14 +1470,6 @@
 
 

 

-NM_DEPRECATED_IN_1_4, macro in nm-version
-

-

-

-NM_DEPRECATED_IN_1_4_FOR, macro in nm-version
-

-

-

 NMDevice, struct in nm-types
 

 

@@ -4300,6 +4292,10 @@
 
 

 

+NMSettingIPConfig:dns-priority, object property in NMSettingIPConfig
+

+

+

 NMSettingIPConfig:dns-search, object property in NMSettingIPConfig
 

 

@@ -6568,6 +6564,10 @@
 
 

 

+NM_SETTING_IP_CONFIG_DNS_PRIORITY, macro in NMSettingIPConfig
+

+

+

 NM_SETTING_IP_CONFIG_DNS_SEARCH, macro in NMSettingIPConfig
 

 

@@ -6604,6 +6604,10 @@
 
 

 

+nm_setting_ip_config_get_dns_priority, function in NMSettingIPConfig
+

+

+

 nm_setting_ip_config_get_dns_search, function in NMSettingIPConfig
 

 

diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html
index eea02301..8794d373 100644
--- a/docs/libnm/html/index.html
+++ b/docs/libnm/html/index.html
@@ -15,7 +15,7 @@
 

 

 

-      for libnm 1.2.2
+      for libnm 1.2.4
 
       The latest version of this documentation can be found on-line at
       https://developer.gnome.org/libnm/stable/.
diff --git a/docs/libnm/html/index.sgml b/docs/libnm/html/index.sgml
index e2a6f09d..82b34062 100644
--- a/docs/libnm/html/index.sgml
+++ b/docs/libnm/html/index.sgml
@@ -104,6 +104,8 @@
 
 
 
+
+
 
 
 
@@ -264,6 +266,7 @@
 
 
 
+
 
 
 
@@ -1410,6 +1413,7 @@
 
 
 
+
 
 
 
@@ -1438,6 +1442,7 @@
 
 
 
+
 
 
 
@@ -1474,6 +1479,7 @@
 
 
 
+
 
 
 
@@ -3068,7 +3074,6 @@
 
 
 
-
 
 
 
@@ -3076,8 +3081,7 @@
 
 
 
-
-
+
 
 
 
diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html
index 2dcd7309..cafcbd4b 100644
--- a/docs/libnm/html/libnm-nm-dbus-interface.html
+++ b/docs/libnm/html/libnm-nm-dbus-interface.html
@@ -353,7 +353,7 @@
 

 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NM80211Mode
     ├── NMActiveConnectionState
     ├── NMConnectivityState
@@ -364,7 +364,7 @@
     ├── NMMetered
     ├── NMState
     ╰── NMWimaxNspNetworkType
-    GFlags
+    GFlags
     ├── NM80211ApFlags
     ├── NM80211ApSecurityFlags
     ├── NMBluetoothCapabilities
diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html
index f2720bfe..13444902 100644
--- a/docs/libnm/html/libnm-nm-errors.html
+++ b/docs/libnm/html/libnm-nm-errors.html
@@ -184,7 +184,7 @@
 

 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMAgentManagerError
     ├── NMConnectionError
     ├── NMCryptoError
@@ -714,6 +714,13 @@ errors in that namespace.

 
  
 
+
+
NM_MANAGER_ERROR_INVALID_ARGUMENTS

+
+
Invalid arguments for D-Bus request

+
+ 
+
 
 

 

diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index 65300023..1ae50f34 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -551,7 +551,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMUtilsSecurityType
diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html index 5e1c3977..4af37c3c 100644 --- a/docs/libnm/html/libnm-nm-version.html +++ b/docs/libnm/html/libnm-nm-version.html @@ -65,12 +65,6 @@ NM_DEPRECATED_IN_1_2_FOR() - -#define - -NM_DEPRECATED_IN_1_4_FOR() - - @@ -108,11 +102,7 @@ #define -NM_DEPRECATED_IN_1_4 - - -#define -NM_AVAILABLE_IN_1_4 +NM_AVAILABLE_IN_1_2_4 @@ -151,12 +141,6 @@ 
# define NM_DEPRECATED_IN_1_2_FOR(f)    G_DEPRECATED_FOR(f)
-
-
-

NM_DEPRECATED_IN_1_4_FOR()

-
# define NM_DEPRECATED_IN_1_4_FOR(f)    G_DEPRECATED_FOR(f)
-
-

Types and Values

@@ -196,14 +180,8 @@
-

NM_DEPRECATED_IN_1_4

-
# define NM_DEPRECATED_IN_1_4           G_DEPRECATED
-
-
-
-
-

NM_AVAILABLE_IN_1_4

-
# define NM_AVAILABLE_IN_1_4            G_UNAVAILABLE(1,4)
+
NM_AVAILABLE_IN_1_2_4

+
# define NM_AVAILABLE_IN_1_2_4          G_UNAVAILABLE(1.2,4)
diff --git a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html index d5be4bee..299f1d09 100644 --- a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html +++ b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html @@ -293,7 +293,7 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ├── NMVpnConnectionState
     ├── NMVpnConnectionStateReason
     ├── NMVpnPluginFailure
diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2
index e4b37f3c..5358ef52 100644
--- a/docs/libnm/html/libnm.devhelp2
+++ b/docs/libnm/html/libnm.devhelp2
@@ -979,6 +979,7 @@
     
     
     
+    
     
     
     
@@ -1006,6 +1007,7 @@
     
     
     
+    
     
     
     
@@ -1041,6 +1043,7 @@
     
     
     
+    
     
     
     
@@ -2168,15 +2171,13 @@
     
     
     
-    
     
     
     
     
     
     
-    
-    
+    
     
     
     
@@ -2269,6 +2270,8 @@
     
     
     
+    
+    
     
     
     
@@ -2318,6 +2321,7 @@
     
     
     
+    
     
     
     
diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html
index ea853287..147fbcc2 100644
--- a/docs/libnm/html/object-tree.html
+++ b/docs/libnm/html/object-tree.html
@@ -85,11 +85,11 @@
     ├── NMClient
     ├── NMSecretAgentOld
     ╰── NMSimpleConnection
-    GInterface
+    GInterface
     ├── NMConnection
     ├── NMVpnEditor
     ╰── NMVpnEditorPlugin
-    GFlags
+    GFlags
     ├── NM80211ApFlags
     ├── NM80211ApSecurityFlags
     ├── NMBluetoothCapabilities
@@ -104,7 +104,7 @@
     ├── NMSettingWiredWakeOnLan
     ├── NMVlanFlags
     ╰── NMVpnEditorPluginCapability
-    GEnum
+    GEnum
     ├── NMAgentManagerError
     ├── NMConnectionError
     ├── NMDeviceError
@@ -146,7 +146,7 @@
     ├── NMVpnServiceState
     ├── NMWepKeyType
     ╰── NMWimaxNspNetworkType
-    GBoxed
+    GBoxed
     ├── NMIPAddress
     ├── NMIPRoute
     ╰── NMLldpNeighbor
-- 
cgit 1.3.0-6-gf8a5