parent
db5b5e67ea
commit
32e588dfda
|
@ -158,9 +158,6 @@ _places_custom_volume(Evas_Object *box, const char *label, const char *icon, con
|
|||
evas_object_show(o);
|
||||
edje_object_size_min_get(o, &min_w, &min_h);
|
||||
edje_object_size_max_get(o, &max_w, &max_h);
|
||||
//if (!strcmp(vol->mount_point, "/"))
|
||||
// e_box_pack_start(box, o);
|
||||
//else
|
||||
e_box_pack_end(box, o);
|
||||
e_box_pack_options_set(o,
|
||||
1, 0, /* fill */
|
||||
|
@ -353,7 +350,8 @@ places_parse_bookmarks(E_Menu *em)
|
|||
e_menu_item_label_set(mi, alias ? alias :
|
||||
ecore_file_file_get(uri->path));
|
||||
e_util_menu_item_theme_icon_set(mi, "folder");
|
||||
e_menu_item_callback_set(mi, _places_run_fm, strdup(uri->path)); //TODO free somewhere
|
||||
e_menu_item_callback_set(mi, _places_run_fm,
|
||||
strdup(uri->path)); //TODO free somewhere
|
||||
}
|
||||
}
|
||||
if (uri) efreet_uri_free(uri);
|
||||
|
@ -712,7 +710,8 @@ _places_mount_volume(Volume *vol)
|
|||
snprintf(buf, sizeof(buf), "uid=%i", (int)getuid());
|
||||
opt = eina_list_append(opt, buf);
|
||||
}
|
||||
e_hal_device_volume_mount(conn, vol->udi, vol->mount_point, vol->fstype, opt, _places_mount_cb, vol);
|
||||
e_hal_device_volume_mount(conn, vol->udi, vol->mount_point, vol->fstype,
|
||||
opt, _places_mount_cb, vol);
|
||||
vol->to_mount = 0;
|
||||
eina_list_free(opt);
|
||||
}
|
||||
|
@ -810,7 +809,8 @@ _places_eject_cb(void *user_data, void *method_return, DBusError *error)
|
|||
|
||||
if (dbus_error_is_set(error))
|
||||
{
|
||||
_places_error_show("Eject Error", "Can't eject device.",error->name, error->message);
|
||||
_places_error_show("Eject Error", "Can't eject device.",
|
||||
error->name, error->message);
|
||||
dbus_error_free(error);
|
||||
}
|
||||
}
|
||||
|
@ -826,8 +826,7 @@ _places_device_add_cb(void *data, DBusMessage *msg)
|
|||
dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID);
|
||||
|
||||
//printf("PLACES DBUS CB UDI:%s\n", udi);
|
||||
e_hal_device_query_capability(conn, udi, "volume",
|
||||
_places_volume_cb,
|
||||
e_hal_device_query_capability(conn, udi, "volume", _places_volume_cb,
|
||||
(void*)eina_stringshare_add(udi));
|
||||
}
|
||||
|
||||
|
@ -947,7 +946,8 @@ _places_volume_properties_cb(void *data, void *reply_data, DBusError *error)
|
|||
str = e_hal_property_string_get(reply, "info.parent", &err);
|
||||
if (!err && str)
|
||||
{
|
||||
e_hal_device_get_all_properties(conn, str, _places_storage_properties_cb, v);
|
||||
e_hal_device_get_all_properties(conn, str,
|
||||
_places_storage_properties_cb, v);
|
||||
}
|
||||
|
||||
return;
|
||||
|
@ -1007,7 +1007,8 @@ _places_storage_properties_cb(void *data, void *reply_data, DBusError *error)
|
|||
{
|
||||
Eina_Bool enabled;
|
||||
|
||||
enabled = e_hal_property_bool_get(ret, "storage.automount_enabled_hint", &err);
|
||||
enabled = e_hal_property_bool_get(ret, "storage.automount_enabled_hint",
|
||||
&err);
|
||||
if (err)
|
||||
enabled = 1; /* assume no property it is enabled */
|
||||
|
||||
|
@ -1019,3 +1020,4 @@ _places_storage_properties_cb(void *data, void *reply_data, DBusError *error)
|
|||
places_update_all_gadgets(); //TODO Update only this volume, not all
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue