jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dbus: switch dbus APIs initialization order

Browse source 
Initialize the new DBus API before the old one, so new applications
which can use both, the old and the new API will be notified first
that new API is available.
This commit is contained in:
Witold Sowa 2009-12-03 21:17:49 +02:00 committed by Jouni Malinen
parent a5717c957c
commit 85d3f273df
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
wpa_supplicant/notify.c
View file

@ -27,17 +27,17 @@ int wpas_notify_supplicant_initialized(struct wpa_global *global)
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks(); struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
if (global->params.dbus_ctrl_interface) { if (global->params.dbus_ctrl_interface) {
global->dbus_ctrl_iface =
wpa_supplicant_dbus_ctrl_iface_init(global);
if (global->dbus_ctrl_iface == NULL)
return -1;
if (cbs) { if (cbs) {
global->dbus_new_ctrl_iface = global->dbus_new_ctrl_iface =
cbs->dbus_ctrl_init(global); cbs->dbus_ctrl_init(global);
if (global->dbus_new_ctrl_iface == NULL) if (global->dbus_new_ctrl_iface == NULL)
return -1; return -1;
} }
global->dbus_ctrl_iface =
wpa_supplicant_dbus_ctrl_iface_init(global);
if (global->dbus_ctrl_iface == NULL)
return -1;
} }
return 0; return 0;
@ -48,11 +48,11 @@ void wpas_notify_supplicant_deinitialized(struct wpa_global *global)
{ {
struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks(); struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
if (global->dbus_ctrl_iface)
wpa_supplicant_dbus_ctrl_iface_deinit(global->dbus_ctrl_iface);
if (cbs && global->dbus_new_ctrl_iface) if (cbs && global->dbus_new_ctrl_iface)
cbs->dbus_ctrl_deinit(global->dbus_new_ctrl_iface); cbs->dbus_ctrl_deinit(global->dbus_new_ctrl_iface);
if (global->dbus_ctrl_iface)
wpa_supplicant_dbus_ctrl_iface_deinit(global->dbus_ctrl_iface);
} }