NetworkManager r3664 - in trunk: include libnm-util

[dcbw svn gnome org]

Author: dcbw
Date: Tue May 13 16:57:01 2008
New Revision: 3664
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3664&view=rev

Log:
Fix syntax errors with enums in pedantic mode (Will Stephenson)

Modified:
   trunk/include/NetworkManager.h
   trunk/include/NetworkManagerVPN.h
   trunk/libnm-util/nm-connection.h
   trunk/libnm-util/nm-setting-gsm.h
   trunk/libnm-util/nm-setting.h
   trunk/libnm-util/nm-utils.h

Modified: trunk/include/NetworkManager.h
==============================================================================
--- trunk/include/NetworkManager.h	(original)
+++ trunk/include/NetworkManager.h	Tue May 13 16:57:01 2008
@@ -129,7 +129,7 @@
 typedef enum {
 	NM_802_11_MODE_UNKNOWN = 0,
 	NM_802_11_MODE_ADHOC,
-	NM_802_11_MODE_INFRA,
+	NM_802_11_MODE_INFRA
 } NM80211Mode;
 
 
@@ -200,7 +200,7 @@
 	 *   UNAVAILABLE:  the device is no longer ready for use (rfkill, no carrier, etc)
 	 *   DISCONNECTED:  the device's connection is ready for activation, or NetworkManager went to sleep
 	 */
-	NM_DEVICE_STATE_FAILED,
+	NM_DEVICE_STATE_FAILED
 } NMDeviceState;
 
 
@@ -211,7 +211,7 @@
 	NM_ACTIVE_CONNECTION_STATE_ACTIVATING,
 
 	/* Indicates the connection is currently active */
-	NM_ACTIVE_CONNECTION_STATE_ACTIVATED,
+	NM_ACTIVE_CONNECTION_STATE_ACTIVATED
 } NMActiveConnectionState;
 
 

Modified: trunk/include/NetworkManagerVPN.h
==============================================================================
--- trunk/include/NetworkManagerVPN.h	(original)
+++ trunk/include/NetworkManagerVPN.h	Tue May 13 16:57:01 2008
@@ -88,7 +88,7 @@
 	NM_VPN_CONNECTION_STATE_IP_CONFIG_GET,
 	NM_VPN_CONNECTION_STATE_ACTIVATED,
 	NM_VPN_CONNECTION_STATE_FAILED,
-	NM_VPN_CONNECTION_STATE_DISCONNECTED,
+	NM_VPN_CONNECTION_STATE_DISCONNECTED
 } NMVPNConnectionState;
 
 typedef enum NMVPNConnectionStateReason
@@ -102,7 +102,7 @@
 	NM_VPN_CONNECTION_STATE_REASON_CONNECT_TIMEOUT,
 	NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_TIMEOUT,
 	NM_VPN_CONNECTION_STATE_REASON_SERVICE_START_FAILED,
-	NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS,
+	NM_VPN_CONNECTION_STATE_REASON_NO_SECRETS
 } NMVPNConnectionStateReason;
 
 #define NM_VPN_PLUGIN_IP4_CONFIG_GATEWAY "gateway"

Modified: trunk/libnm-util/nm-connection.h
==============================================================================
--- trunk/libnm-util/nm-connection.h	(original)
+++ trunk/libnm-util/nm-connection.h	Tue May 13 16:57:01 2008
@@ -19,7 +19,7 @@
 typedef enum {
 	NM_CONNECTION_SCOPE_UNKNOWN = 0,
 	NM_CONNECTION_SCOPE_SYSTEM,
-	NM_CONNECTION_SCOPE_USER,
+	NM_CONNECTION_SCOPE_USER
 } NMConnectionScope;
 
 #define NM_CONNECTION_SCOPE "scope"

Modified: trunk/libnm-util/nm-setting-gsm.h
==============================================================================
--- trunk/libnm-util/nm-setting-gsm.h	(original)
+++ trunk/libnm-util/nm-setting-gsm.h	Tue May 13 16:57:01 2008
@@ -31,7 +31,7 @@
 	NM_GSM_NETWORK_GPRS = 0,
 	NM_GSM_NETWORK_GSM = 1,
 	NM_GSM_NETWORK_PREFER_GPRS = 2,
-	NM_GSM_NETWORK_PREFER_GSM = 3,
+	NM_GSM_NETWORK_PREFER_GSM = 3
 };
 
 typedef struct {

Modified: trunk/libnm-util/nm-setting.h
==============================================================================
--- trunk/libnm-util/nm-setting.h	(original)
+++ trunk/libnm-util/nm-setting.h	Tue May 13 16:57:01 2008
@@ -71,7 +71,7 @@
 	COMPARE_FLAGS_FUZZY = 0x00000001,
 
 	/* Ignore the connection ID */
-	COMPARE_FLAGS_IGNORE_ID = 0x00000002,
+	COMPARE_FLAGS_IGNORE_ID = 0x00000002
 } NMSettingCompareFlags;
 
 /* Returns TRUE if the connections are the same */

Modified: trunk/libnm-util/nm-utils.h
==============================================================================
--- trunk/libnm-util/nm-utils.h	(original)
+++ trunk/libnm-util/nm-utils.h	Tue May 13 16:57:01 2008
@@ -166,7 +166,7 @@
 	NMU_SEC_WPA_PSK,
 	NMU_SEC_WPA_ENTERPRISE,
 	NMU_SEC_WPA2_PSK,
-	NMU_SEC_WPA2_ENTERPRISE,
+	NMU_SEC_WPA2_ENTERPRISE
 } NMUtilsSecurityType;
 
 gboolean nm_utils_security_valid (NMUtilsSecurityType type,