diff --git a/ChangeLog b/ChangeLog
index ec17b4416..07730242c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-02-05  Tambet Ingo  <tambet@ximian.com>
 
+	* src/nm-device-802-11-wireless.c (supplicant_iface_scan_result_cb): 
+	* src/supplicant-manager/nm-supplicant-interface.h
+	* src/supplicant-manager/nm-supplicant-interface.c
+	(nm_supplicant_interface_class_init): Change the "scan-result" signal's
+	argument to boolean from enum.
+
 	Make NMDevice abstract class, remove almost all references to it's
 	subclasses (the last place gets removed with new policy manager). Add
 	NMDeviceInterface (which NMDevice implements) so that when we have
diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c
index 7889c3c03..60464dcdc 100644
--- a/src/nm-device-802-11-wireless.c
+++ b/src/nm-device-802-11-wireless.c
@@ -140,7 +140,7 @@ static void supplicant_iface_scanned_ap_cb (NMSupplicantInterface * iface,
                                             NMDevice80211Wireless * self);
 
 static void supplicant_iface_scan_result_cb (NMSupplicantInterface * iface,
-                                             guint32 result,
+                                             gboolean result,
                                              NMDevice80211Wireless * self);
 
 static void supplicant_mgr_state_cb (NMSupplicantInterface * iface,
@@ -1735,7 +1735,7 @@ nm_device_802_11_wireless_disable_encryption (NMDevice80211Wireless *self)
 }
 
 static void supplicant_iface_scan_result_cb (NMSupplicantInterface * iface,
-                                             guint32 result,
+                                             gboolean result,
                                              NMDevice80211Wireless * self)
 {
 	g_return_if_fail (self != NULL);
diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c
index 81e2da947..3f8c0f4d0 100644
--- a/src/supplicant-manager/nm-supplicant-interface.c
+++ b/src/supplicant-manager/nm-supplicant-interface.c
@@ -404,8 +404,8 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NMSupplicantInterfaceClass, scan_result),
 		              NULL, NULL,
-		              g_cclosure_marshal_VOID__UINT,
-		              G_TYPE_NONE, 1, G_TYPE_UINT);
+		              g_cclosure_marshal_VOID__BOOLEAN,
+		              G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
 	nm_supplicant_interface_signals[CONNECTION_STATE] =
 		g_signal_new ("connection-state",
@@ -506,7 +506,7 @@ scan_results_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
 		g_signal_emit (info->interface,
 					   nm_supplicant_interface_signals[SCAN_RESULT],
 					   0,
-					   NM_SUPPLICANT_INTERFACE_SCAN_RESULT_SUCCESS);
+					   TRUE);
 
 		/* Fire off a "properties" call for each returned BSSID */
 		for (i = 0; i < array->len; i++) {
@@ -1104,7 +1104,7 @@ scan_request_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
 	g_signal_emit (info->interface,
 	               nm_supplicant_interface_signals[SCAN_RESULT],
 	               0,
-				   success ? NM_SUPPLICANT_INTERFACE_SCAN_RESULT_SUCCESS : NM_SUPPLICANT_INTERFACE_SCAN_RESULT_ERROR);
+				   success ? TRUE : FALSE);
 }
 
 gboolean
diff --git a/src/supplicant-manager/nm-supplicant-interface.h b/src/supplicant-manager/nm-supplicant-interface.h
index f4fe44916..533718825 100644
--- a/src/supplicant-manager/nm-supplicant-interface.h
+++ b/src/supplicant-manager/nm-supplicant-interface.h
@@ -67,11 +67,6 @@ enum {
 	NM_SUPPLICANT_INTERFACE_CON_STATE_LAST
 };
 
-enum {
-	NM_SUPPLICANT_INTERFACE_SCAN_RESULT_ERROR = 0,
-	NM_SUPPLICANT_INTERFACE_SCAN_RESULT_SUCCESS
-};
-
 #define NM_TYPE_SUPPLICANT_INTERFACE            (nm_supplicant_interface_get_type ())
 #define NM_SUPPLICANT_INTERFACE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SUPPLICANT_INTERFACE, NMSupplicantInterface))
 #define NM_SUPPLICANT_INTERFACE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_SUPPLICANT_INTERFACE, NMSupplicantInterfaceClass))