diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2017-03-16 17:09:42 +0100 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-03-17 10:21:19 +0100 |
commit | a91369f80d44d1fc748fc3a9f5d9ef0fb566c77c (patch) | |
tree | 18df379cbedbe54f869847ac1689853e47b9ae89 | |
parent | d9d78ac2aa9c3e84d8144fb3a648499b9282aeb7 (diff) | |
download | NetworkManager-a91369f80d44d1fc748fc3a9f5d9ef0fb566c77c.tar.gz |
libnm-core: drop NMVpnConnectionStateReason
It's now the same as NMActiveConnectionStateReason. Keep a compatibility
typedef and enum.
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | libnm-core/nm-vpn-dbus-interface.h | 37 | ||||
-rw-r--r-- | libnm/nm-vpn-connection.c | 6 | ||||
-rw-r--r-- | libnm/nm-vpn-connection.h | 3 |
4 files changed, 35 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index fac53d5cc6..8ee15b5be5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -512,6 +512,8 @@ GLIB_GENERATED += \ $(libnm_core_lib_c_mkenums) nm_core_enum_types_sources = $(libnm_core_lib_h_pub_real) +nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' + $(libnm_core_lib_h_pub_mkenums): libnm-core/.dirstamp $(libnm_core_lib_c_mkenums): libnm-core/.dirstamp diff --git a/libnm-core/nm-vpn-dbus-interface.h b/libnm-core/nm-vpn-dbus-interface.h index 761390405b..964abb555a 100644 --- a/libnm-core/nm-vpn-dbus-interface.h +++ b/libnm-core/nm-vpn-dbus-interface.h @@ -26,6 +26,12 @@ #ifndef __NM_VPN_DBUS_INTERFACE_H__ #define __NM_VPN_DBUS_INTERFACE_H__ +#include "nm-dbus-interface.h" + +#ifndef NM_VERSION_H +#define NM_DEPRECATED_IN_1_8_FOR(n) +#endif + /* * dbus services details */ @@ -147,20 +153,22 @@ typedef enum { * * VPN connection state reasons */ -typedef enum { - NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0, - NM_VPN_CONNECTION_STATE_REASON_NONE = 1, - NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED = 2, - NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED = 3, - NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED = 4, - NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID = 5, - NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT = 6, - NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT = 7, - NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED = 8, - NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS = 9, - NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED = 10, - NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED = 11, +NM_DEPRECATED_IN_1_8_FOR(NMActiveConnectionStateReason) +typedef enum { /*< skip >*/ + NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = NM_ACTIVE_CONNECTION_STATE_REASON_UNKNOWN, + NM_VPN_CONNECTION_STATE_REASON_NONE = NM_ACTIVE_CONNECTION_STATE_REASON_NONE, + NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED = NM_ACTIVE_CONNECTION_STATE_REASON_USER_DISCONNECTED, + NM_VPN_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED = NM_ACTIVE_CONNECTION_STATE_REASON_DEVICE_DISCONNECTED, + NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED = NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_STOPPED, + NM_VPN_CONNECTION_STATE_REASON_IP_CONFIG_INVALID = NM_ACTIVE_CONNECTION_STATE_REASON_IP_CONFIG_INVALID, + NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT = NM_ACTIVE_CONNECTION_STATE_REASON_CONNECT_TIMEOUT, + NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT = NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT, + NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED = NM_ACTIVE_CONNECTION_STATE_REASON_SERVICE_START_FAILED, + NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS = NM_ACTIVE_CONNECTION_STATE_REASON_NO_SECRETS, + NM_VPN_CONNECTION_STATE_REASON_LOGIN_FAILED = NM_ACTIVE_CONNECTION_STATE_REASON_LOGIN_FAILED, + NM_VPN_CONNECTION_STATE_REASON_CONNECTION_REMOVED = NM_ACTIVE_CONNECTION_STATE_REASON_CONNECTION_REMOVED, } NMVpnConnectionStateReason; +#define NMVpnConnectionStateReason NMActiveConnectionStateReason /** * NMVpnPluginFailure: @@ -177,6 +185,9 @@ typedef enum { NM_VPN_PLUGIN_FAILURE_BAD_IP_CONFIG } NMVpnPluginFailure; +#ifndef NM_VERSION_H +#undef NM_DEPRECATED_IN_1_8_FOR +#endif /*** Generic config ***/ diff --git a/libnm/nm-vpn-connection.c b/libnm/nm-vpn-connection.c index a91a6f6952..b773096eb8 100644 --- a/libnm/nm-vpn-connection.c +++ b/libnm/nm-vpn-connection.c @@ -229,3 +229,9 @@ nm_vpn_connection_class_init (NMVpnConnectionClass *connection_class) G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); } + +GType +nm_vpn_connection_state_reason_get_type (void) +{ + return nm_active_connection_state_reason_get_type (); +} diff --git a/libnm/nm-vpn-connection.h b/libnm/nm-vpn-connection.h index 0857035a5f..001fb2cb7a 100644 --- a/libnm/nm-vpn-connection.h +++ b/libnm/nm-vpn-connection.h @@ -41,6 +41,9 @@ G_BEGIN_DECLS #define NM_VPN_CONNECTION_VPN_STATE "vpn-state" #define NM_VPN_CONNECTION_BANNER "banner" +GType nm_vpn_connection_state_reason_get_type (void) G_GNUC_CONST; +#define NM_TYPE_VPN_CONNECTION_STATE_REASON (nm_vpn_connection_state_reason_get_type ()) + /** * NMVpnConnection: */ |