From d9e7b0082ab2297ec28ea689563e6e3197a5890f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 4 Dec 2006 19:07:22 +0000 Subject: [PATCH] 2006-12-04 Dan Williams * src/supplicant-manager/nm-supplicant-interface.c - (bssid_properties_cb): don't treat DBus errors as valid scanned AP messages git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2159 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/supplicant-manager/nm-supplicant-interface.c | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index 914fb4b842..3be9f22407 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-12-04 Dan Williams + + * src/supplicant-manager/nm-supplicant-interface.c + - (bssid_properties_cb): don't treat DBus errors as valid + scanned AP messages + 2006-12-04 Dan Williams * src/supplicant-manager/nm-supplicant-interface.[ch] diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index 1431a9c605..b48ce10d20 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -506,6 +506,17 @@ bssid_properties_cb (DBusPendingCall * pcall, if (!(reply = dbus_pending_call_steal_reply (pcall))) goto out; + if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR) { + if (!dbus_set_error_from_message (&error, reply)) { + nm_warning ("Couldn't set error from DBus message."); + goto out; + } + nm_warning ("Couldn't retrieve BSSID properties: %s - %s", + error.name, + error.message); + goto out; + } + g_signal_emit (G_OBJECT (self), nm_supplicant_interface_signals[SCANNED_AP], 0,