From 24c429e29e3ef6d652bf22cb189cce432ca5df45 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 18 Feb 2011 11:42:55 -0600
Subject: [PATCH] libnm-glib: return enums for NMAccessPoint flags accessors

---
 libnm-glib/nm-access-point.c | 19 ++++++++++---------
 libnm-glib/nm-access-point.h | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index d08bd00da..767296726 100644
--- a/libnm-glib/nm-access-point.c
+++ b/libnm-glib/nm-access-point.c
@@ -38,9 +38,9 @@ typedef struct {
 	gboolean disposed;
 	DBusGProxy *proxy;
 
-	guint32 flags;
-	guint32 wpa_flags;
-	guint32 rsn_flags;
+	NM80211ApFlags flags;
+	NM80211ApSecurityFlags wpa_flags;
+	NM80211ApSecurityFlags rsn_flags;
 	GByteArray *ssid;
 	guint32 frequency;
 	char *hw_address;
@@ -99,11 +99,11 @@ nm_access_point_new (DBusGConnection *connection, const char *path)
  * nm_access_point_get_flags:
  * @ap: a #NMAccessPoint
  *
- * Gets the flags of the access point
+ * Gets the flags of the access point.
  *
  * Returns: the flags
  **/
-guint32
+NM80211ApFlags
 nm_access_point_get_flags (NMAccessPoint *ap)
 {
 	NMAccessPointPrivate *priv;
@@ -125,11 +125,11 @@ nm_access_point_get_flags (NMAccessPoint *ap)
  * nm_access_point_get_wpa_flags:
  * @ap: a #NMAccessPoint
  *
- * Gets the WPA flags of the access point.
+ * Gets the WPA (version 1) flags of the access point.
  *
  * Returns: the WPA flags
  **/
-guint32
+NM80211ApSecurityFlags
 nm_access_point_get_wpa_flags (NMAccessPoint *ap)
 {
 	NMAccessPointPrivate *priv;
@@ -151,11 +151,12 @@ nm_access_point_get_wpa_flags (NMAccessPoint *ap)
  * nm_access_point_get_rsn_flags:
  * @ap: a #NMAccessPoint
  *
- * Gets the RSN flags of the access point.
+ * Gets the RSN (Robust Secure Network, ie WPA version 2) flags of the access
+ * point.
  *
  * Returns: the RSN flags
  **/
-guint32
+NM80211ApSecurityFlags
 nm_access_point_get_rsn_flags (NMAccessPoint *ap)
 {
 	NMAccessPointPrivate *priv;
diff --git a/libnm-glib/nm-access-point.h b/libnm-glib/nm-access-point.h
index 770248152..26d5a493b 100644
--- a/libnm-glib/nm-access-point.h
+++ b/libnm-glib/nm-access-point.h
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2007 - 2008 Novell, Inc.
- * Copyright (C) 2007 - 2008 Red Hat, Inc.
+ * Copyright (C) 2007 - 2011 Red Hat, Inc.
  */
 
 #ifndef NM_ACCESS_POINT_H
@@ -68,15 +68,15 @@ GType nm_access_point_get_type (void);
 
 GObject *nm_access_point_new (DBusGConnection *connection, const char *path);
 
-guint32      nm_access_point_get_flags        (NMAccessPoint *ap);
-guint32      nm_access_point_get_wpa_flags    (NMAccessPoint *ap);
-guint32      nm_access_point_get_rsn_flags    (NMAccessPoint *ap);
-const GByteArray * nm_access_point_get_ssid   (NMAccessPoint *ap);
-guint32      nm_access_point_get_frequency    (NMAccessPoint *ap);
-const char * nm_access_point_get_hw_address   (NMAccessPoint *ap);
-NM80211Mode  nm_access_point_get_mode         (NMAccessPoint *ap);
-guint32      nm_access_point_get_max_bitrate  (NMAccessPoint *ap);
-guint8       nm_access_point_get_strength     (NMAccessPoint *ap);
+NM80211ApFlags         nm_access_point_get_flags        (NMAccessPoint *ap);
+NM80211ApSecurityFlags nm_access_point_get_wpa_flags    (NMAccessPoint *ap);
+NM80211ApSecurityFlags nm_access_point_get_rsn_flags    (NMAccessPoint *ap);
+const GByteArray *     nm_access_point_get_ssid         (NMAccessPoint *ap);
+guint32                nm_access_point_get_frequency    (NMAccessPoint *ap);
+const char *           nm_access_point_get_hw_address   (NMAccessPoint *ap);
+NM80211Mode            nm_access_point_get_mode         (NMAccessPoint *ap);
+guint32                nm_access_point_get_max_bitrate  (NMAccessPoint *ap);
+guint8                 nm_access_point_get_strength     (NMAccessPoint *ap);
 
 G_END_DECLS