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

supplicant: don't try to give dbus-glib a NULL path on interface removal

Browse Source
This commit is contained in:
Dan Williams
2009-06-12 10:31:16 -04:00
parent 48e7a9eb47
commit daa8d8c9ca
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/supplicant-manager/nm-supplicant-interface.c
View File

@@ -282,10 +282,13 @@ nm_supplicant_interface_get_property (GObject * object,
} }
static void static void
try_remove_iface (DBusGConnection * g_connection, try_remove_iface (DBusGConnection *g_connection,
const char * path) const char *path)
{ {
DBusGProxy * proxy; DBusGProxy *proxy;
g_return_if_fail (g_connection != NULL);
g_return_if_fail (path != NULL);
proxy = dbus_g_proxy_new_for_name (g_connection, proxy = dbus_g_proxy_new_for_name (g_connection,
WPAS_DBUS_SERVICE, WPAS_DBUS_SERVICE,
@@ -316,8 +319,10 @@ nm_supplicant_interface_dispose (GObject *object)
/* Ask wpa_supplicant to remove this interface */ /* Ask wpa_supplicant to remove this interface */
sm_state = nm_supplicant_manager_get_state (priv->smgr); sm_state = nm_supplicant_manager_get_state (priv->smgr);
if (sm_state == NM_SUPPLICANT_MANAGER_STATE_IDLE) { if (sm_state == NM_SUPPLICANT_MANAGER_STATE_IDLE) {
try_remove_iface (nm_dbus_manager_get_connection (priv->dbus_mgr), if (priv->object_path) {
priv->object_path); try_remove_iface (nm_dbus_manager_get_connection (priv->dbus_mgr),
priv->object_path);
}
} }
if (priv->iface_proxy) if (priv->iface_proxy)