aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-11-02 13:45:47 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-11-02 13:45:47 +0000
commitdc0dd0906f5a3a55966e89a25724ad003622132b (patch)
treea01c00f008af3b6081422061694a32057b0f2c3e /src
parentfix process updating for secure delete operations, efm_op now requires libmath (diff)
downloadenlightenment-dc0dd0906f5a3a55966e89a25724ad003622132b.tar.gz
efm progress bar thingy now handles secure deletion
ticket #1702 also renamed the "unknow" operation to "unknown", default theme updated SVN revision: 78865
Diffstat (limited to 'src')
-rw-r--r--src/modules/fileman/e_fwin.c21
1 files changed, 18 insertions, 3 deletions
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index cfd5e25f3..62bc17544 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -2924,8 +2924,12 @@ _e_fwin_op_registry_listener_cb(void *data,
edje_object_signal_emit(o, "e,action,icon,delete", "e");
break;
+ case E_FM_OP_SECURE_REMOVE:
+ edje_object_signal_emit(o, "e,action,icon,secure_delete", "e");
+ break;
+
default:
- edje_object_signal_emit(o, "e,action,icon,unknow", "e");
+ edje_object_signal_emit(o, "e,action,icon,unknown", "e");
}
// Update information text
@@ -2946,6 +2950,10 @@ _e_fwin_op_registry_listener_cb(void *data,
snprintf(buf, sizeof(buf), _("Deleting is aborted"));
break;
+ case E_FM_OP_SECURE_REMOVE:
+ snprintf(buf, sizeof(buf), _("Secure deletion is aborted"));
+ break;
+
default:
snprintf(buf, sizeof(buf), _("Unknown operation from slave is aborted"));
}
@@ -2976,6 +2984,13 @@ _e_fwin_op_registry_listener_cb(void *data,
snprintf(buf, sizeof(buf), _("Deleting files..."));
break;
+ case E_FM_OP_SECURE_REMOVE:
+ if (ere->finished)
+ snprintf(buf, sizeof(buf), _("Secure delete done"));
+ else
+ snprintf(buf, sizeof(buf), _("Securely deleting files..."));
+ break;
+
default:
snprintf(buf, sizeof(buf), _("Unknown operation from slave %d"), ere->id);
}
@@ -3058,8 +3073,8 @@ _e_fwin_op_registry_entry_add_cb(void *data,
E_Fwin_Page *page = data;
Evas_Object *o;
- if (!(ere->op == E_FM_OP_COPY || ere->op == E_FM_OP_MOVE ||
- ere->op == E_FM_OP_REMOVE))
+ if ((ere->op != E_FM_OP_COPY) && (ere->op != E_FM_OP_MOVE) &&
+ (ere->op != E_FM_OP_REMOVE) && (ere->op != E_FM_OP_SECURE_REMOVE))
return ECORE_CALLBACK_RENEW;
o = edje_object_add(evas_object_evas_get(page->scrollframe_obj));