enlightenment
/
enlightenment-module-places
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

formatting & whitespaces 

SVN revision: 51633
This commit is contained in:
Davide Andreoli 2010-08-25 08:23:59 +00:00
parent db5b5e67ea
commit 32e588dfda
3 changed files with 431 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/e_mod_config.c
View File

@ -99,12 +99,12 @@ void _custom_fm_click(void *data, Evas_Object *obj)
E_Config_Dialog_Data *cfdata = data;
if (e_widget_check_checked_get(obj))
e_widget_disabled_set(cfdata->entry, 0);
e_widget_disabled_set(cfdata->entry, 0);
else
{
e_widget_disabled_set(cfdata->entry, 1);
e_widget_entry_text_set(cfdata->entry, "");
}
{
e_widget_disabled_set(cfdata->entry, 1);
e_widget_entry_text_set(cfdata->entry, "");
}
}
static Evas_Object *

28
src/e_mod_main.c
View File

@ -95,7 +95,7 @@ e_modapi_init(E_Module *m)
{
/* config too old */
_places_conf_free();
ecore_timer_add(1.0, _places_conf_timer,
ecore_timer_add(1.0, _places_conf_timer,
"Places Module Configuration data needed "
"upgrading. Your old configuration<br> has been"
" wiped and a new set of defaults initialized. "
@ -114,8 +114,8 @@ e_modapi_init(E_Module *m)
{
/* config too new...wtf ? */
_places_conf_free();
ecore_timer_add(1.0, _places_conf_timer,
"Your Places Module configuration is NEWER "
ecore_timer_add(1.0, _places_conf_timer,
"Your Places Module configuration is NEWER "
"than the module version. This is "
"very<br>strange. This should not happen unless"
" you downgraded<br>the module or "
@ -140,8 +140,8 @@ e_modapi_init(E_Module *m)
{
E_Int_Menu_Augmentation *maug;
maug = e_int_menus_menu_augmentation_add("main/1",
places_augmentation,
NULL, NULL, NULL);
places_augmentation,
NULL, NULL, NULL);
}
return m;
@ -245,10 +245,10 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
case E_GADCON_ORIENT_CORNER_TR:
case E_GADCON_ORIENT_CORNER_BL:
case E_GADCON_ORIENT_CORNER_BR:
e_gadcon_client_aspect_set(gcc, 100 * eina_list_count(volumes), 50);
e_gadcon_client_min_size_set(gcc, 100 * eina_list_count(volumes), 50);
e_box_orientation_set(inst->o_box, 1);
break;
e_gadcon_client_aspect_set(gcc, 100 * eina_list_count(volumes), 50);
e_gadcon_client_min_size_set(gcc, 100 * eina_list_count(volumes), 50);
e_box_orientation_set(inst->o_box, 1);
break;
case E_GADCON_ORIENT_FLOAT:
case E_GADCON_ORIENT_VERT:
case E_GADCON_ORIENT_LEFT:
@ -257,12 +257,12 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
case E_GADCON_ORIENT_CORNER_RT:
case E_GADCON_ORIENT_CORNER_LB:
case E_GADCON_ORIENT_CORNER_RB:
e_gadcon_client_aspect_set(gcc, 200, 50 * eina_list_count(volumes) + 30);
e_gadcon_client_min_size_set(gcc, 200, 50 * eina_list_count(volumes) + 30);
e_box_orientation_set(inst->o_box, 0);
break;
e_gadcon_client_aspect_set(gcc, 200, 50 * eina_list_count(volumes) + 30);
e_gadcon_client_min_size_set(gcc, 200, 50 * eina_list_count(volumes) + 30);
e_box_orientation_set(inst->o_box, 0);
break;
default:
break;
break;
}
places_fill_box(inst->o_box);

628
src/e_mod_places.c
View File

@ -89,7 +89,7 @@ places_shutdown(void)
}
while (volumes)
_places_volume_del((Volume*)volumes->data);
_places_volume_del((Volume*)volumes->data);
if (conn) e_dbus_connection_close(conn);
}
@ -158,16 +158,13 @@ _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_end(box, o);
e_box_pack_options_set(o,
1, 0, /* fill */
1, 0, /* expand */
0.5, 0.0, /* align */
min_w, min_h, /* min */
max_w, max_h /* max */
1, 0, /* fill */
1, 0, /* expand */
0.5, 0.0, /* align */
min_w, min_h, /* min */
max_w, max_h /* max */
);
}
@ -194,102 +191,102 @@ places_fill_box(Evas_Object *box)
volumes = eina_list_sort(volumes, 0, _places_volume_sort_cb);
for (l = volumes; l; l = l->next)
{
Volume *vol = l->data;
{
Volume *vol = l->data;
if (!vol->valid) continue;
if (!vol->valid) continue;
/* volume object */
o = edje_object_add(evas_object_evas_get(box));
edje_object_file_set(o, theme_file, "modules/places/main");
vol->obj = o;
/* volume object */
o = edje_object_add(evas_object_evas_get(box));
edje_object_file_set(o, theme_file, "modules/places/main");
vol->obj = o;
//set volume label
if (vol->label && strlen(vol->label) > 0)
edje_object_part_text_set(o, "volume_label", vol->label);
else if (vol->mount_point && !strcmp(vol->mount_point, "/"))
edje_object_part_text_set(o, "volume_label", D_("Filesystem"));
else if (vol->mount_point && strlen(vol->mount_point) > 0)
edje_object_part_text_set(o, "volume_label",
ecore_file_file_get(vol->mount_point));
else
edje_object_part_text_set(o, "volume_label", D_("No Name"));
//set volume label
if (vol->label && strlen(vol->label) > 0)
edje_object_part_text_set(o, "volume_label", vol->label);
else if (vol->mount_point && !strcmp(vol->mount_point, "/"))
edje_object_part_text_set(o, "volume_label", D_("Filesystem"));
else if (vol->mount_point && strlen(vol->mount_point) > 0)
edje_object_part_text_set(o, "volume_label",
ecore_file_file_get(vol->mount_point));
else
edje_object_part_text_set(o, "volume_label", D_("No Name"));
//set free label e gauge
_places_update_size(o, vol);
//set free label e gauge
_places_update_size(o, vol);
//choose icon
vol->icon = "e/icons/drive-harddisk";
if (!strcmp(vol->drive_type, "cdrom"))
vol->icon = "e/icons/drive-optical";
else if (!strcmp(vol->model, "\"PSP\" MS"))
vol->icon = "modules/places/icon/psp";
else if (!strcmp(vol->drive_type, "sd_mmc"))
vol->icon = "modules/places/icon/sdmmc";
else if (!strcmp(vol->drive_type, "memory_stick"))
vol->icon = "modules/places/icon/ms";
else if (!strcmp(vol->model, "iPod"))
vol->icon = "modules/places/icon/ipod";
else if (!strcmp(vol->bus, "usb") && !strcmp(vol->drive_type, "disk"))
vol->icon = "e/icons/drive-removable-media";
//choose icon
vol->icon = "e/icons/drive-harddisk";
if (!strcmp(vol->drive_type, "cdrom"))
vol->icon = "e/icons/drive-optical";
else if (!strcmp(vol->model, "\"PSP\" MS"))
vol->icon = "modules/places/icon/psp";
else if (!strcmp(vol->drive_type, "sd_mmc"))
vol->icon = "modules/places/icon/sdmmc";
else if (!strcmp(vol->drive_type, "memory_stick"))
vol->icon = "modules/places/icon/ms";
else if (!strcmp(vol->model, "iPod"))
vol->icon = "modules/places/icon/ipod";
else if (!strcmp(vol->bus, "usb") && !strcmp(vol->drive_type, "disk"))
vol->icon = "e/icons/drive-removable-media";
//set partition type tag
if (!strcmp(vol->fstype, "ext2") || !strcmp(vol->fstype, "ext3") ||
!strcmp(vol->fstype, "ext4") || !strcmp(vol->fstype, "reiserfs"))
edje_object_signal_emit(o, "icon,tag,ext3", "places");
else if (!strcmp(vol->fstype, "vfat") || !strcmp(vol->fstype, "ntfs") ||
!strcmp(vol->fstype, "ntfs-3g"))
edje_object_signal_emit(o, "icon,tag,fat", "places");
else if (!strcmp(vol->fstype, "hfs") || !strcmp(vol->fstype, "hfsplus"))
edje_object_signal_emit(o, "icon,tag,hfs", "places");
else if (!strcmp(vol->fstype, "udf"))
edje_object_signal_emit(o, "icon,tag,dvd", "places");
//set partition type tag
if (!strcmp(vol->fstype, "ext2") || !strcmp(vol->fstype, "ext3") ||
!strcmp(vol->fstype, "ext4") || !strcmp(vol->fstype, "reiserfs"))
edje_object_signal_emit(o, "icon,tag,ext3", "places");
else if (!strcmp(vol->fstype, "vfat") || !strcmp(vol->fstype, "ntfs") ||
!strcmp(vol->fstype, "ntfs-3g"))
edje_object_signal_emit(o, "icon,tag,fat", "places");
else if (!strcmp(vol->fstype, "hfs") || !strcmp(vol->fstype, "hfsplus"))
edje_object_signal_emit(o, "icon,tag,hfs", "places");
else if (!strcmp(vol->fstype, "udf"))
edje_object_signal_emit(o, "icon,tag,dvd", "places");
//set icon
icon = edje_object_add(evas_object_evas_get(box));
if (strncmp(vol->icon, "e/", 2))
edje_object_file_set(icon, theme_file, vol->icon);
else
edje_object_file_set(icon,
e_theme_edje_file_get("base/theme/fileman",
vol->icon), vol->icon);
edje_object_part_swallow(o, "icon", icon);
//set icon
icon = edje_object_add(evas_object_evas_get(box));
if (strncmp(vol->icon, "e/", 2))
edje_object_file_set(icon, theme_file, vol->icon);
else
edje_object_file_set(icon,
e_theme_edje_file_get("base/theme/fileman",
vol->icon), vol->icon);
edje_object_part_swallow(o, "icon", icon);
//set mount/eject icon
if (vol->requires_eject || (vol->mounted && strcmp(vol->mount_point, "/")) ||
!strcmp(vol->bus, "usb")) //Some usb key don't have requires_eject set (probably an hal error)
edje_object_signal_emit(o, "icon,eject,show", "places");
else
edje_object_signal_emit(o, "icon,eject,hide", "places");
//set mount/eject icon
if (vol->requires_eject || (vol->mounted && strcmp(vol->mount_point, "/")) ||
!strcmp(vol->bus, "usb")) //Some usb key don't have requires_eject set (probably an hal error)
edje_object_signal_emit(o, "icon,eject,show", "places");
else
edje_object_signal_emit(o, "icon,eject,hide", "places");
/* orient the separator*/
if (!e_box_orientation_get(box))
edje_object_signal_emit(o, "separator,set,horiz", "places");
else
edje_object_signal_emit(o, "separator,set,vert", "places");
/* orient the separator*/
if (!e_box_orientation_get(box))
edje_object_signal_emit(o, "separator,set,horiz", "places");
else
edje_object_signal_emit(o, "separator,set,vert", "places");
/* connect signals from edje */
edje_object_signal_callback_add(o, "icon,activated", "places",
_places_icon_activated_cb, vol);
edje_object_signal_callback_add(o, "eject,activated", "places",
_places_eject_activated_cb, vol);
/* connect signals from edje */
edje_object_signal_callback_add(o, "icon,activated", "places",
_places_icon_activated_cb, vol);
edje_object_signal_callback_add(o, "eject,activated", "places",
_places_eject_activated_cb, vol);
/* pack the volume in the box */
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 */
1, 0, /* expand */
0.5, 0.0, /* align */
min_w, min_h, /* min */
max_w, max_h /* max */
);
}
/* pack the volume in the box */
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 */
1, 0, /* expand */
0.5, 0.0, /* align */
min_w, min_h, /* min */
max_w, max_h /* max */
);
}
}
void
@ -300,23 +297,23 @@ places_empty_box(Evas_Object *box)
e_box_freeze(box);
count = e_box_pack_count_get(box);
while (count >= 0)
{
Evas_Object *o;
Evas_Object *swal;
{
Evas_Object *o;
Evas_Object *swal;
o = e_box_pack_object_nth(box, count);
swal = edje_object_part_swallow_get(o, "icon");
if (swal)
{
edje_object_part_unswallow(o, swal);
evas_object_del(swal);
}
o = e_box_pack_object_nth(box, count);
swal = edje_object_part_swallow_get(o, "icon");
if (swal)
{
edje_object_part_unswallow(o, swal);
evas_object_del(swal);
}
e_box_unpack(o);
evas_object_del(o);
e_box_unpack(o);
evas_object_del(o);
count--;
}
count--;
}
e_box_thaw(box);
}
@ -333,33 +330,34 @@ places_parse_bookmarks(E_Menu *em)
snprintf(buf, sizeof(buf), "%s/.gtk-bookmarks", e_user_homedir_get());
fp = fopen(buf, "r");
if (fp)
{
while(fgets(line, sizeof(line), fp))
{
alias = NULL;
line[strlen(line) - 1] = '\0';
alias = strchr(line, ' ');
if (alias)
{
line[alias-line] = '\0';
alias++;
}
uri = efreet_uri_decode(line);
if (uri && uri->path)
{
if (ecore_file_exists(uri->path))
{
mi = e_menu_item_new(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
}
}
if (uri) efreet_uri_free(uri);
}
fclose(fp);
}
{
while(fgets(line, sizeof(line), fp))
{
alias = NULL;
line[strlen(line) - 1] = '\0';
alias = strchr(line, ' ');
if (alias)
{
line[alias-line] = '\0';
alias++;
}
uri = efreet_uri_decode(line);
if (uri && uri->path)
{
if (ecore_file_exists(uri->path))
{
mi = e_menu_item_new(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
}
}
if (uri) efreet_uri_free(uri);
}
fclose(fp);
}
}
void
@ -376,97 +374,97 @@ places_generate_menu(void *data, E_Menu *em)
/* Home */
if (places_conf->show_home)
{
mi = e_menu_item_new(em);
e_menu_item_label_set(mi, D_("Home"));
e_util_menu_item_theme_icon_set(mi, "user-home");
e_menu_item_callback_set(mi, _places_run_fm, (char*)e_user_homedir_get());
}
{
mi = e_menu_item_new(em);
e_menu_item_label_set(mi, D_("Home"));
e_util_menu_item_theme_icon_set(mi, "user-home");
e_menu_item_callback_set(mi, _places_run_fm, (char*)e_user_homedir_get());
}
/* Desktop */
if (places_conf->show_desk)
{
mi = e_menu_item_new(em);
e_menu_item_label_set(mi, D_("Desktop"));
e_util_menu_item_theme_icon_set(mi, "user-desktop");
snprintf(buf, sizeof(buf), "%s/Desktop", (char*)e_user_homedir_get());
e_menu_item_callback_set(mi, _places_run_fm, strdup(buf)); //TODO free somewhere
}
{
mi = e_menu_item_new(em);
e_menu_item_label_set(mi, D_("Desktop"));
e_util_menu_item_theme_icon_set(mi, "user-desktop");
snprintf(buf, sizeof(buf), "%s/Desktop", (char*)e_user_homedir_get());
e_menu_item_callback_set(mi, _places_run_fm, strdup(buf)); //TODO free somewhere
}
/* Trash */
if (places_conf->show_trash)
{
mi = e_menu_item_new(em);
e_menu_item_label_set(mi, D_("Trash"));
e_util_menu_item_theme_icon_set(mi, "folder");
e_menu_item_callback_set(mi, _places_run_fm, "trash:///");
}
{
mi = e_menu_item_new(em);
e_menu_item_label_set(mi, D_("Trash"));
e_util_menu_item_theme_icon_set(mi, "folder");
e_menu_item_callback_set(mi, _places_run_fm, "trash:///");
}
/* File System */
if (places_conf->show_root)
{
mi = e_menu_item_new(em);
e_menu_item_label_set(mi, D_("Filesystem"));
e_util_menu_item_theme_icon_set(mi, "drive-harddisk");
e_menu_item_callback_set(mi, _places_run_fm, "/");
}
{
mi = e_menu_item_new(em);
e_menu_item_label_set(mi, D_("Filesystem"));
e_util_menu_item_theme_icon_set(mi, "drive-harddisk");
e_menu_item_callback_set(mi, _places_run_fm, "/");
}
/* Temp */
if (places_conf->show_temp)
{
mi = e_menu_item_new(em);
e_menu_item_label_set(mi, D_("Temp"));
e_util_menu_item_theme_icon_set(mi, "user-temp");
e_menu_item_callback_set(mi, _places_run_fm, "/tmp");
}
{
mi = e_menu_item_new(em);
e_menu_item_label_set(mi, D_("Temp"));
e_util_menu_item_theme_icon_set(mi, "user-temp");
e_menu_item_callback_set(mi, _places_run_fm, "/tmp");
}
//separator
if (places_conf->show_home || places_conf->show_desk ||
places_conf->show_trash || places_conf->show_root ||
places_conf->show_temp)
{
mi = e_menu_item_new(em);
e_menu_item_separator_set(mi, 1);
}
{
mi = e_menu_item_new(em);
e_menu_item_separator_set(mi, 1);
}
/* Volumes */
Eina_Bool volumes_visible = 0;
const Eina_List *l;
Volume *vol;
EINA_LIST_FOREACH(volumes, l, vol)
{
if (!vol->valid) continue;
if (vol->mount_point && !strcmp(vol->mount_point, "/")) continue;
{
if (!vol->valid) continue;
if (vol->mount_point && !strcmp(vol->mount_point, "/")) continue;
mi = e_menu_item_new(em);
if ((vol->label) && (vol->label[0] != '\0'))
e_menu_item_label_set(mi, vol->label);
else
e_menu_item_label_set(mi, ecore_file_file_get(vol->mount_point));
mi = e_menu_item_new(em);
if ((vol->label) && (vol->label[0] != '\0'))
e_menu_item_label_set(mi, vol->label);
else
e_menu_item_label_set(mi, ecore_file_file_get(vol->mount_point));
if (vol->icon)
{
if (strncmp(vol->icon, "e/", 2))
e_menu_item_icon_edje_set(mi, theme_file, vol->icon);
else
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
vol->icon), vol->icon);
}
e_menu_item_callback_set(mi, places_menu_click_cb, (void*)vol);
volumes_visible = 1;
}
if (vol->icon)
{
if (strncmp(vol->icon, "e/", 2))
e_menu_item_icon_edje_set(mi, theme_file, vol->icon);
else
e_menu_item_icon_edje_set(mi,
e_theme_edje_file_get("base/theme/fileman",
vol->icon), vol->icon);
}
e_menu_item_callback_set(mi, places_menu_click_cb, (void*)vol);
volumes_visible = 1;
}
/* Favorites */
if (places_conf->show_bookm)
{
if (volumes_visible)
{
mi = e_menu_item_new(em);
e_menu_item_separator_set(mi, 1);
}
places_parse_bookmarks(em);
}
{
if (volumes_visible)
{
mi = e_menu_item_new(em);
e_menu_item_separator_set(mi, 1);
}
places_parse_bookmarks(em);
}
e_menu_pre_activate_callback_set(em, NULL, NULL);
}
@ -535,10 +533,10 @@ _places_volume_add(const char *udi)
v->force_open = 0;
if (places_conf->auto_mount)
v->to_mount = 1;
v->to_mount = 1;
if (places_conf->auto_open)
v->force_open = 1;
v->force_open = 1;
volumes = eina_list_append(volumes, v);
e_hal_device_get_all_properties(conn, v->udi, _places_volume_properties_cb, v);
@ -574,25 +572,25 @@ _places_human_size_get(unsigned long long size)
dsize = (double)size;
if (dsize < 1024)
snprintf(hum, sizeof(hum), "%.0fb", dsize);
snprintf(hum, sizeof(hum), "%.0fb", dsize);
else
{
dsize /= 1024.0;
if (dsize < 1024)
suffix = "KB";
else
{
dsize /= 1024.0;
if (dsize < 1024)
suffix = "MB";
else
{
dsize /= 1024.0;
suffix = "GB";
}
}
snprintf(hum, sizeof(hum), "%.1f%s", dsize, suffix);
}
{
dsize /= 1024.0;
if (dsize < 1024)
suffix = "KB";
else
{
dsize /= 1024.0;
if (dsize < 1024)
suffix = "MB";
else
{
dsize /= 1024.0;
suffix = "GB";
}
}
snprintf(hum, sizeof(hum), "%.1f%s", dsize, suffix);
}
return eina_stringshare_add(hum);
}
@ -604,7 +602,7 @@ _places_free_space_get(const char *mount)
//printf("GET SPACE of %s\n", mount);
if (!mount) return 0;
if (statvfs(mount, &s) != 0)
return 0;
return 0;
//printf(" SPACE %d\n", (s.f_bfree * s.f_bsize));
return (unsigned long long)s.f_bavail * (unsigned long long)s.f_bsize;
}
@ -641,8 +639,8 @@ _places_run_fm(void *data, E_Menu *m, E_Menu_Item *mi)
if (places_conf->fm && (places_conf->fm[0] != '\0'))
{
_places_run_fm_external(places_conf->fm, directory);
return;
_places_run_fm_external(places_conf->fm, directory);
return;
}
E_Action *act = e_action_find("fileman");
@ -665,18 +663,18 @@ _places_update_size(Evas_Object *obj, Volume *vol)
//Free label
tot_h = _places_human_size_get(vol->size);
if (vol->mounted)
{
free = _places_free_space_get(vol->mount_point);
free_h = _places_human_size_get(free);
snprintf(buf, sizeof(buf), "%s %s %s",free_h, D_("free of"),tot_h);
edje_object_part_text_set(obj, "size_label", buf);
eina_stringshare_del(free_h);
}
{
free = _places_free_space_get(vol->mount_point);
free_h = _places_human_size_get(free);
snprintf(buf, sizeof(buf), "%s %s %s", free_h, D_("free of"), tot_h);
edje_object_part_text_set(obj, "size_label", buf);
eina_stringshare_del(free_h);
}
else
{
snprintf(buf, sizeof(buf), D_("%s Not Mounted"), tot_h);
edje_object_part_text_set(obj, "size_label", buf);
}
{
snprintf(buf, sizeof(buf), D_("%s Not Mounted"), tot_h);
edje_object_part_text_set(obj, "size_label", buf);
}
eina_stringshare_del(tot_h);
//Gauge
@ -684,21 +682,21 @@ _places_update_size(Evas_Object *obj, Volume *vol)
Edje_Message_Float msg_float;
if (vol->mounted)
{
percent = 100 - (((long double)free / (long double)vol->size) * 100);
snprintf(buf2, sizeof(buf2), "%d%%", percent);
edje_object_part_text_set(obj, "percent_label", buf2);
{
percent = 100 - (((long double)free / (long double)vol->size) * 100);
snprintf(buf2, sizeof(buf2), "%d%%", percent);
edje_object_part_text_set(obj, "percent_label", buf2);
msg_float.val = (float)percent / 100;
edje_object_message_send(obj, EDJE_MESSAGE_FLOAT, 1, &msg_float);
edje_object_part_text_set(obj, "eject_label", D_("unmount"));
}
msg_float.val = (float)percent / 100;
edje_object_message_send(obj, EDJE_MESSAGE_FLOAT, 1, &msg_float);
edje_object_part_text_set(obj, "eject_label", D_("unmount"));
}
else
{
edje_object_signal_emit(obj, "gauge,hide", "places");
edje_object_part_text_set(obj, "percent_label", "");
edje_object_part_text_set(obj, "eject_label", D_("eject"));
}
{
edje_object_signal_emit(obj, "gauge,hide", "places");
edje_object_part_text_set(obj, "percent_label", "");
edje_object_part_text_set(obj, "eject_label", D_("eject"));
}
}
static void
@ -708,11 +706,12 @@ _places_mount_volume(Volume *vol)
char buf[256];
if ((!strcmp(vol->fstype, "vfat")) || (!strcmp(vol->fstype, "ntfs")))
{
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);
{
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);
vol->to_mount = 0;
eina_list_free(opt);
}
@ -728,12 +727,12 @@ _places_icon_activated_cb(void *data, Evas_Object *o, const char *emission, cons
vol = data;
if (vol->mounted)
_places_run_fm((void*)vol->mount_point, NULL, NULL);
_places_run_fm((void*)vol->mount_point, NULL, NULL);
else
{
vol->force_open = 1;
_places_mount_volume(vol);
}
{
vol->force_open = 1;
_places_mount_volume(vol);
}
}
void
@ -749,9 +748,9 @@ _places_eject_activated_cb(void *data, Evas_Object *o, const char *emission, con
Volume *vol = data;
if (vol->mounted)
e_hal_device_volume_unmount(conn, vol->udi, NULL, _places_unmount_cb, vol);
e_hal_device_volume_unmount(conn, vol->udi, NULL, _places_unmount_cb, vol);
else
e_hal_device_volume_eject(conn, vol->udi, NULL, _places_eject_cb, vol);
e_hal_device_volume_eject(conn, vol->udi, NULL, _places_eject_cb, vol);
}
@ -764,10 +763,10 @@ _places_open_when_mounted(void *data)
Volume *vol = data;
if (vol->mount_point)
{
_places_run_fm((void*)vol->mount_point, NULL, NULL);
return EINA_FALSE;
}
{
_places_run_fm((void*)vol->mount_point, NULL, NULL);
return EINA_FALSE;
}
return EINA_TRUE;
}
@ -778,17 +777,17 @@ _places_mount_cb(void *user_data, void *method_return, DBusError *error)
Volume *vol = user_data;
if (dbus_error_is_set(error))
{
_places_error_show("Mount Error", "Can't mount device.",error->name, error->message);
dbus_error_free(error);
return;
}
{
_places_error_show("Mount Error", "Can't mount device.",error->name, error->message);
dbus_error_free(error);
return;
}
if (vol->force_open)
{
ecore_timer_add(0.1, _places_open_when_mounted, vol);
vol->force_open = 0;
}
{
ecore_timer_add(0.1, _places_open_when_mounted, vol);
vol->force_open = 0;
}
}
void
@ -797,10 +796,10 @@ _places_unmount_cb(void *user_data, void *method_return, DBusError *error)
Volume *vol = user_data;
if (dbus_error_is_set(error))
{
_places_error_show("Unmount Error", "Can't unmount device.",error->name, error->message);
dbus_error_free(error);
}
{
_places_error_show("Unmount Error", "Can't unmount device.",error->name, error->message);
dbus_error_free(error);
}
}
void
@ -809,10 +808,11 @@ _places_eject_cb(void *user_data, void *method_return, DBusError *error)
Volume *vol = user_data;
if (dbus_error_is_set(error))
{
_places_error_show("Eject Error", "Can't eject device.",error->name, error->message);
dbus_error_free(error);
}
{
_places_error_show("Eject Error", "Can't eject device.",
error->name, error->message);
dbus_error_free(error);
}
}
/* Dbus CB - Generic device added */
@ -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));
}
@ -844,13 +843,13 @@ _places_device_rem_cb(void *data, DBusMessage *msg)
dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID);
EINA_LIST_FOREACH(volumes, l, v)
if (!strcmp(v->udi, udi))
{
//~ printf("PLACES Removed %s\n", v->udi);
_places_volume_del(v);
places_update_all_gadgets();
return;
}
if (!strcmp(v->udi, udi))
{
//~ printf("PLACES Removed %s\n", v->udi);
_places_volume_del(v);
places_update_all_gadgets();
return;
}
}
/* Dbus CB - Called when a device change some properties */
@ -873,14 +872,14 @@ _places_volume_all_cb(void *user_data, void *reply_data, DBusError *error)
if (!ret || !ret->strings) return;
if (dbus_error_is_set(error))
{
// XXX handle...
dbus_error_free(error);
return;
}
{
// XXX handle...
dbus_error_free(error);
return;
}
EINA_LIST_FOREACH(ret->strings, l, udi)
_places_volume_add(udi);
_places_volume_add(udi);
//TODO free ret??
}
@ -894,10 +893,10 @@ _places_volume_cb(void *user_data, void *reply_data, DBusError *error)
E_Hal_Device_Query_Capability_Return *ret = reply_data;
if (ret && ret->boolean)
{
//~ printf("PLACES DBUS CB UDI:%s\n", udi);
_places_volume_add(udi);
}
{
//~ printf("PLACES DBUS CB UDI:%s\n", udi);
_places_volume_add(udi);
}
eina_stringshare_del(udi);
}
@ -913,12 +912,12 @@ _places_volume_properties_cb(void *data, void *reply_data, DBusError *error)
/* skip volumes with volume.ignore set */
if (e_hal_property_bool_get(reply, "volume.ignore", &err) || err)
return;
return;
/* skip volumes that aren't filesystems */
str = e_hal_property_string_get(reply, "volume.fsusage", &err);
if (err || !str || strcmp(str, "filesystem"))
return;
return;
//~ v->uuid = e_hal_property_string_get(ret, "volume.uuid", &err);
//~ if (err) goto error;
@ -946,9 +945,10 @@ _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;
}
@ -964,10 +964,10 @@ _places_storage_properties_cb(void *data, void *reply_data, DBusError *error)
if (!v) return;
if (dbus_error_is_set(error))
{
dbus_error_free(error);
return;
}
{
dbus_error_free(error);
return;
}
str = e_hal_property_string_get(ret, "storage.bus", &err);
if (!err) v->bus = eina_stringshare_add(str);
@ -1005,17 +1005,19 @@ _places_storage_properties_cb(void *data, void *reply_data, DBusError *error)
if (v->to_mount && !v->mounted)
{
Eina_Bool enabled;
Eina_Bool enabled;
enabled = e_hal_property_bool_get(ret, "storage.automount_enabled_hint", &err);
if (err)
enabled = 1; /* assume no property it is enabled */
enabled = e_hal_property_bool_get(ret, "storage.automount_enabled_hint",
&err);
if (err)
enabled = 1; /* assume no property it is enabled */
if (enabled)
_places_mount_volume(v);
if (enabled)
_places_mount_volume(v);
}
v->to_mount = 0;
places_update_all_gadgets(); //TODO Update only this volume, not all
return;
}