colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm-glib: return enums for NMAccessPoint flags accessors

Browse Source
This commit is contained in:
Dan Williams
2011-02-18 11:42:55 -06:00
parent e765fce2b4
commit 24c429e29e
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libnm-glib/nm-access-point.c
View File

@@ -38,9 +38,9 @@ typedef struct {
gboolean disposed; gboolean disposed;
DBusGProxy *proxy; DBusGProxy *proxy;
guint32 flags; NM80211ApFlags flags;
guint32 wpa_flags; NM80211ApSecurityFlags wpa_flags;
guint32 rsn_flags; NM80211ApSecurityFlags rsn_flags;
GByteArray *ssid; GByteArray *ssid;
guint32 frequency; guint32 frequency;
char *hw_address; char *hw_address;
@@ -99,11 +99,11 @@ nm_access_point_new (DBusGConnection *connection, const char *path)
* nm_access_point_get_flags: * nm_access_point_get_flags:
* @ap: a #NMAccessPoint * @ap: a #NMAccessPoint
* *
* Gets the flags of the access point * Gets the flags of the access point.
* *
* Returns: the flags * Returns: the flags
**/ **/
guint32 NM80211ApFlags
nm_access_point_get_flags (NMAccessPoint *ap) nm_access_point_get_flags (NMAccessPoint *ap)
{ {
NMAccessPointPrivate *priv; NMAccessPointPrivate *priv;
@@ -125,11 +125,11 @@ nm_access_point_get_flags (NMAccessPoint *ap)
* nm_access_point_get_wpa_flags: * nm_access_point_get_wpa_flags:
* @ap: a #NMAccessPoint * @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 * Returns: the WPA flags
**/ **/
guint32 NM80211ApSecurityFlags
nm_access_point_get_wpa_flags (NMAccessPoint *ap) nm_access_point_get_wpa_flags (NMAccessPoint *ap)
{ {
NMAccessPointPrivate *priv; NMAccessPointPrivate *priv;
@@ -151,11 +151,12 @@ nm_access_point_get_wpa_flags (NMAccessPoint *ap)
* nm_access_point_get_rsn_flags: * nm_access_point_get_rsn_flags:
* @ap: a #NMAccessPoint * @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 * Returns: the RSN flags
**/ **/
guint32 NM80211ApSecurityFlags
nm_access_point_get_rsn_flags (NMAccessPoint *ap) nm_access_point_get_rsn_flags (NMAccessPoint *ap)
{ {
NMAccessPointPrivate *priv; NMAccessPointPrivate *priv;

8
libnm-glib/nm-access-point.h
View File

@@ -18,7 +18,7 @@
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* Copyright (C) 2007 - 2008 Novell, Inc. * 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 #ifndef NM_ACCESS_POINT_H
@@ -68,9 +68,9 @@ GType nm_access_point_get_type (void);
GObject *nm_access_point_new (DBusGConnection *connection, const char *path); GObject *nm_access_point_new (DBusGConnection *connection, const char *path);
guint32 nm_access_point_get_flags (NMAccessPoint *ap); NM80211ApFlags nm_access_point_get_flags (NMAccessPoint *ap);
guint32 nm_access_point_get_wpa_flags (NMAccessPoint *ap); NM80211ApSecurityFlags nm_access_point_get_wpa_flags (NMAccessPoint *ap);
guint32 nm_access_point_get_rsn_flags (NMAccessPoint *ap); NM80211ApSecurityFlags nm_access_point_get_rsn_flags (NMAccessPoint *ap);
const GByteArray * nm_access_point_get_ssid (NMAccessPoint *ap); const GByteArray * nm_access_point_get_ssid (NMAccessPoint *ap);
guint32 nm_access_point_get_frequency (NMAccessPoint *ap); guint32 nm_access_point_get_frequency (NMAccessPoint *ap);
const char * nm_access_point_get_hw_address (NMAccessPoint *ap); const char * nm_access_point_get_hw_address (NMAccessPoint *ap);