From: Witold Sowa <witold.sowa@gmail.com>
Date: Thu, 3 Dec 2009 19:17:49 +0000 (+0200)
Subject: dbus: switch dbus APIs initialization order
X-Git-Tag: hostap_0_7_1~426
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85d3f273df0aae8dfe25ab12ea8f814f3f2bf146;p=thirdparty%2Fhostap.git

dbus: switch dbus APIs initialization order

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.
---

diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index 7ebe8b6e9..aa3d54878 100644
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -27,17 +27,17 @@ int wpas_notify_supplicant_initialized(struct wpa_global *global)
 	struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
 
 	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) {
 			global->dbus_new_ctrl_iface =
 				cbs->dbus_ctrl_init(global);
 			if (global->dbus_new_ctrl_iface == NULL)
 				return -1;
 		}
+
+		global->dbus_ctrl_iface =
+			wpa_supplicant_dbus_ctrl_iface_init(global);
+		if (global->dbus_ctrl_iface == NULL)
+			return -1;
 	}
 
 	return 0;
@@ -48,11 +48,11 @@ void wpas_notify_supplicant_deinitialized(struct wpa_global *global)
 {
 	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)
 		cbs->dbus_ctrl_deinit(global->dbus_new_ctrl_iface);
+
+	if (global->dbus_ctrl_iface)
+		wpa_supplicant_dbus_ctrl_iface_deinit(global->dbus_ctrl_iface);
 }