Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
NetworkManager
NetworkManager
Commits
daa8d8c9
Commit
daa8d8c9
authored
Jun 12, 2009
by
Dan Williams
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
supplicant: don't try to give dbus-glib a NULL path on interface removal
parent
48e7a9eb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
5 deletions
+10
-5
src/supplicant-manager/nm-supplicant-interface.c
src/supplicant-manager/nm-supplicant-interface.c
+10
-5
No files found.
src/supplicant-manager/nm-supplicant-interface.c
View file @
daa8d8c9
...
...
@@ -282,10 +282,13 @@ nm_supplicant_interface_get_property (GObject * object,
}
static
void
try_remove_iface
(
DBusGConnection
*
g_connection
,
const
char
*
path
)
try_remove_iface
(
DBusGConnection
*
g_connection
,
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
,
WPAS_DBUS_SERVICE
,
...
...
@@ -316,8 +319,10 @@ nm_supplicant_interface_dispose (GObject *object)
/* Ask wpa_supplicant to remove this interface */
sm_state
=
nm_supplicant_manager_get_state
(
priv
->
smgr
);
if
(
sm_state
==
NM_SUPPLICANT_MANAGER_STATE_IDLE
)
{
try_remove_iface
(
nm_dbus_manager_get_connection
(
priv
->
dbus_mgr
),
priv
->
object_path
);
if
(
priv
->
object_path
)
{
try_remove_iface
(
nm_dbus_manager_get_connection
(
priv
->
dbus_mgr
),
priv
->
object_path
);
}
}
if
(
priv
->
iface_proxy
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment