[PATCH] dbus: switch dbus APIs initialization order

[Dan Williams]

On Tue, 2009-12-01 at 00:38 +0100, Witold Sowa wrote:
> 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.

ACK, as we discussed on IRC...

Dan

> ---
>  wpa_supplicant/notify.c |   16 ++++++++--------
>  1 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
> index 7ebe8b6..aa3d548 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);
>  }
>  
>