make error replyies not seegv dbus... why error tho?
SVN revision: 43348
This commit is contained in:
parent
d246d2e257
commit
6916f42c84
|
@ -589,10 +589,10 @@ _battery_hal_find_battery(void *user_data, void *reply_data, DBusError *error)
|
||||||
{
|
{
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
char *device;
|
char *device;
|
||||||
|
|
||||||
E_Hal_Manager_Find_Device_By_Capability_Return *ret;
|
E_Hal_Manager_Find_Device_By_Capability_Return *ret;
|
||||||
|
|
||||||
ret = reply_data;
|
ret = reply_data;
|
||||||
|
if (!ret) return;
|
||||||
if (eina_list_count(ret->strings) < 1) return;
|
if (eina_list_count(ret->strings) < 1) return;
|
||||||
EINA_LIST_FOREACH(ret->strings, l, device)
|
EINA_LIST_FOREACH(ret->strings, l, device)
|
||||||
_battery_hal_battery_add(device);
|
_battery_hal_battery_add(device);
|
||||||
|
@ -606,6 +606,7 @@ _battery_hal_find_ac(void *user_data, void *reply_data, DBusError *err)
|
||||||
E_Hal_Manager_Find_Device_By_Capability_Return *ret;
|
E_Hal_Manager_Find_Device_By_Capability_Return *ret;
|
||||||
|
|
||||||
ret = reply_data;
|
ret = reply_data;
|
||||||
|
if (!ret) return;
|
||||||
if (eina_list_count(ret->strings) < 1) return;
|
if (eina_list_count(ret->strings) < 1) return;
|
||||||
EINA_LIST_FOREACH(ret->strings, l, device)
|
EINA_LIST_FOREACH(ret->strings, l, device)
|
||||||
_battery_hal_ac_adapter_add(device);
|
_battery_hal_ac_adapter_add(device);
|
||||||
|
@ -618,6 +619,7 @@ _battery_hal_is_battery(void *user_data, void *reply_data, DBusError *err)
|
||||||
E_Hal_Device_Query_Capability_Return *ret;
|
E_Hal_Device_Query_Capability_Return *ret;
|
||||||
|
|
||||||
ret = reply_data;
|
ret = reply_data;
|
||||||
|
if (!ret) return;
|
||||||
if (dbus_error_is_set(err))
|
if (dbus_error_is_set(err))
|
||||||
{
|
{
|
||||||
dbus_error_free(err);
|
dbus_error_free(err);
|
||||||
|
@ -635,6 +637,7 @@ _battery_hal_is_ac_adapter(void *user_data, void *reply_data, DBusError *err)
|
||||||
E_Hal_Device_Query_Capability_Return *ret;
|
E_Hal_Device_Query_Capability_Return *ret;
|
||||||
|
|
||||||
ret = reply_data;
|
ret = reply_data;
|
||||||
|
if (!ret) return;
|
||||||
if (dbus_error_is_set(err))
|
if (dbus_error_is_set(err))
|
||||||
{
|
{
|
||||||
dbus_error_free(err);
|
dbus_error_free(err);
|
||||||
|
|
Loading…
Reference in New Issue