Menu
▾
▴
Re: [E-devel] E SVN: barbieri IN trunk/e_dbus/src/lib: bluez ofono
|
From: João P. R. V. <jp...@pr...> - 2010-03-12 13:38:45
|
It seems your editor wasn't proper configured, since you've add a
white space in the beginning of lines starting with a tab.
On Thu, Mar 11, 2010 at 8:16 PM, Enlightenment SVN
<no-...@en...> wrote:
> Log:
> formatting, damn!
>
> Author: barbieri
> Date: 2010-03-11 15:16:25 -0800 (Thu, 11 Mar 2010)
> New Revision: 47145
>
> Modified:
> trunk/e_dbus/src/lib/bluez/e_bluez.c trunk/e_dbus/src/lib/bluez/e_bluez_adapter.c trunk/e_dbus/src/lib/bluez/e_bluez_devicefound.c trunk/e_dbus/src/lib/bluez/e_bluez_element.c trunk/e_dbus/src/lib/ofono/e_ofono.c trunk/e_dbus/src/lib/ofono/e_ofono_element.c
>
> Modified: trunk/e_dbus/src/lib/bluez/e_bluez.c
> ===================================================================
> --- trunk/e_dbus/src/lib/bluez/e_bluez.c 2010-03-11 22:35:55 UTC (rev 47144)
> +++ trunk/e_dbus/src/lib/bluez/e_bluez.c 2010-03-11 23:16:25 UTC (rev 47145)
> @@ -104,8 +104,8 @@
> DBG("enter bluez at %s (old was %s)", uid, unique_name);
> if (unique_name && strcmp(unique_name, uid) == 0)
> {
> - DBG("same unique_name for bluez, ignore.");
> - return;
> + DBG("same unique_name for bluez, ignore.");
> + return;
> }
>
> if (unique_name)
> @@ -126,15 +126,15 @@
>
> dbus_error_init(&err);
> if (!dbus_message_get_args(msg, &err,
> - DBUS_TYPE_STRING, &name,
> - DBUS_TYPE_STRING, &from,
> - DBUS_TYPE_STRING, &to,
> - DBUS_TYPE_INVALID))
> + DBUS_TYPE_STRING, &name,
> + DBUS_TYPE_STRING, &from,
> + DBUS_TYPE_STRING, &to,
> + DBUS_TYPE_INVALID))
> {
> - ERR("could not get NameOwnerChanged arguments: %s: %s",
> - err.name, err.message);
> - dbus_error_free(&err);
> - return;
> + ERR("could not get NameOwnerChanged arguments: %s: %s",
> + err.name, err.message);
> + dbus_error_free(&err);
> + return;
> }
>
> if (strcmp(name, bus_name) != 0)
> @@ -146,11 +146,11 @@
> _e_bluez_system_name_owner_enter(to);
> else if (from[0] != '\0' && to[0] == '\0')
> {
> - DBG("exit bluez at %s", from);
> - if (strcmp(unique_name, from) != 0)
> - DBG("%s was not the known name %s, ignored.", from, unique_name);
> - else
> - _e_bluez_system_name_owner_exit();
> + DBG("exit bluez at %s", from);
> + if (strcmp(unique_name, from) != 0)
> + DBG("%s was not the known name %s, ignored.", from, unique_name);
> + else
> + _e_bluez_system_name_owner_exit();
> }
> else
> DBG("unknow change from %s to %s", from, to);
> @@ -175,8 +175,8 @@
> dbus_message_iter_get_basic(&itr, &uid);
> if (!uid)
> {
> - ERR("no name owner!");
> - return;
> + ERR("no name owner!");
> + return;
> }
>
> _e_bluez_system_name_owner_enter(uid);
> @@ -210,86 +210,87 @@
> unsigned int
> e_bluez_system_init(E_DBus_Connection *edbus_conn)
> {
> - init_count++;
> + init_count++;
>
> - if (init_count > 1)
> - return init_count;
> + if (init_count > 1)
> + return init_count;
>
> - _e_dbus_bluez_log_dom = eina_log_domain_register
> - ("e_dbus_bluez", EINA_LOG_DEFAULT_COLOR);
> + _e_dbus_bluez_log_dom = eina_log_domain_register
> + ("e_dbus_bluez", EINA_LOG_DEFAULT_COLOR);
>
> - if(_e_dbus_bluez_log_dom < 0) {
> - EINA_LOG_ERR
> - ("impossible to create a log domain for edbus_bluez module");
> - return -1;
> - }
> + if(_e_dbus_bluez_log_dom < 0)
> + {
> + EINA_LOG_ERR
> + ("impossible to create a log domain for edbus_bluez module");
> + return -1;
> + }
>
> - if (E_BLUEZ_EVENT_MANAGER_IN == 0)
> - E_BLUEZ_EVENT_MANAGER_IN = ecore_event_type_new();
> - if (E_BLUEZ_EVENT_MANAGER_OUT == 0)
> - E_BLUEZ_EVENT_MANAGER_OUT = ecore_event_type_new();
> - if (E_BLUEZ_EVENT_ELEMENT_ADD == 0)
> - E_BLUEZ_EVENT_ELEMENT_ADD = ecore_event_type_new();
> - if (E_BLUEZ_EVENT_ELEMENT_DEL == 0)
> - E_BLUEZ_EVENT_ELEMENT_DEL = ecore_event_type_new();
> - if (E_BLUEZ_EVENT_ELEMENT_UPDATED == 0)
> - E_BLUEZ_EVENT_ELEMENT_UPDATED = ecore_event_type_new();
> - if (E_BLUEZ_EVENT_DEVICE_FOUND == 0)
> - E_BLUEZ_EVENT_DEVICE_FOUND = ecore_event_type_new();
> + if (E_BLUEZ_EVENT_MANAGER_IN == 0)
> + E_BLUEZ_EVENT_MANAGER_IN = ecore_event_type_new();
> + if (E_BLUEZ_EVENT_MANAGER_OUT == 0)
> + E_BLUEZ_EVENT_MANAGER_OUT = ecore_event_type_new();
> + if (E_BLUEZ_EVENT_ELEMENT_ADD == 0)
> + E_BLUEZ_EVENT_ELEMENT_ADD = ecore_event_type_new();
> + if (E_BLUEZ_EVENT_ELEMENT_DEL == 0)
> + E_BLUEZ_EVENT_ELEMENT_DEL = ecore_event_type_new();
> + if (E_BLUEZ_EVENT_ELEMENT_UPDATED == 0)
> + E_BLUEZ_EVENT_ELEMENT_UPDATED = ecore_event_type_new();
> + if (E_BLUEZ_EVENT_DEVICE_FOUND == 0)
> + E_BLUEZ_EVENT_DEVICE_FOUND = ecore_event_type_new();
>
> - if (e_bluez_iface_manager == NULL)
> - e_bluez_iface_manager = eina_stringshare_add("org.bluez.Manager");
> - if (e_bluez_iface_adapter == NULL)
> - e_bluez_iface_adapter = eina_stringshare_add("org.bluez.Adapter");
> - if (e_bluez_iface_device == NULL)
> - e_bluez_iface_device = eina_stringshare_add("org.bluez.Device");
> - if (e_bluez_prop_address == NULL)
> - e_bluez_prop_address = eina_stringshare_add("Address");
> - if (e_bluez_prop_name == NULL)
> - e_bluez_prop_name = eina_stringshare_add("Name");
> - if (e_bluez_prop_alias == NULL)
> - e_bluez_prop_alias = eina_stringshare_add("Alias");
> - if (e_bluez_prop_class == NULL)
> - e_bluez_prop_class = eina_stringshare_add("Class");
> - if (e_bluez_prop_icon == NULL)
> - e_bluez_prop_icon = eina_stringshare_add("Icon");
> - if (e_bluez_prop_paired == NULL)
> - e_bluez_prop_paired = eina_stringshare_add("Paired");
> - if (e_bluez_prop_trusted == NULL)
> - e_bluez_prop_trusted = eina_stringshare_add("Trusted");
> - if (e_bluez_prop_connected == NULL)
> - e_bluez_prop_connected = eina_stringshare_add("Connected");
> - if (e_bluez_prop_uuids == NULL)
> - e_bluez_prop_uuids = eina_stringshare_add("UUIDs");
> - if (e_bluez_prop_powered == NULL)
> - e_bluez_prop_powered = eina_stringshare_add("Powered");
> - if (e_bluez_prop_discoverable == NULL)
> - e_bluez_prop_discoverable = eina_stringshare_add("Discoverable");
> - if (e_bluez_prop_pairable == NULL)
> - e_bluez_prop_pairable = eina_stringshare_add("Pairable");
> - if (e_bluez_prop_discoverabletimeout == NULL)
> - e_bluez_prop_discoverabletimeout = eina_stringshare_add("DiscoverableTimeout");
> - if (e_bluez_prop_pairabletimeout == NULL)
> - e_bluez_prop_pairabletimeout = eina_stringshare_add("PairableTimeout");
> - if (e_bluez_prop_discovering == NULL)
> - e_bluez_prop_discovering = eina_stringshare_add("Discovering");
> - if (e_bluez_prop_devices == NULL)
> - e_bluez_prop_devices = eina_stringshare_add("Devices");
> + if (e_bluez_iface_manager == NULL)
> + e_bluez_iface_manager = eina_stringshare_add("org.bluez.Manager");
> + if (e_bluez_iface_adapter == NULL)
> + e_bluez_iface_adapter = eina_stringshare_add("org.bluez.Adapter");
> + if (e_bluez_iface_device == NULL)
> + e_bluez_iface_device = eina_stringshare_add("org.bluez.Device");
> + if (e_bluez_prop_address == NULL)
> + e_bluez_prop_address = eina_stringshare_add("Address");
> + if (e_bluez_prop_name == NULL)
> + e_bluez_prop_name = eina_stringshare_add("Name");
> + if (e_bluez_prop_alias == NULL)
> + e_bluez_prop_alias = eina_stringshare_add("Alias");
> + if (e_bluez_prop_class == NULL)
> + e_bluez_prop_class = eina_stringshare_add("Class");
> + if (e_bluez_prop_icon == NULL)
> + e_bluez_prop_icon = eina_stringshare_add("Icon");
> + if (e_bluez_prop_paired == NULL)
> + e_bluez_prop_paired = eina_stringshare_add("Paired");
> + if (e_bluez_prop_trusted == NULL)
> + e_bluez_prop_trusted = eina_stringshare_add("Trusted");
> + if (e_bluez_prop_connected == NULL)
> + e_bluez_prop_connected = eina_stringshare_add("Connected");
> + if (e_bluez_prop_uuids == NULL)
> + e_bluez_prop_uuids = eina_stringshare_add("UUIDs");
> + if (e_bluez_prop_powered == NULL)
> + e_bluez_prop_powered = eina_stringshare_add("Powered");
> + if (e_bluez_prop_discoverable == NULL)
> + e_bluez_prop_discoverable = eina_stringshare_add("Discoverable");
> + if (e_bluez_prop_pairable == NULL)
> + e_bluez_prop_pairable = eina_stringshare_add("Pairable");
> + if (e_bluez_prop_discoverabletimeout == NULL)
> + e_bluez_prop_discoverabletimeout = eina_stringshare_add("DiscoverableTimeout");
> + if (e_bluez_prop_pairabletimeout == NULL)
> + e_bluez_prop_pairabletimeout = eina_stringshare_add("PairableTimeout");
> + if (e_bluez_prop_discovering == NULL)
> + e_bluez_prop_discovering = eina_stringshare_add("Discovering");
> + if (e_bluez_prop_devices == NULL)
> + e_bluez_prop_devices = eina_stringshare_add("Devices");
>
> - e_bluez_conn = edbus_conn;
> - cb_name_owner_changed = e_dbus_signal_handler_add
> - (e_bluez_conn, fdo_bus_name, fdo_path, fdo_interface, "NameOwnerChanged",
> - _e_bluez_system_name_owner_changed, NULL);
> + e_bluez_conn = edbus_conn;
> + cb_name_owner_changed = e_dbus_signal_handler_add
> + (e_bluez_conn, fdo_bus_name, fdo_path, fdo_interface, "NameOwnerChanged",
> + _e_bluez_system_name_owner_changed, NULL);
>
> - if (pending_get_name_owner)
> - dbus_pending_call_cancel(pending_get_name_owner);
> + if (pending_get_name_owner)
> + dbus_pending_call_cancel(pending_get_name_owner);
>
> - pending_get_name_owner = e_dbus_get_name_owner
> - (e_bluez_conn, bus_name, _e_bluez_get_name_owner, NULL);
> + pending_get_name_owner = e_dbus_get_name_owner
> + (e_bluez_conn, bus_name, _e_bluez_get_name_owner, NULL);
>
> - e_bluez_elements_init();
> + e_bluez_elements_init();
>
> - return init_count;
> + return init_count;
> }
>
>
> @@ -311,53 +312,53 @@
> unsigned int
> e_bluez_system_shutdown(void)
> {
> - if (init_count == 0)
> - {
> - ERR("bluez system already shut down.");
> - return 0;
> - }
> - init_count--;
> - if (init_count > 0)
> - return init_count;
> + if (init_count == 0)
> + {
> + ERR("bluez system already shut down.");
> + return 0;
> + }
> + init_count--;
> + if (init_count > 0)
> + return init_count;
>
> - _stringshare_del(&e_bluez_iface_manager);
> - _stringshare_del(&e_bluez_iface_adapter);
> - _stringshare_del(&e_bluez_iface_device);
> - _stringshare_del(&e_bluez_prop_address);
> - _stringshare_del(&e_bluez_prop_name);
> - _stringshare_del(&e_bluez_prop_alias);
> - _stringshare_del(&e_bluez_prop_class);
> - _stringshare_del(&e_bluez_prop_icon);
> - _stringshare_del(&e_bluez_prop_paired);
> - _stringshare_del(&e_bluez_prop_trusted);
> - _stringshare_del(&e_bluez_prop_connected);
> - _stringshare_del(&e_bluez_prop_uuids);
> - _stringshare_del(&e_bluez_prop_powered);
> - _stringshare_del(&e_bluez_prop_discoverable);
> - _stringshare_del(&e_bluez_prop_pairable);
> - _stringshare_del(&e_bluez_prop_discoverabletimeout);
> - _stringshare_del(&e_bluez_prop_pairabletimeout);
> - _stringshare_del(&e_bluez_prop_discovering);
> - _stringshare_del(&e_bluez_prop_devices);
> + _stringshare_del(&e_bluez_iface_manager);
> + _stringshare_del(&e_bluez_iface_adapter);
> + _stringshare_del(&e_bluez_iface_device);
> + _stringshare_del(&e_bluez_prop_address);
> + _stringshare_del(&e_bluez_prop_name);
> + _stringshare_del(&e_bluez_prop_alias);
> + _stringshare_del(&e_bluez_prop_class);
> + _stringshare_del(&e_bluez_prop_icon);
> + _stringshare_del(&e_bluez_prop_paired);
> + _stringshare_del(&e_bluez_prop_trusted);
> + _stringshare_del(&e_bluez_prop_connected);
> + _stringshare_del(&e_bluez_prop_uuids);
> + _stringshare_del(&e_bluez_prop_powered);
> + _stringshare_del(&e_bluez_prop_discoverable);
> + _stringshare_del(&e_bluez_prop_pairable);
> + _stringshare_del(&e_bluez_prop_discoverabletimeout);
> + _stringshare_del(&e_bluez_prop_pairabletimeout);
> + _stringshare_del(&e_bluez_prop_discovering);
> + _stringshare_del(&e_bluez_prop_devices);
>
> - if (pending_get_name_owner)
> - {
> - dbus_pending_call_cancel(pending_get_name_owner);
> - pending_get_name_owner = NULL;
> - }
> + if (pending_get_name_owner)
> + {
> + dbus_pending_call_cancel(pending_get_name_owner);
> + pending_get_name_owner = NULL;
> + }
>
> - if (cb_name_owner_changed)
> - {
> - e_dbus_signal_handler_del(e_bluez_conn, cb_name_owner_changed);
> - cb_name_owner_changed = NULL;
> - }
> + if (cb_name_owner_changed)
> + {
> + e_dbus_signal_handler_del(e_bluez_conn, cb_name_owner_changed);
> + cb_name_owner_changed = NULL;
> + }
>
> - if (unique_name)
> - _e_bluez_system_name_owner_exit();
> + if (unique_name)
> + _e_bluez_system_name_owner_exit();
>
> - e_bluez_elements_shutdown();
> - eina_log_domain_unregister(_e_dbus_bluez_log_dom);
> - e_bluez_conn = NULL;
> + e_bluez_elements_shutdown();
> + eina_log_domain_unregister(_e_dbus_bluez_log_dom);
> + e_bluez_conn = NULL;
>
> - return init_count;
> + return init_count;
> }
>
> Modified: trunk/e_dbus/src/lib/bluez/e_bluez_adapter.c
> ===================================================================
> --- trunk/e_dbus/src/lib/bluez/e_bluez_adapter.c 2010-03-11 22:35:55 UTC (rev 47144)
> +++ trunk/e_dbus/src/lib/bluez/e_bluez_adapter.c 2010-03-11 23:16:25 UTC (rev 47145)
> @@ -16,16 +16,17 @@
> return;
>
> device = calloc(sizeof(E_Bluez_Device_Found), 1);
> - if (!device) {
> - ERR("No memory to alocate E_Bluez_Device_Found");
> - return;
> - }
> + if (!device)
> + {
> + ERR("No memory to alocate E_Bluez_Device_Found");
> + return;
> + }
>
> t = dbus_message_iter_get_arg_type(&itr);
> if (!_dbus_iter_type_check(t, DBUS_TYPE_STRING))
> {
> - ERR("missing device name in DeviceFound");
> - return;
> + ERR("missing device name in DeviceFound");
> + return;
> }
> dbus_message_iter_get_basic(&itr, &name);
>
> @@ -33,14 +34,14 @@
> t = dbus_message_iter_get_arg_type(&itr);
> if (!_dbus_iter_type_check(t, DBUS_TYPE_ARRAY))
> {
> - ERR("missing array in DeviceFound");
> - return;
> + ERR("missing array in DeviceFound");
> + return;
> }
>
> value = e_bluez_element_iter_get_array(&itr, name);
>
> if (!value)
> - return;
> + return;
>
> device->name = eina_stringshare_add(name);
> device->adapter = element;
> @@ -278,7 +279,8 @@
> }
>
> /**
> - * Call method SetProperty("DiscoverableTimeout", timeout) at the given element on server.
> + * Call method SetProperty("DiscoverableTimeout", timeout) at the
> + * given element on server.
> *
> * This is a server call, not local, so it may fail and in that case
> * no property is updated locally. If the value was set the event
> @@ -347,8 +349,8 @@
> element->path, element->interface, "DeviceFound",
> _device_found_callback, element);
>
> - return e_bluez_element_call_full(element, name, NULL,
> - &element->_pending.start_discovery, cb, data);
> + return e_bluez_element_call_full
> + (element, name, NULL, &element->_pending.start_discovery, cb, data);
> }
>
> /**
> @@ -369,8 +371,8 @@
>
> EINA_SAFETY_ON_NULL_RETURN_VAL(element, 0);
>
> - return e_bluez_element_call_full(element, name, NULL,
> - &element->_pending.stop_discovery, cb, data);
> + return e_bluez_element_call_full
> + (element, name, NULL, &element->_pending.stop_discovery, cb, data);
> }
>
> /**
> @@ -411,6 +413,7 @@
> dbus_message_iter_append_basic(&itr, DBUS_TYPE_OBJECT_PATH, &object_path);
> dbus_message_iter_append_basic(&itr, DBUS_TYPE_STRING, &capability);
>
> - return e_bluez_element_message_send(element, name, NULL, msg,
> - &element->_pending.create_paired_device, cb, data);
> + return e_bluez_element_message_send
> + (element, name, NULL, msg,
> + &element->_pending.create_paired_device, cb, data);
> }
>
> Modified: trunk/e_dbus/src/lib/bluez/e_bluez_devicefound.c
> ===================================================================
> --- trunk/e_dbus/src/lib/bluez/e_bluez_devicefound.c 2010-03-11 22:35:55 UTC (rev 47144)
> +++ trunk/e_dbus/src/lib/bluez/e_bluez_devicefound.c 2010-03-11 23:16:25 UTC (rev 47145)
> @@ -18,15 +18,14 @@
> e_bluez_devicefound_alias_get(E_Bluez_Device_Found *device)
> {
> E_Bluez_Element_Dict_Entry *entry;
> - const char *alias = eina_stringshare_add("Alias");
>
> EINA_SAFETY_ON_NULL_RETURN_VAL(device, NULL);
>
> - entry = e_bluez_element_array_dict_find_stringshared(device->array,
> - alias);
> + entry = e_bluez_element_array_dict_find_stringshared
> + (device->array, e_bluez_prop_alias);
>
> - if (entry->type == DBUS_TYPE_STRING)
> - return entry->value.str;
> + if ((entry) && (entry->type == DBUS_TYPE_STRING))
> + return entry->value.str;
>
> return NULL;
> }
>
> Modified: trunk/e_dbus/src/lib/bluez/e_bluez_element.c
> ===================================================================
> --- trunk/e_dbus/src/lib/bluez/e_bluez_element.c 2010-03-11 22:35:55 UTC (rev 47144)
> +++ trunk/e_dbus/src/lib/bluez/e_bluez_element.c 2010-03-11 23:16:25 UTC (rev 47145)
> @@ -1286,9 +1286,12 @@
> t = dbus_message_iter_get_arg_type(&v_itr);
> if (t == DBUS_TYPE_ARRAY)
> value = e_bluez_element_iter_get_array(&v_itr, key);
> - else if (t != DBUS_TYPE_INVALID) {
> + else if (t != DBUS_TYPE_INVALID)
> + {
> dbus_message_iter_get_basic(&v_itr, &value);
> - } else {
> + }
> + else
> + {
> ERR("property has invalid type %s", key);
> continue;
> }
>
> Modified: trunk/e_dbus/src/lib/ofono/e_ofono.c
> ===================================================================
> --- trunk/e_dbus/src/lib/ofono/e_ofono.c 2010-03-11 22:35:55 UTC (rev 47144)
> +++ trunk/e_dbus/src/lib/ofono/e_ofono.c 2010-03-11 23:16:25 UTC (rev 47145)
> @@ -95,8 +95,8 @@
> DBG("enter ofono at %s (old was %s)", uid, unique_name);
> if (unique_name && strcmp(unique_name, uid) == 0)
> {
> - DBG("same unique_name for ofono, ignore.");
> - return;
> + DBG("same unique_name for ofono, ignore.");
> + return;
> }
>
> if (unique_name)
> @@ -117,15 +117,15 @@
>
> dbus_error_init(&err);
> if (!dbus_message_get_args(msg, &err,
> - DBUS_TYPE_STRING, &name,
> - DBUS_TYPE_STRING, &from,
> - DBUS_TYPE_STRING, &to,
> - DBUS_TYPE_INVALID))
> + DBUS_TYPE_STRING, &name,
> + DBUS_TYPE_STRING, &from,
> + DBUS_TYPE_STRING, &to,
> + DBUS_TYPE_INVALID))
> {
> - ERR("could not get NameOwnerChanged arguments: %s: %s",
> - err.name, err.message);
> - dbus_error_free(&err);
> - return;
> + ERR("could not get NameOwnerChanged arguments: %s: %s",
> + err.name, err.message);
> + dbus_error_free(&err);
> + return;
> }
>
> if (strcmp(name, bus_name) != 0)
> @@ -137,11 +137,11 @@
> _e_ofono_system_name_owner_enter(to);
> else if (from[0] != '\0' && to[0] == '\0')
> {
> - DBG("exit ofono at %s", from);
> - if (strcmp(unique_name, from) != 0)
> - DBG("%s was not the known name %s, ignored.", from, unique_name);
> - else
> - _e_ofono_system_name_owner_exit();
> + DBG("exit ofono at %s", from);
> + if (strcmp(unique_name, from) != 0)
> + DBG("%s was not the known name %s, ignored.", from, unique_name);
> + else
> + _e_ofono_system_name_owner_exit();
> }
> else
> DBG("unknow change from %s to %s", from, to);
> @@ -166,8 +166,8 @@
> dbus_message_iter_get_basic(&itr, &uid);
> if (!uid)
> {
> - ERR("no name owner!");
> - return;
> + ERR("no name owner!");
> + return;
> }
>
> _e_ofono_system_name_owner_enter(uid);
> @@ -199,68 +199,69 @@
> unsigned int
> e_ofono_system_init(E_DBus_Connection *edbus_conn)
> {
> - init_count++;
> + init_count++;
>
> - if (init_count > 1)
> - return init_count;
> + if (init_count > 1)
> + return init_count;
>
> - _e_dbus_ofono_log_dom = eina_log_domain_register
> - ("e_dbus_ofono", EINA_LOG_DEFAULT_COLOR);
> + _e_dbus_ofono_log_dom = eina_log_domain_register
> + ("e_dbus_ofono", EINA_LOG_DEFAULT_COLOR);
>
> - if(_e_dbus_ofono_log_dom < 0) {
> - EINA_LOG_ERR
> - ("impossible to create a log domain for edbus_ofono module");
> - return -1;
> - }
> + if(_e_dbus_ofono_log_dom < 0)
> + {
> + EINA_LOG_ERR
> + ("impossible to create a log domain for edbus_ofono module");
> + return -1;
> + }
>
> - if (E_OFONO_EVENT_MANAGER_IN == 0)
> - E_OFONO_EVENT_MANAGER_IN = ecore_event_type_new();
> - if (E_OFONO_EVENT_MANAGER_OUT == 0)
> - E_OFONO_EVENT_MANAGER_OUT = ecore_event_type_new();
> - if (E_OFONO_EVENT_ELEMENT_ADD == 0)
> - E_OFONO_EVENT_ELEMENT_ADD = ecore_event_type_new();
> - if (E_OFONO_EVENT_ELEMENT_DEL == 0)
> - E_OFONO_EVENT_ELEMENT_DEL = ecore_event_type_new();
> - if (E_OFONO_EVENT_ELEMENT_UPDATED == 0)
> - E_OFONO_EVENT_ELEMENT_UPDATED = ecore_event_type_new();
> + if (E_OFONO_EVENT_MANAGER_IN == 0)
> + E_OFONO_EVENT_MANAGER_IN = ecore_event_type_new();
> + if (E_OFONO_EVENT_MANAGER_OUT == 0)
> + E_OFONO_EVENT_MANAGER_OUT = ecore_event_type_new();
> + if (E_OFONO_EVENT_ELEMENT_ADD == 0)
> + E_OFONO_EVENT_ELEMENT_ADD = ecore_event_type_new();
> + if (E_OFONO_EVENT_ELEMENT_DEL == 0)
> + E_OFONO_EVENT_ELEMENT_DEL = ecore_event_type_new();
> + if (E_OFONO_EVENT_ELEMENT_UPDATED == 0)
> + E_OFONO_EVENT_ELEMENT_UPDATED = ecore_event_type_new();
>
> - if (e_ofono_iface_manager == NULL)
> - e_ofono_iface_manager = eina_stringshare_add("org.ofono.Manager");
> - if (e_ofono_prop_modems == NULL)
> - e_ofono_prop_modems = eina_stringshare_add("Modems");
> - if (e_ofono_iface_modem == NULL)
> - e_ofono_iface_modem = eina_stringshare_add("org.ofono.Modem");
> - if (e_ofono_prop_name == NULL)
> - e_ofono_prop_name = eina_stringshare_add("Name");
> - if (e_ofono_prop_powered == NULL)
> - e_ofono_prop_powered = eina_stringshare_add("Powered");
> - if (e_ofono_prop_interfaces == NULL)
> - e_ofono_prop_interfaces = eina_stringshare_add("Interfaces");
> - if (e_ofono_iface_network_reg == NULL)
> - e_ofono_iface_network_reg = eina_stringshare_add("org.ofono.NetworkRegistration");
> - if (e_ofono_prop_mode == NULL)
> - e_ofono_prop_mode = eina_stringshare_add("Mode");
> - if (e_ofono_prop_status == NULL)
> - e_ofono_prop_status = eina_stringshare_add("Status");
> - if (e_ofono_prop_operator == NULL)
> - e_ofono_prop_operator = eina_stringshare_add("Operator");
> - if (e_ofono_prop_strength == NULL)
> - e_ofono_prop_strength = eina_stringshare_add("Strength");
> + if (e_ofono_iface_manager == NULL)
> + e_ofono_iface_manager = eina_stringshare_add("org.ofono.Manager");
> + if (e_ofono_prop_modems == NULL)
> + e_ofono_prop_modems = eina_stringshare_add("Modems");
> + if (e_ofono_iface_modem == NULL)
> + e_ofono_iface_modem = eina_stringshare_add("org.ofono.Modem");
> + if (e_ofono_prop_name == NULL)
> + e_ofono_prop_name = eina_stringshare_add("Name");
> + if (e_ofono_prop_powered == NULL)
> + e_ofono_prop_powered = eina_stringshare_add("Powered");
> + if (e_ofono_prop_interfaces == NULL)
> + e_ofono_prop_interfaces = eina_stringshare_add("Interfaces");
> + if (e_ofono_iface_network_reg == NULL)
> + e_ofono_iface_network_reg = eina_stringshare_add("org.ofono.NetworkRegistration");
> + if (e_ofono_prop_mode == NULL)
> + e_ofono_prop_mode = eina_stringshare_add("Mode");
> + if (e_ofono_prop_status == NULL)
> + e_ofono_prop_status = eina_stringshare_add("Status");
> + if (e_ofono_prop_operator == NULL)
> + e_ofono_prop_operator = eina_stringshare_add("Operator");
> + if (e_ofono_prop_strength == NULL)
> + e_ofono_prop_strength = eina_stringshare_add("Strength");
>
> - e_ofono_conn = edbus_conn;
> - cb_name_owner_changed = e_dbus_signal_handler_add
> - (e_ofono_conn, fdo_bus_name, fdo_path, fdo_interface, "NameOwnerChanged",
> - _e_ofono_system_name_owner_changed, NULL);
> + e_ofono_conn = edbus_conn;
> + cb_name_owner_changed = e_dbus_signal_handler_add
> + (e_ofono_conn, fdo_bus_name, fdo_path, fdo_interface, "NameOwnerChanged",
> + _e_ofono_system_name_owner_changed, NULL);
>
> - if (pending_get_name_owner)
> - dbus_pending_call_cancel(pending_get_name_owner);
> + if (pending_get_name_owner)
> + dbus_pending_call_cancel(pending_get_name_owner);
>
> - pending_get_name_owner = e_dbus_get_name_owner
> - (e_ofono_conn, bus_name, _e_ofono_get_name_owner, NULL);
> + pending_get_name_owner = e_dbus_get_name_owner
> + (e_ofono_conn, bus_name, _e_ofono_get_name_owner, NULL);
>
> - e_ofono_elements_init();
> + e_ofono_elements_init();
>
> - return init_count;
> + return init_count;
> }
>
>
> @@ -282,25 +283,25 @@
> unsigned int
> e_ofono_system_shutdown(void)
> {
> - if (init_count == 0)
> - {
> - ERR("ofono system already shut down.");
> - return 0;
> - }
> - init_count--;
> - if (init_count > 0)
> - return init_count;
> + if (init_count == 0)
> + {
> + ERR("ofono system already shut down.");
> + return 0;
> + }
> + init_count--;
> + if (init_count > 0)
> + return init_count;
>
> - _stringshare_del(&e_ofono_iface_manager);
> - _stringshare_del(&e_ofono_prop_modems);
> - _stringshare_del(&e_ofono_iface_modem);
> - _stringshare_del(&e_ofono_prop_name);
> - _stringshare_del(&e_ofono_prop_powered);
> - _stringshare_del(&e_ofono_prop_interfaces);
> - _stringshare_del(&e_ofono_iface_network_reg);
> - _stringshare_del(&e_ofono_prop_mode);
> - _stringshare_del(&e_ofono_prop_status);
> - _stringshare_del(&e_ofono_prop_operator);
> - _stringshare_del(&e_ofono_prop_strength);
> - return 0;
> + _stringshare_del(&e_ofono_iface_manager);
> + _stringshare_del(&e_ofono_prop_modems);
> + _stringshare_del(&e_ofono_iface_modem);
> + _stringshare_del(&e_ofono_prop_name);
> + _stringshare_del(&e_ofono_prop_powered);
> + _stringshare_del(&e_ofono_prop_interfaces);
> + _stringshare_del(&e_ofono_iface_network_reg);
> + _stringshare_del(&e_ofono_prop_mode);
> + _stringshare_del(&e_ofono_prop_status);
> + _stringshare_del(&e_ofono_prop_operator);
> + _stringshare_del(&e_ofono_prop_strength);
> + return 0;
> }
>
> Modified: trunk/e_dbus/src/lib/ofono/e_ofono_element.c
> ===================================================================
> --- trunk/e_dbus/src/lib/ofono/e_ofono_element.c 2010-03-11 22:35:55 UTC (rev 47144)
> +++ trunk/e_dbus/src/lib/ofono/e_ofono_element.c 2010-03-11 23:16:25 UTC (rev 47145)
> @@ -124,15 +124,15 @@
> {
> while (*pending)
> {
> - E_Ofono_Element_Pending *p = (E_Ofono_Element_Pending *)*pending;
> - DBusError err;
> + E_Ofono_Element_Pending *p = (E_Ofono_Element_Pending *)*pending;
> + DBusError err;
>
> - dbus_pending_call_cancel(p->pending);
> + dbus_pending_call_cancel(p->pending);
>
> - dbus_error_init(&err);
> - dbus_set_error(&err, "Canceled", "Pending method call was canceled.");
> - e_ofono_element_call_dispatch_and_free(p->data, NULL, &err);
> - dbus_error_free(&err);
> + dbus_error_init(&err);
> + dbus_set_error(&err, "Canceled", "Pending method call was canceled.");
> + e_ofono_element_call_dispatch_and_free(p->data, NULL, &err);
> + dbus_error_free(&err);
> }
> }
>
> @@ -143,20 +143,20 @@
>
> if (!element)
> {
> - ERR("safety check failed: element == NULL");
> - goto error;
> + ERR("safety check failed: element == NULL");
> + goto error;
> }
> if (!cb)
> {
> - ERR("safety check failed: cb == NULL");
> - goto error;
> + ERR("safety check failed: cb == NULL");
> + goto error;
> }
>
> l = malloc(sizeof(*l));
> if (!l)
> {
> - ERR("could not allocate E_Ofono_Element_Listener");
> - goto error;
> + ERR("could not allocate E_Ofono_Element_Listener");
> + goto error;
> }
>
> l->cb = cb;
> @@ -184,11 +184,11 @@
> EINA_INLIST_FOREACH(element->_listeners, l)
> if ((l->cb == cb) && (l->data == data))
> {
> - element->_listeners = eina_inlist_remove
> - (element->_listeners, EINA_INLIST_GET(l));
> - if (l->free_data) l->free_data(l->data);
> - free(l);
> - return;
> + element->_listeners = eina_inlist_remove
> + (element->_listeners, EINA_INLIST_GET(l));
> + if (l->free_data) l->free_data(l->data);
> + free(l);
> + return;
> }
> }
>
> @@ -252,16 +252,16 @@
> case DBUS_TYPE_BYTE:
> case DBUS_TYPE_UINT16:
> case DBUS_TYPE_UINT32:
> - break;
> + break;
> case DBUS_TYPE_OBJECT_PATH:
> - eina_stringshare_del(entry->value.path);
> - break;
> + eina_stringshare_del(entry->value.path);
> + break;
> case DBUS_TYPE_STRING:
> - eina_stringshare_del(entry->value.str);
> - break;
> + eina_stringshare_del(entry->value.str);
> + break;
> default:
> - ERR("don't know how to free dict entry '%s' of type %c (%d)",
> - entry->name, entry->type, entry->type);
> + ERR("don't know how to free dict entry '%s' of type %c (%d)",
> + entry->name, entry->type, entry->type);
> }
>
> eina_stringshare_del(entry->name);
> @@ -282,26 +282,26 @@
> t = dbus_message_iter_get_arg_type(&e_itr);
> if (!_dbus_iter_type_check(t, DBUS_TYPE_STRING))
> {
> - ERR("invalid format for dict entry. first type not a string: %c (%d)",
> - t, t);
> - return NULL;
> + ERR("invalid format for dict entry. first type not a string: %c (%d)",
> + t, t);
> + return NULL;
> }
>
> dbus_message_iter_get_basic(&e_itr, &key);
> if (!key || !key[0])
> {
> - ERR("invalid format for dict entry. no key.");
> - return NULL;
> + ERR("invalid format for dict entry. no key.");
> + return NULL;
> }
>
> dbus_message_iter_next(&e_itr);
> t = dbus_message_iter_get_arg_type(&e_itr);
> if (!_dbus_iter_type_check(t, DBUS_TYPE_VARIANT))
> {
> - ERR("invalid format for dict entry '%s'. "
> - "second type not a variant: %c (%d)",
> - key, t, t);
> - return NULL;
> + ERR("invalid format for dict entry '%s'. "
> + "second type not a variant: %c (%d)",
> + key, t, t);
> + return NULL;
> }
>
> dbus_message_iter_recurse(&e_itr, &v_itr);
> @@ -309,44 +309,44 @@
> t = dbus_message_iter_get_arg_type(&v_itr);
> if ((t == DBUS_TYPE_INVALID) || (t == DBUS_TYPE_ARRAY))
> {
> - ERR("invalid type for dict value for entry '%s': %c (%d)",
> - key, t, t);
> - return NULL;
> + ERR("invalid type for dict value for entry '%s': %c (%d)",
> + key, t, t);
> + return NULL;
> }
>
> entry = calloc(1, sizeof(*entry));
> if (!entry)
> {
> - ERR("could not allocate memory for dict entry.");
> - return NULL;
> + ERR("could not allocate memory for dict entry.");
> + return NULL;
> }
>
> dbus_message_iter_get_basic(&v_itr, &value);
> switch (t)
> {
> case DBUS_TYPE_BOOLEAN:
> - entry->value.boolean = (bool)(long)value;
> - break;
> + entry->value.boolean = (bool)(long)value;
> + break;
> case DBUS_TYPE_BYTE:
> - entry->value.byte = (unsigned char)(long)value;
> - break;
> + entry->value.byte = (unsigned char)(long)value;
> + break;
> case DBUS_TYPE_UINT16:
> - entry->value.u16 = (unsigned short)(long)value;
> - break;
> + entry->value.u16 = (unsigned short)(long)value;
> + break;
> case DBUS_TYPE_UINT32:
> - entry->value.u32 = (unsigned int)(long)value;
> - break;
> + entry->value.u32 = (unsigned int)(long)value;
> + break;
> case DBUS_TYPE_STRING:
> - entry->value.str = eina_stringshare_add(value);
> - break;
> + entry->value.str = eina_stringshare_add(value);
> + break;
> case DBUS_TYPE_OBJECT_PATH:
> - entry->value.path = eina_stringshare_add(value);
> - break;
> + entry->value.path = eina_stringshare_add(value);
> + break;
> default:
> - ERR("don't know how to create dict entry '%s' for of type %c (%d)",
> - key, t, t);
> - free(entry);
> - return NULL;
> + ERR("don't know how to create dict entry '%s' for of type %c (%d)",
> + key, t, t);
> + free(entry);
> + return NULL;
> }
>
> entry->name = eina_stringshare_add(key);
> @@ -384,23 +384,23 @@
> case DBUS_TYPE_BYTE:
> case DBUS_TYPE_UINT16:
> case DBUS_TYPE_UINT32:
> - break;
> + break;
> case DBUS_TYPE_OBJECT_PATH:
> - EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> - eina_stringshare_del(item);
> - break;
> + EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> + eina_stringshare_del(item);
> + break;
> case DBUS_TYPE_STRING:
> - EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> - eina_stringshare_del(item);
> - break;
> + EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> + eina_stringshare_del(item);
> + break;
> case DBUS_TYPE_DICT_ENTRY:
> - EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> - _e_ofono_element_dict_entry_free(item);
> - break;
> + EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> + _e_ofono_element_dict_entry_free(item);
> + break;
> default:
> - ERR("don't know how to free array of values of type %c (%d)",
> - array->type, array->type);
> - break;
> + ERR("don't know how to free array of values of type %c (%d)",
> + array->type, array->type);
> + break;
> }
> eina_array_free(array->array);
> free(array);
> @@ -412,24 +412,24 @@
> switch (property->type)
> {
> case 0:
> - return;
> + return;
> case DBUS_TYPE_BOOLEAN:
> case DBUS_TYPE_BYTE:
> case DBUS_TYPE_UINT16:
> case DBUS_TYPE_UINT32:
> - break;
> + break;
> case DBUS_TYPE_STRING:
> - eina_stringshare_del(property->value.str);
> - break;
> + eina_stringshare_del(property->value.str);
> + break;
> case DBUS_TYPE_OBJECT_PATH:
> - eina_stringshare_del(property->value.path);
> - break;
> + eina_stringshare_del(property->value.path);
> + break;
> case DBUS_TYPE_ARRAY:
> - _e_ofono_element_array_free(property->value.array, NULL);
> - break;
> + _e_ofono_element_array_free(property->value.array, NULL);
> + break;
> default:
> - ERR("don't know how to free value of property type %c (%d)",
> - property->type, property->type);
> + ERR("don't know how to free value of property type %c (%d)",
> + property->type, property->type);
> }
> }
>
> @@ -445,11 +445,11 @@
> switch (head)
> {
> case 'M':
> - if (strcmp(tail, "odems") == 0)
> - interface = e_ofono_iface_modem;
> - break;
> + if (strcmp(tail, "odems") == 0)
> + interface = e_ofono_iface_modem;
> + break;
> default:
> - break;
> + break;
> }
>
> if (!interface)
> @@ -499,103 +499,103 @@
>
> if ((!new) || (!new->array) || eina_array_count_get(new->array) == 0)
> {
> - if ((!old) || (!old->array) || eina_array_count_get(old->array) == 0)
> - return;
> - else
> - {
> - iter_old = old->array->data;
> - goto out_remove_remaining;
> - }
> + if ((!old) || (!old->array) || eina_array_count_get(old->array) == 0)
> + return;
> + else
> + {
> + iter_old = old->array->data;
> + goto out_remove_remaining;
> + }
> }
>
> iter_new = new->array->data;
> item_new = *iter_new;
> EINA_ARRAY_ITER_NEXT(old->array, i_old, item_old, iter_old)
> {
> - if (item_old == item_new)
> - {
> - i_new++;
> - if (i_new >= eina_array_count_get(new->array))
> - {
> - i_old++;
> - break;
> - }
> + if (item_old == item_new)
> + {
> + i_new++;
> + if (i_new >= eina_array_count_get(new->array))
> + {
> + i_old++;
> + break;
> + }
>
> - iter_new++;
> - item_new = *iter_new;
> - }
> - else
> - deleted = eina_list_append(deleted, item_old);
> + iter_new++;
> + item_new = *iter_new;
> + }
> + else
> + deleted = eina_list_append(deleted, item_old);
> }
>
> for(; i_new < eina_array_count_get(new->array); iter_new++, i_new++)
> {
> - bool found = 0;
> - item_new = *iter_new;
> - if (!item_new)
> - break;
> + bool found = 0;
> + item_new = *iter_new;
> + if (!item_new)
> + break;
>
> - EINA_LIST_FOREACH(deleted, l, data)
> - {
> - if (data == item_new)
> - {
> - deleted = eina_list_remove_list(deleted, l);
> - found = 1;
> - break;
> - }
> - }
> - if (!found)
> - {
> - E_Ofono_Element *e = NULL;
> + EINA_LIST_FOREACH(deleted, l, data)
> + {
> + if (data == item_new)
> + {
> + deleted = eina_list_remove_list(deleted, l);
> + found = 1;
> + break;
> + }
> + }
> + if (!found)
> + {
> + E_Ofono_Element *e = NULL;
>
> - if (interfaces)
> - e = e_ofono_element_register(item_new, element->path);
> - else
> - e = _e_ofono_element_item_register(prop_name, item_new);
> + if (interfaces)
> + e = e_ofono_element_register(item_new, element->path);
> + else
> + e = _e_ofono_element_item_register(prop_name, item_new);
>
> - if (e)
> - DBG("Add element %s\n", e->path, e->interface);
> - }
> + if (e)
> + DBG("Add element %s\n", e->path, e->interface);
> + }
> }
>
> /* everybody after i_old on old->array + everybody from deleted list
> will be removed
> - */
> + */
> EINA_LIST_FREE(deleted, data)
> {
> - E_Ofono_Element *e;
> - if (interfaces)
> - e = e_ofono_element_get(element->path, item_old);
> - else
> - e = e_ofono_element_get(data,
> - _e_ofono_element_get_interface(prop_name));
> + E_Ofono_Element *e;
> + if (interfaces)
> + e = e_ofono_element_get(element->path, item_old);
> + else
> + e = e_ofono_element_get(data,
> + _e_ofono_element_get_interface(prop_name));
>
> - if (e)
> - {
> - e_ofono_element_unregister(e);
> - DBG("Deleted element %s %s\n", e->path, e->interface);
> - }
> + if (e)
> + {
> + e_ofono_element_unregister(e);
> + DBG("Deleted element %s %s\n", e->path, e->interface);
> + }
> }
>
> -out_remove_remaining:
> + out_remove_remaining:
> for(; i_old < eina_array_count_get(old->array); iter_old++, i_old++)
> {
> - E_Ofono_Element *e;
> - item_old = *iter_old;
> - if (!item_old)
> - break;
> + E_Ofono_Element *e;
> + item_old = *iter_old;
> + if (!item_old)
> + break;
>
> - if (interfaces)
> - e = e_ofono_element_get(element->path, item_old);
> - else
> - e = e_ofono_element_get(item_old,
> - _e_ofono_element_get_interface(prop_name));
> + if (interfaces)
> + e = e_ofono_element_get(element->path, item_old);
> + else
> + e = e_ofono_element_get(item_old,
> + _e_ofono_element_get_interface(prop_name));
>
> - if (e)
> - {
> - e_ofono_element_unregister(e);
> - DBG("Deleted element %s %s\n", e->path, e->interface);
> - }
> + if (e)
> + {
> + e_ofono_element_unregister(e);
> + DBG("Deleted element %s %s\n", e->path, e->interface);
> + }
> }
> }
>
> @@ -609,86 +609,86 @@
>
> if (property->type != type)
> {
> - if (property->type)
> - DBG("property type changed from '%c' to '%c'",
> - property->type, type);
> - _e_ofono_element_property_value_free(property);
> - memset(&property->value, 0, sizeof(property->value));
> - property->type = type;
> - changed = 1;
> + if (property->type)
> + DBG("property type changed from '%c' to '%c'",
> + property->type, type);
> + _e_ofono_element_property_value_free(property);
> + memset(&property->value, 0, sizeof(property->value));
> + property->type = type;
> + changed = 1;
> }
>
> switch (type)
> {
> case DBUS_TYPE_BOOLEAN:
> - if (changed || property->value.boolean != (bool)(long)data)
> - {
> - property->value.boolean = (bool)(long)data;
> - changed = 1;
> - }
> - break;
> + if (changed || property->value.boolean != (bool)(long)data)
> + {
> + property->value.boolean = (bool)(long)data;
> + changed = 1;
> + }
> + break;
> case DBUS_TYPE_BYTE:
> - if (changed || property->value.byte != (unsigned char)(long)data)
> - {
> - property->value.byte = (unsigned char)(long)data;
> - changed = 1;
> - }
> - break;
> + if (changed || property->value.byte != (unsigned char)(long)data)
> + {
> + property->value.byte = (unsigned char)(long)data;
> + changed = 1;
> + }
> + break;
> case DBUS_TYPE_UINT16:
> - if (changed || property->value.u16 != (unsigned short)(long)data)
> - {
> - property->value.u16 = (unsigned short)(long)data;
> - changed = 1;
> - }
> - break;
> + if (changed || property->value.u16 != (unsigned short)(long)data)
> + {
> + property->value.u16 = (unsigned short)(long)data;
> + changed = 1;
> + }
> + break;
> case DBUS_TYPE_UINT32:
> - if (changed || property->value.u32 != (unsigned int)(long)data)
> - {
> - property->value.u32 = (unsigned int)(long)data;
> - changed = 1;
> - }
> - break;
> + if (changed || property->value.u32 != (unsigned int)(long)data)
> + {
> + property->value.u32 = (unsigned int)(long)data;
> + changed = 1;
> + }
> + break;
> case DBUS_TYPE_STRING:
> - if (changed)
> - property->value.str = data;
> - else
> - {
> - if (property->value.str)
> - eina_stringshare_del(property->value.str);
> - if (property->value.str != data)
> - {
> - property->value.str = data;
> - changed = 1;
> - }
> - }
> - break;
> + if (changed)
> + property->value.str = data;
> + else
> + {
> + if (property->value.str)
> + eina_stringshare_del(property->value.str);
> + if (property->value.str != data)
> + {
> + property->value.str = data;
> + changed = 1;
> + }
> + }
> + break;
> case DBUS_TYPE_OBJECT_PATH:
> - if (changed)
> - property->value.path = data;
> - else
> - {
> - if (property->value.path)
> - eina_stringshare_del(property->value.path);
> - if (property->value.path != data)
> - {
> - property->value.path = data;
> - changed = 1;
> - }
> - }
> - break;
> + if (changed)
> + property->value.path = data;
> + else
> + {
> + if (property->value.path)
> + eina_stringshare_del(property->value.path);
> + if (property->value.path != data)
> + {
> + property->value.path = data;
> + changed = 1;
> + }
> + }
> + break;
> case DBUS_TYPE_ARRAY:
> - if (!changed)
> - if (property->value.array)
> - {
> - _e_ofono_element_array_match(property->value.array, data,
> - property->name, element);
> - _e_ofono_element_array_free(property->value.array, data);
> - }
> - property->value.array = data;
> - changed = 1;
> - break;
> + if (!changed)
> + if (property->value.array)
> + {
> + _e_ofono_element_array_match(property->value.array, data,
> + property->name, element);
> + _e_ofono_element_array_free(property->value.array, data);
> + }
> + property->value.array = data;
> + changed = 1;
> + break;
> default:
> - ERR("don't know how to update property type %c (%d)", type, type);
> + ERR("don't know how to update property type %c (%d)", type, type);
> }
>
> return changed;
> @@ -702,9 +702,9 @@
> property = calloc(1, sizeof(*property));
> if (!property)
> {
> - eina_stringshare_del(name);
> - ERR("could not allocate property: %s", strerror(errno));
> - return NULL;
> + eina_stringshare_del(name);
> + ERR("could not allocate property: %s", strerror(errno));
> + return NULL;
> }
>
> property->name = name;
> @@ -749,16 +749,16 @@
> ret = malloc(*count * sizeof(unsigned char));
> if (!ret)
> {
> - ERR("could not allocate return array of %d bytes: %s",
> - *count, strerror(errno));
> - return NULL;
> + ERR("could not allocate return array of %d bytes: %s",
> + *count, strerror(errno));
> + return NULL;
> }
> p = ret;
>
> EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> {
> - *p = (unsigned char)(long)item;
> - p++;
> + *p = (unsigned char)(long)item;
> + p++;
> }
> return ret;
> }
> @@ -787,8 +787,8 @@
>
> if (type != DBUS_TYPE_ARRAY)
> {
> - ERR("property %s is not an array!", property);
> - return 0;
> + ERR("property %s is not an array!", property);
> + return 0;
> }
>
> if ((!array) || (!array->array) || (array->type == DBUS_TYPE_INVALID))
> @@ -796,28 +796,28 @@
>
> if (array->type != DBUS_TYPE_OBJECT_PATH)
> {
> - ERR("property %s is not an array of object paths!", property);
> - return 0;
> + ERR("property %s is not an array of object paths!", property);
> + return 0;
> }
>
> *count = eina_array_count_get(array->array);
> ret = malloc(*count * sizeof(E_Ofono_Element *));
> if (!ret)
> {
> - ERR("could not allocate return array of %d elements: %s",
> - *count, strerror(errno));
> - *count = 0;
> - return 0;
> + ERR("could not allocate return array of %d elements: %s",
> + *count, strerror(errno));
> + *count = 0;
> + return 0;
> }
> p = ret;
>
> EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> {
> - E_Ofono_Element *e = e_ofono_element_get(item, property);
> - if (!e)
> - continue;
> - *p = e;
> - p++;
> + E_Ofono_Element *e = e_ofono_element_get(item, property);
> + if (!e)
> + continue;
> + *p = e;
> + p++;
> }
> *count = p - ret;
> *elements = ret;
> @@ -849,8 +849,8 @@
>
> if (type != DBUS_TYPE_ARRAY)
> {
> - ERR("property %s is not an array!", property);
> - return 0;
> + ERR("property %s is not an array!", property);
> + return 0;
> }
>
> if ((!array) || (!array->array) || (array->type == DBUS_TYPE_INVALID))
> @@ -858,27 +858,27 @@
>
> if (array->type != DBUS_TYPE_STRING)
> {
> - ERR("property %s is not an array of strings!", property);
> - return 0;
> + ERR("property %s is not an array of strings!", property);
> + return 0;
> }
>
> *count = eina_array_count_get(array->array);
> ret = malloc(*count * sizeof(char *));
> if (!ret)
> {
> - ERR("could not allocate return array of %d strings: %s",
> - *count, strerror(errno));
> - *count = 0;
> - return 0;
> + ERR("could not allocate return array of %d strings: %s",
> + *count, strerror(errno));
> + *count = 0;
> + return 0;
> }
> p = ret;
>
> EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> {
> - if (!item)
> - continue;
> - *p = item;
> - p++;
> + if (!item)
> + continue;
> + *p = item;
> + p++;
> }
> *count = p - ret;
> *strings = ret;
> @@ -898,62 +898,62 @@
> switch (array->type)
> {
> case DBUS_TYPE_OBJECT_PATH:
> - EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> - fprintf(fp, "\"%s\", ", (const char *)item);
> - break;
> + EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> + fprintf(fp, "\"%s\", ", (const char *)item);
> + break;
> case DBUS_TYPE_STRING:
> - EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> - fprintf(fp, "\"%s\", ", (const char *)item);
> - break;
> + EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> + fprintf(fp, "\"%s\", ", (const char *)item);
> + break;
> case DBUS_TYPE_BYTE:
> - EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> - fprintf(fp, "%#02hhx (\"%c\"), ", (unsigned char)(long)item,
> - (unsigned char)(long)item);
> - break;
> + EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> + fprintf(fp, "%#02hhx (\"%c\"), ", (unsigned char)(long)item,
> + (unsigned char)(long)item);
> + break;
> case DBUS_TYPE_UINT16:
> - EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> - fprintf(fp, "%#04hx (%hu), ", (unsigned short)(long)item,
> - (unsigned short)(long)item);
> - break;
> + EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> + fprintf(fp, "%#04hx (%hu), ", (unsigned short)(long)item,
> + (unsigned short)(long)item);
> + break;
> case DBUS_TYPE_UINT32:
> - EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> - fprintf(fp, "%#08x (%u), ", (unsigned int)(long)item,
> - (unsigned int)(long)item);
> - break;
> + EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> + fprintf(fp, "%#08x (%u), ", (unsigned int)(long)item,
> + (unsigned int)(long)item);
> + break;
> case DBUS_TYPE_DICT_ENTRY:
> - fputs("{ ", fp);
> - EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> - {
> - E_Ofono_Element_Dict_Entry *entry = item;
> - fprintf(fp, "%s: ", entry->name);
> - switch (entry->type)
> - {
> - case DBUS_TYPE_OBJECT_PATH:
> - fprintf(fp, "\"%s\", ", entry->value.path);
> - break;
> - case DBUS_TYPE_STRING:
> - fprintf(fp, "\"%s\", ", entry->value.str);
> - break;
> - case DBUS_TYPE_BYTE:
> - fprintf(fp, "%#02hhx (\"%c\"), ",
> - entry->value.byte, entry->value.byte);
> - break;
> - case DBUS_TYPE_UINT16:
> - fprintf(fp, "%#04hx (%hu), ",
> - entry->value.u16, entry->value.u16);
> - break;
> - case DBUS_TYPE_UINT32:
> - fprintf(fp, "%#08x (%u), ",
> - entry->value.u32, entry->value.u32);
> - break;
> - default:
> - fprintf(fp, "<UNKNOWN TYPE '%c'>", entry->type);
> - }
> - }
> - fputs("}", fp);
> - break;
> + fputs("{ ", fp);
> + EINA_ARRAY_ITER_NEXT(array->array, i, item, iterator)
> + {
> + E_Ofono_Element_Dict_Entry *entry = item;
> + fprintf(fp, "%s: ", entry->name);
> + switch (entry->type)
> + {
> + case DBUS_TYPE_OBJECT_PATH:
> + fprintf(fp, "\"%s\", ", entry->value.path);
> + break;
> + case DBUS_TYPE_STRING:
> + fprintf(fp, "\"%s\", ", entry->value.str);
> + break;
> + case DBUS_TYPE_BYTE:
> + fprintf(fp, "%#02hhx (\"%c\"), ",
> + entry->value.byte, entry->value.byte);
> + break;
> + case DBUS_TYPE_UINT16:
> + fprintf(fp, "%#04hx (%hu), ",
> + entry->value.u16, entry->value.u16);
> + break;
> + case DBUS_TYPE_UINT32:
> + fprintf(fp, "%#08x (%u), ",
> + entry->value.u32, entry->value.u32);
> + break;
> + default:
> + fprintf(fp, "<UNKNOWN TYPE '%c'>", entry->type);
> + }
> + }
> + fputs("}", fp);
> + break;
> default:
> - fprintf(fp, "<UNKNOWN ARRAY TYPE '%c'>", array->type);
> + fprintf(fp, "<UNKNOWN ARRAY TYPE '%c'>", array->type);
> }
> }
>
> @@ -968,47 +968,47 @@
> EINA_SAFETY_ON_NULL_RETURN(fp);
> if (!element)
> {
> - fputs("Error: no element to print\n", fp);
> - return;
> + fputs("Error: no element to print\n", fp);
> + return;
> }
>
> fprintf(fp,
> - "Element %p: %s [%s]\n"
> - "\tProperties:\n",
> - element, element->path, element->interface);
> + "Element %p: %s [%s]\n"
> + "\tProperties:\n",
> + element, element->path, element->interface);
>
> EINA_INLIST_FOREACH(element->props, p)
> {
> - fprintf(fp, "\t\t%s (%c) = ", p->name, p->type);
> + fprintf(fp, "\t\t%s (%c) = ", p->name, p->type);
>
> - switch (p->type)
> - {
> - case DBUS_TYPE_STRING:
> - fprintf(fp, "\"%s\"", p->value.str);
> - break;
> - case DBUS_TYPE_OBJECT_PATH:
> - fprintf(fp, "\"%s\"", p->value.path);
> - break;
> - case DBUS_TYPE_BOOLEAN:
> - fprintf(fp, "%hhu", p->value.boolean);
> - break;
> - case DBUS_TYPE_BYTE:
> - fprintf(fp, "%#02hhx (%d), ", p->value.byte, p->value.byte);
> - break;
> - case DBUS_TYPE_UINT16:
> - fprintf(fp, "%hu", p->value.u16);
> - break;
> - case DBUS_TYPE_UINT32:
> - fprintf(fp, "%u", p->value.u32);
> - break;
> - case DBUS_TYPE_ARRAY:
> - _e_ofono_element_array_print(fp, p->value.array);
> - break;
> - default:
> - fputs("don't know how to print type", fp);
> - }
> + switch (p->type)
> + {
> + case DBUS_TYPE_STRING:
> + fprintf(fp, "\"%s\"", p->value.str);
> + break;
> + case DBUS_TYPE_OBJECT_PATH:
> + fprintf(fp, "\"%s\"", p->value.path);
> + break;
> + case DBUS_TYPE_BOOLEAN:
> + fprintf(fp, "%hhu", p->value.boolean);
> + break;
> + case DBUS_TYPE_BYTE:
> + fprintf(fp, "%#02hhx (%d), ", p->value.byte, p->value.byte);
> + break;
> + case DBUS_TYPE_UINT16:
> + fprintf(fp, "%hu", p->value.u16);
> + break;
> + case DBUS_TYPE_UINT32:
> + fprintf(fp, "%u", p->value.u32);
> + break;
> + case DBUS_TYPE_ARRAY:
> + _e_ofono_element_array_print(fp, p->value.array);
> + break;
> + default:
> + fputs("don't know how to print type", fp);
> + }
>
> - fputc('\n', fp);
> + fputc('\n', fp);
> }
> }
>
> @@ -1020,8 +1020,8 @@
> element = calloc(1, sizeof(*element));
> if (!element)
> {
> - ERR("could not allocate element: %s", strerror(errno));
> - return NULL;
> + ERR("could not allocate element: %s", strerror(errno));
> + return NULL;
> }
>
> element->path = eina_stringshare_add(path);
> @@ -1036,10 +1036,10 @@
> {
> while (element->props)
> {
> - E_Ofono_Element_Property *prop;
> - prop = (E_Ofono_Element_Property *)element->props;
> - element->props = element->props->next;
> - _e_ofono_element_property_free(prop);
> + E_Ofono_Element_Property *prop;
> + prop = (E_Ofono_Element_Property *)element->props;
> + element->props = element->props->next;
> + _e_ofono_element_property_free(prop);
> }
> }
>
> @@ -1051,12 +1051,12 @@
>
> while (element->_listeners)
> {
> - E_Ofono_Element_Listener *l = (void *)element->_listeners;
> - el...
[truncated message content] |