Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c
Log Message:
fix delete of non-symlink-backed .order soft refs.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- e_fm.c 15 Oct 2006 14:04:35 -0000 1.90
+++ e_fm.c 15 Oct 2006 23:20:15 -0000 1.91
@@ -3307,10 +3307,15 @@
{
ici = l->data;
/* FIXME: URI - needs to be file:/..... (can't remember 1 or
2 /'s) */
- if (!strcmp(realpath, "/"))
- snprintf(buf, sizeof(buf), "/%s", ici->file);
+ if (ici->pseudo_link)
+ snprintf(buf, sizeof(buf), "%s/%s", ici->pseudo_dir,
ici->file);
else
- snprintf(buf, sizeof(buf), "%s/%s", realpath, ici->file);
+ {
+ if (!strcmp(realpath, "/"))
+ snprintf(buf, sizeof(buf), "/%s", ici->file);
+ else
+ snprintf(buf, sizeof(buf), "%s/%s", realpath,
ici->file);
+ }
fsel = evas_list_append(fsel, strdup(buf));
}
evas_list_free(sl);
@@ -4651,6 +4656,7 @@
char buf[4096];
Evas_List *sel, *l;
E_Fm2_Icon_Info *ici;
+ int ok;
ic = data;
ic->dialog = NULL;
@@ -4661,6 +4667,7 @@
{
for (l = sel; l; l = l->next)
{
+ ok = 1;
ici = l->data;
if (!ici->pseudo_link)
{
@@ -4670,7 +4677,8 @@
if (!(ecore_file_recursive_rm(buf)))
{
char text[4096 + 256];
-
+
+ ok = 0;
man = e_manager_current_get();
if (man)
{
@@ -4692,8 +4700,9 @@
}
}
else ici->deleted = 1;
- _e_fm2_live_file_del(ic->sd->obj, ici->file);
}
+ else ici->deleted = 1;
+ if (ok) _e_fm2_live_file_del(ic->sd->obj, ici->file);
}
evas_list_free(sel);
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
