summary refs log tree commit diff
path: root/libnm-glib/nm-access-point.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2013-02-03 14:49:22 +0100
committerMichael Biebl <biebl@debian.org>2013-02-03 14:49:22 +0100
commit9c202e3e860b3be9e1f8882630b69affbb130102 (patch)
tree8202bf39f2129486971fa7d5ae0dee61a561aa53 /libnm-glib/nm-access-point.c
parent36cb2f364a821e1be50b23e03a18891ec55adb06 (diff)
Imported Upstream version 0.9.7.995 upstream/0.9.7.995
Diffstat (limited to 'libnm-glib/nm-access-point.c')
-rw-r--r--libnm-glib/nm-access-point.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index fef65575..9326d3ab 100644
--- a/libnm-glib/nm-access-point.c
+++ b/libnm-glib/nm-access-point.c
@@ -347,6 +347,9 @@ nm_access_point_connection_valid (NMAccessPoint *ap, NMConnection *connection)
 			return FALSE;
 		if (!strcmp (setting_mode, "adhoc") && (ap_mode != NM_802_11_MODE_ADHOC))
 			return FALSE;
+		/* Hotspot never matches against APs as it's a device-specific mode. */
+		if (!strcmp (setting_mode, "ap"))
+			return FALSE;
 	}
 
 	/* Band and Channel/Frequency */
@@ -658,7 +661,9 @@ nm_access_point_class_init (NMAccessPointClass *ap_class)
 	/**
 	 * NMAccessPoint:mode:
 	 *
-	 * The mode of the access point.
+	 * The mode of the access point; either "infrastructure" (a central
+	 * coordinator of the wireless network allowing clients to connect) or
+	 * "ad-hoc" (a network with no central controller).
 	 **/
 	g_object_class_install_property
 		(object_class, PROP_MODE,