libnm: add NetworkManager.h and NetworkManagerVPN.h to enum-types

5 files changed, 30 insertions, 11 deletions

diff --git a/libnm-core/Makefile.am b/libnm-core/Makefile.am
index b9b97833ec..f4e18a06ba 100644
--- a/libnm-core/Makefile.am
+++ b/libnm-core/Makefile.am
@@ -23,7 +23,7 @@ libnm_core_la_SOURCES =			\
 	$(libnm_core_private_headers)
 
 GLIB_GENERATED = nm-core-enum-types.h nm-core-enum-types.c
-nm_core_enum_types_sources = $(filter-out NetworkManager%,$(notdir $(libnminclude_HEADERS)))
+nm_core_enum_types_sources = $(notdir $(libnminclude_HEADERS))
 GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
 GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
 
diff --git a/libnm-core/NetworkManager.h b/libnm-core/NetworkManager.h
index b5575f63a0..ee7cdedd59 100644
--- a/libnm-core/NetworkManager.h
+++ b/libnm-core/NetworkManager.h
@@ -180,7 +180,7 @@ typedef enum {
  *
  * (Corresponds to the NM_DEVICE_CAP type in nm-device-wifi.xml.)
  **/
-typedef enum {
+typedef enum { /*< flags >*/
 	NM_DEVICE_CAP_NONE           = 0x00000000,
 	NM_DEVICE_CAP_NM_SUPPORTED   = 0x00000001,
 	NM_DEVICE_CAP_CARRIER_DETECT = 0x00000002,
@@ -204,7 +204,7 @@ typedef enum {
  *
  * (Corresponds to the NM_802_11_DEVICE_CAP type in nm-device-wifi.xml.)
  **/
-typedef enum {
+typedef enum { /*< flags >*/
 	NM_WIFI_DEVICE_CAP_NONE          = 0x00000000,
 	NM_WIFI_DEVICE_CAP_CIPHER_WEP40  = 0x00000001,
 	NM_WIFI_DEVICE_CAP_CIPHER_WEP104 = 0x00000002,
@@ -227,7 +227,7 @@ typedef enum {
  *
  * (Corresponds to the NM_802_11_AP_FLAGS type in nm-access-point.xml.)
  **/
-typedef enum {
+typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/
 	NM_802_11_AP_FLAGS_NONE    = 0x00000000,
 	NM_802_11_AP_FLAGS_PRIVACY = 0x00000001
 } NM80211ApFlags;
@@ -259,7 +259,7 @@ typedef enum {
  *
  * (Corresponds to the NM_802_11_AP_SEC type in nm-access-point.xml.)
  **/
-typedef enum {
+typedef enum { /*< underscore_name=nm_802_11_ap_security_flags, flags >*/
 	NM_802_11_AP_SEC_NONE            = 0x00000000,
 	NM_802_11_AP_SEC_PAIR_WEP40      = 0x00000001,
 	NM_802_11_AP_SEC_PAIR_WEP104     = 0x00000002,
@@ -290,7 +290,7 @@ typedef enum {
  *
  * (Corresponds to the NM_802_11_MODE type in generic-types.xml.)
  **/
-typedef enum {
+typedef enum { /*< underscore_name=nm_802_11_mode >*/
 	NM_802_11_MODE_UNKNOWN = 0,
 	NM_802_11_MODE_ADHOC,
 	NM_802_11_MODE_INFRA,
@@ -308,7 +308,7 @@ typedef enum {
  *
  * (Corresponds to the NM_BT_CAPABILITY type in nm-device-bt.xml.)
  **/
-typedef enum {
+typedef enum { /*< flags >*/
 	NM_BT_CAPABILITY_NONE = 0x00000000,
 	NM_BT_CAPABILITY_DUN  = 0x00000001,
 	NM_BT_CAPABILITY_NAP  = 0x00000002,
@@ -332,7 +332,7 @@ typedef enum {
  *
  * (Corresponds to the NM_DEVICE_MODEM_CAPABILITY type in nm-device-modem.xml.)
  **/
-typedef enum {
+typedef enum { /*< flags >*/
 	NM_DEVICE_MODEM_CAPABILITY_NONE      = 0x00000000,
 	NM_DEVICE_MODEM_CAPABILITY_POTS      = 0x00000001,
 	NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO = 0x00000002,
diff --git a/libnm-core/NetworkManagerVPN.h b/libnm-core/NetworkManagerVPN.h
index f5fdaf264c..b109766cd0 100644
--- a/libnm-core/NetworkManagerVPN.h
+++ b/libnm-core/NetworkManagerVPN.h
@@ -81,7 +81,7 @@
  *
  * (Corresponds to the NM_VPN_SERVICE_STATE type in nm-vpn-connection.xml.)
  */
-typedef enum NMVpnServiceState {
+typedef enum {
 	NM_VPN_SERVICE_STATE_UNKNOWN = 0,
 	NM_VPN_SERVICE_STATE_INIT,
 	NM_VPN_SERVICE_STATE_SHUTDOWN,
@@ -111,7 +111,7 @@ typedef enum NMVpnServiceState {
  *
  * (Corresponds to the NM_VPN_CONNECTION_STATE type in nm-vpn-connection.xml.)
  */
-typedef enum NMVpnConnectionState {
+typedef enum {
 	NM_VPN_CONNECTION_STATE_UNKNOWN = 0,
 	NM_VPN_CONNECTION_STATE_PREPARE,
 	NM_VPN_CONNECTION_STATE_NEED_AUTH,
@@ -153,7 +153,7 @@ typedef enum NMVpnConnectionState {
  *
  * (Corresponds to the NM_VPN_CONNECTION_STATE_REASON type in nm-vpn-connection.xml.)
  */
-typedef enum NMVpnConnectionStateReason {
+typedef enum {
 	NM_VPN_CONNECTION_STATE_REASON_UNKNOWN = 0,
 	NM_VPN_CONNECTION_STATE_REASON_NONE,
 	NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED,
diff --git a/libnm/libnm-vpn.ver b/libnm/libnm-vpn.ver
index b2e763b2a6..f782d12bb6 100644
--- a/libnm/libnm-vpn.ver
+++ b/libnm/libnm-vpn.ver
@@ -11,12 +11,14 @@ global:
 	nm_vpn_plugin_set_ip4_config;
 	nm_vpn_plugin_set_login_banner;
 	nm_vpn_plugin_set_state;
+	nm_vpn_plugin_ui_capability_get_type;
 	nm_vpn_plugin_ui_interface_delete_connection;
 	nm_vpn_plugin_ui_interface_export;
 	nm_vpn_plugin_ui_interface_get_capabilities;
 	nm_vpn_plugin_ui_interface_get_suggested_name;
 	nm_vpn_plugin_ui_interface_get_type;
 	nm_vpn_plugin_ui_interface_import;
+	nm_vpn_plugin_ui_interface_prop_get_type;
 	nm_vpn_plugin_ui_interface_ui_factory;
 	nm_vpn_plugin_ui_widget_interface_get_type;
 	nm_vpn_plugin_ui_widget_interface_get_widget;
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index 639f0c914c..f18bbccb2a 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1,5 +1,8 @@
 {
 global:
+	nm_802_11_ap_flags_get_type;
+	nm_802_11_ap_security_flags_get_type;
+	nm_802_11_mode_get_type;
 	nm_access_point_connection_valid;
 	nm_access_point_filter_connections;
 	nm_access_point_get_bssid;
@@ -30,6 +33,8 @@ global:
 	nm_active_connection_get_uuid;
 	nm_active_connection_get_vpn;
 	nm_active_connection_new;
+	nm_active_connection_state_get_type;
+	nm_bluetooth_capabilities_get_type;
 	nm_client_activate_connection;
 	nm_client_add_and_activate_connection;
 	nm_client_check_connectivity;
@@ -130,6 +135,7 @@ global:
 	nm_connection_to_hash;
 	nm_connection_update_secrets;
 	nm_connection_verify;
+	nm_connectivity_state_get_type;
 	nm_device_adsl_error_get_type;
 	nm_device_adsl_error_quark;
 	nm_device_adsl_get_carrier;
@@ -156,6 +162,7 @@ global:
 	nm_device_bt_get_name;
 	nm_device_bt_get_type;
 	nm_device_bt_new;
+	nm_device_capabilities_get_type;
 	nm_device_connection_compatible;
 	nm_device_connection_valid;
 	nm_device_delete;
@@ -212,6 +219,7 @@ global:
 	nm_device_infiniband_get_type;
 	nm_device_infiniband_new;
 	nm_device_is_software;
+	nm_device_modem_capabilities_get_type;
 	nm_device_modem_error_get_type;
 	nm_device_modem_error_quark;
 	nm_device_modem_get_current_capabilities;
@@ -226,6 +234,8 @@ global:
 	nm_device_olpc_mesh_get_type;
 	nm_device_olpc_mesh_new;
 	nm_device_set_autoconnect;
+	nm_device_state_get_type;
+	nm_device_state_reason_get_type;
 	nm_device_team_error_get_type;
 	nm_device_team_error_quark;
 	nm_device_team_get_carrier;
@@ -233,6 +243,7 @@ global:
 	nm_device_team_get_slaves;
 	nm_device_team_get_type;
 	nm_device_team_new;
+	nm_device_type_get_type;
 	nm_device_vlan_error_get_type;
 	nm_device_vlan_error_quark;
 	nm_device_vlan_get_carrier;
@@ -240,6 +251,7 @@ global:
 	nm_device_vlan_get_type;
 	nm_device_vlan_get_vlan_id;
 	nm_device_vlan_new;
+	nm_device_wifi_capabilities_get_type;
 	nm_device_wifi_error_get_type;
 	nm_device_wifi_error_quark;
 	nm_device_wifi_get_access_point_by_path;
@@ -876,6 +888,7 @@ global:
 	nm_setting_wireless_security_remove_proto_by_value;
 	nm_setting_wireless_security_set_wep_key;
 	nm_ssid_get_type;
+	nm_state_get_type;
 	nm_string_array_get_type;
 	nm_uint_array_get_type;
 	nm_utils_ap_mode_security_valid;
@@ -934,6 +947,10 @@ global:
 	nm_vpn_connection_get_type;
 	nm_vpn_connection_get_vpn_state;
 	nm_vpn_connection_new;
+	nm_vpn_connection_state_get_type;
+	nm_vpn_connection_state_reason_get_type;
+	nm_vpn_plugin_failure_get_type;
+	nm_vpn_service_state_get_type;
 	nm_wep_key_type_get_type;
 	nm_wimax_nsp_connection_valid;
 	nm_wimax_nsp_filter_connections;