mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 10:46:59 +00:00
libnm-core: drop NMVpnConnectionStateReason
It's now the same as NMActiveConnectionStateReason. Keep a compatibility typedef and enum.
This commit is contained in:
parent
d9d78ac2aa
commit
a91369f80d
|
@ -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
|
||||
|
||||
|
|
|
@ -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 ***/
|
||||
|
||||
|
|
|
@ -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 ();
|
||||
}
|
||||
|
|
|
@ -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:
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue