vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid using '/media/' as mount point. 

Fixes http://trac.enlightenment.org/e/ticket/19


SVN revision: 36158
This commit is contained in:
ptomaine 2008-09-22 07:20:22 +00:00 committed by ptomaine
parent 8408de28cf
commit 2f90f227ea
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/e_fm.c
View File

@ -455,10 +455,18 @@ _e_fm2_cb_mount_ok(void *data)
sd = evas_object_smart_data_get(data);
if (!sd) return; // safety
sd->id = _e_fm2_client_monitor_add(sd->realpath);
sd->listing = 1;
evas_object_smart_callback_call(data, "dir_changed", NULL);
sd->tmp.iter = 0;
if (strcmp(sd->mount->mount_point, sd->realpath))
{
e_fm2_path_set(sd->obj, "/", sd->mount->mount_point);
}
else
{
sd->id = _e_fm2_client_monitor_add(sd->mount->mount_point);
sd->listing = 1;
evas_object_smart_callback_call(data, "dir_changed", NULL);
sd->tmp.iter = 0;
}
}
static void

6
src/bin/e_fm_hal.c
View File

@ -362,11 +362,11 @@ e_fm2_hal_volume_mountpoint_get(E_Volume *v)
return strdup(v->mount_point);
}
if (v->uuid)
if (v->uuid && v->uuid[0] != '\0')
snprintf(buf, sizeof(buf) - 1, "/media/%s", strdup(v->uuid));
else if (v->label)
else if (v->label && v->label[0] != '\0')
snprintf(buf, sizeof(buf) - 1, "/media/%s", strdup(v->label));
else if ((v->storage) && (v->storage->serial))
else if ((v->storage) && (v->storage->serial) && v->storage->serial[0] != '\0')
snprintf(buf, sizeof(buf) - 1, "/media/%s", strdup(v->storage->serial));
else
{