NetworkManager r3321 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Fri Feb 15 23:12:56 2008
New Revision: 3321
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3321&view=rev

Log:
2008-02-15  Dan Williams  <dcbw redhat com>

	* src/nm-hal-manager.c
		- (modem_device_creator): recognize new HAL modem capabilities



Modified:
   trunk/ChangeLog
   trunk/src/nm-hal-manager.c

Modified: trunk/src/nm-hal-manager.c
==============================================================================
--- trunk/src/nm-hal-manager.c	(original)
+++ trunk/src/nm-hal-manager.c	Fri Feb 15 23:12:56 2008
@@ -211,19 +211,35 @@
 	if (!serial_device || !driver_name)
 		goto out;
 
-	capabilities = libhal_device_get_property_strlist (manager->hal_ctx, udi, "info.capabilities", NULL);
+	capabilities = libhal_device_get_property_strlist (manager->hal_ctx, udi, "modem.command_sets", NULL);
 	for (iter = capabilities; *iter; iter++) {
-		if (!strcmp (*iter, "gsm")) {
+		if (!strcmp (*iter, "GSM-07.07")) {
 			type_gsm = TRUE;
 			break;
 		}
-		if (!strcmp (*iter, "cdma")) {
+		if (!strcmp (*iter, "IS-707-A")) {
 			type_cdma = TRUE;
 			break;
 		}
 	}
 	g_strfreev (capabilities);
 
+	/* Compatiblity with the pre-specification bits */
+	if (!type_gsm && !type_cdma) {
+		capabilities = libhal_device_get_property_strlist (manager->hal_ctx, udi, "info.capabilities", NULL);
+		for (iter = capabilities; *iter; iter++) {
+			if (!strcmp (*iter, "gsm")) {
+				type_gsm = TRUE;
+				break;
+			}
+			if (!strcmp (*iter, "cdma")) {
+				type_cdma = TRUE;
+				break;
+			}
+		}
+		g_strfreev (capabilities);
+	}
+
 	if (type_gsm)
 		device = (NMDevice *) nm_gsm_device_new (udi, serial_device + strlen ("/dev/"), NULL, driver_name);
 	else if (type_cdma)