forked from enlightenment/enlightenment
e: small fixes to port of e_fm udisk to edbus
- no need for calling edbus_message_error_get() if we are not getting the error message - rename confusing vars: * A dict is this complete type: "a{sv}", i.e. an array with key-values pairs (though the value could very well be 's', or 'u' or another basic type) * An entry (or dict_entry, or de) is *the* key-value pair. - Use eina_stringshare_replace when possible SVN revision: 81986
This commit is contained in:
parent
5e4352e9b3
commit
9e1b995c56
|
@ -101,11 +101,6 @@ _e_fm_main_udisks_name_start(void *data __UNUSED__, const EDBus_Message *msg,
|
||||||
unsigned flag = 0;
|
unsigned flag = 0;
|
||||||
EDBus_Object *obj;
|
EDBus_Object *obj;
|
||||||
|
|
||||||
if (edbus_message_error_get(msg, NULL, NULL))
|
|
||||||
{
|
|
||||||
_e_fm_main_udisks_catch(EINA_FALSE);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!edbus_message_arguments_get(msg, "u", &flag) || !flag)
|
if (!edbus_message_arguments_get(msg, "u", &flag) || !flag)
|
||||||
{
|
{
|
||||||
_e_fm_main_udisks_catch(EINA_FALSE);
|
_e_fm_main_udisks_catch(EINA_FALSE);
|
||||||
|
@ -312,25 +307,25 @@ _e_fm_main_udisks_cb_store_prop(void *data, const EDBus_Message *msg,
|
||||||
{
|
{
|
||||||
E_Storage *s = data;
|
E_Storage *s = data;
|
||||||
const char *name, *txt;
|
const char *name, *txt;
|
||||||
EDBus_Message_Iter *array, *dict;
|
EDBus_Message_Iter *dict, *entry;
|
||||||
|
|
||||||
if (edbus_message_error_get(msg, &name, &txt))
|
if (edbus_message_error_get(msg, &name, &txt))
|
||||||
{
|
{
|
||||||
ERR("Error %s %s.", name, txt);
|
ERR("Error %s %s.", name, txt);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!edbus_message_arguments_get(msg, "a{sv}", &array))
|
if (!edbus_message_arguments_get(msg, "a{sv}", &dict))
|
||||||
{
|
{
|
||||||
ERR("Error getting arguments.");
|
ERR("Error getting arguments.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (edbus_message_iter_get_and_next(array, 'e', &dict))
|
while (edbus_message_iter_get_and_next(dict, 'e', &entry))
|
||||||
{
|
{
|
||||||
char *key;
|
char *key;
|
||||||
EDBus_Message_Iter *var;
|
EDBus_Message_Iter *var;
|
||||||
|
|
||||||
if (!edbus_message_iter_arguments_get(dict, "sv", &key, &var))
|
if (!edbus_message_iter_arguments_get(entry, "sv", &key, &var))
|
||||||
continue;
|
continue;
|
||||||
if (!strcmp(key, "DeviceFile"))
|
if (!strcmp(key, "DeviceFile"))
|
||||||
{
|
{
|
||||||
|
@ -366,11 +361,7 @@ _e_fm_main_udisks_cb_store_prop(void *data, const EDBus_Message *msg,
|
||||||
{
|
{
|
||||||
const char *model;
|
const char *model;
|
||||||
if (edbus_message_iter_arguments_get(var, "s", &model))
|
if (edbus_message_iter_arguments_get(var, "s", &model))
|
||||||
{
|
eina_stringshare_replace(&s->model, model);
|
||||||
if (s->model)
|
|
||||||
eina_stringshare_del(s->model);
|
|
||||||
s->model = eina_stringshare_add(model);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if (!strcmp(key, "DriveVendor"))
|
else if (!strcmp(key, "DriveVendor"))
|
||||||
{
|
{
|
||||||
|
@ -543,6 +534,7 @@ _e_fm_main_udisks_cb_vol_prop(void *data, const EDBus_Message *msg,
|
||||||
|
|
||||||
if (!edbus_message_iter_arguments_get(var, "as", &inner_array))
|
if (!edbus_message_iter_arguments_get(var, "as", &inner_array))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
while (edbus_message_iter_get_and_next(inner_array, 's', &path))
|
while (edbus_message_iter_get_and_next(inner_array, 's', &path))
|
||||||
{
|
{
|
||||||
eina_stringshare_replace(&v->mount_point, path);
|
eina_stringshare_replace(&v->mount_point, path);
|
||||||
|
@ -816,6 +808,10 @@ _volume_task_cb(void *data __UNUSED__, const EDBus_Message *msg __UNUSED__,
|
||||||
* if edbus_proxy_send has callback == NULL it will return a NULL
|
* if edbus_proxy_send has callback == NULL it will return a NULL
|
||||||
* but we need a EDBus_Pending to be able to cancel it when timeout occurs
|
* but we need a EDBus_Pending to be able to cancel it when timeout occurs
|
||||||
*/
|
*/
|
||||||
|
/* FIXME: this should not matter. If we don't have a callback, there's no
|
||||||
|
* reason to cancel it... cancelling has no effect other than saying edbus we
|
||||||
|
* are not interested in the return anymore. I.e.: don't bother to cancel it
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
static EDBus_Pending *
|
static EDBus_Pending *
|
||||||
|
|
Loading…
Reference in New Issue