Attachment #231957 for bug #320097

View | Details | Raw Unified | Return to bug 320097
Collapse All | Expand All

Lines 810-816 void wpa_dbus_mark_property_changed(struct wpas_dbus_priv *iface, Link Here

(-)a/wpa_supplicant/dbus/dbus_new_helpers.c (-1 / +1 lines)
810	const struct wpa_dbus_property_desc *dsc;	810	const struct wpa_dbus_property_desc *dsc;
811	int i = 0;	811	int i = 0;
812		812
813	if (iface == NULL)	813	if (iface == NULL \|\| path == NULL)
814	return;	814	return;
815		815
816	dbus_connection_get_object_path_data(iface->con, path,	816	dbus_connection_get_object_path_data(iface->con, path,




	DBusMessage *_signal;

	/* Do nothing if the control interface is not turned on */
	if (iface == NULL || wpa_s->dbus_path == NULL)
		return;

	_signal = dbus_message_new_signal(wpa_s->dbus_path,

	if (wpa_s->global == NULL)
		return;
	iface = wpa_s->global->dbus;
	if (iface == NULL || wpa_s->dbus_path == NULL)
		return;

	/* Only send signal if state really changed */

	dbus_bool_t scanning = wpa_s->scanning ? TRUE : FALSE;

	/* Do nothing if the control interface is not turned on */
	if (iface == NULL || wpa_s->dbus_path == NULL)
		return;

	_signal = dbus_message_new_signal(wpa_s->dbus_path,

	if (wpa_s->global == NULL)
		return;
	iface = wpa_s->global->dbus;
	if (iface == NULL || wpa_s->dbus_path == NULL)
		return;

	_signal = dbus_message_new_signal(wpa_s->dbus_path,

Return to bug 320097

Lines 377-383 void wpa_supplicant_dbus_notify_scan_results(struct wpa_supplicant *wpa_s) Link Here

(-)a/wpa_supplicant/dbus/dbus_old.c (-4 / +4 lines)
377	DBusMessage *_signal;	377	DBusMessage *_signal;
378		378
379	/* Do nothing if the control interface is not turned on */	379	/* Do nothing if the control interface is not turned on */
380	if (iface == NULL)	380	if (iface == NULL \|\| wpa_s->dbus_path == NULL)
381	return;	381	return;
382		382
383	_signal = dbus_message_new_signal(wpa_s->dbus_path,	383	_signal = dbus_message_new_signal(wpa_s->dbus_path,
Lines 414-420 void wpa_supplicant_dbus_notify_state_change(struct wpa_supplicant *wpa_s, Link Here
414	if (wpa_s->global == NULL)	414	if (wpa_s->global == NULL)
415	return;	415	return;
416	iface = wpa_s->global->dbus;	416	iface = wpa_s->global->dbus;
417	if (iface == NULL)	417	if (iface == NULL \|\| wpa_s->dbus_path == NULL)
418	return;	418	return;
419		419
420	/* Only send signal if state really changed */	420	/* Only send signal if state really changed */
Lines 473-479 void wpa_supplicant_dbus_notify_scanning(struct wpa_supplicant *wpa_s) Link Here
473	dbus_bool_t scanning = wpa_s->scanning ? TRUE : FALSE;	473	dbus_bool_t scanning = wpa_s->scanning ? TRUE : FALSE;
474		474
475	/* Do nothing if the control interface is not turned on */	475	/* Do nothing if the control interface is not turned on */
476	if (iface == NULL)	476	if (iface == NULL \|\| wpa_s->dbus_path == NULL)
477	return;	477	return;
478		478
479	_signal = dbus_message_new_signal(wpa_s->dbus_path,	479	_signal = dbus_message_new_signal(wpa_s->dbus_path,
Lines 508-514 void wpa_supplicant_dbus_notify_wps_cred(struct wpa_supplicant *wpa_s, Link Here
508	if (wpa_s->global == NULL)	508	if (wpa_s->global == NULL)
509	return;	509	return;
510	iface = wpa_s->global->dbus;	510	iface = wpa_s->global->dbus;
511	if (iface == NULL)	511	if (iface == NULL \|\| wpa_s->dbus_path == NULL)
512	return;	512	return;
513		513
514	_signal = dbus_message_new_signal(wpa_s->dbus_path,	514	_signal = dbus_message_new_signal(wpa_s->dbus_path,