From 32b49c8a6a3dacd10a56e611235cf8606efd4659 Mon Sep 17 00:00:00 2001 From: cpk Date: Sun, 29 Jul 2001 14:39:23 +0000 Subject: [PATCH] Efsd updates -- the file monitoring requests for files and directories have been merged into one call. Instead of efsd_start_monitor_dir() and efsd_start_monitor_file(), use efsd_start_monitor() now and specify whether you want directory monitoring via the final flag parameter. Same goes for efsd_stop_monitor() now. SVN revision: 5007 --- src/view.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/view.c b/src/view.c index b0cf86048..e2c8ea456 100644 --- a/src/view.c +++ b/src/view.c @@ -1268,12 +1268,13 @@ e_view_handle_fs_restart(void *data) evas_list_free(icons); } if (e_fs_get_connection()) - v->monitor_id = efsd_start_monitor_dir(e_fs_get_connection(), v->dir, - efsd_ops(2, - efsd_op_get_stat(), - efsd_op_get_filetype() - ) - ); + v->monitor_id = efsd_start_monitor(e_fs_get_connection(), v->dir, + efsd_ops(3, + efsd_op_get_stat(), + efsd_op_get_filetype(), + efsd_op_sort() + ), + TRUE); printf("restarted monitor id (connection = %p), %i for %s\n", e_fs_get_connection(), v->monitor_id, v->dir); v->is_listing = 1; } @@ -1812,12 +1813,14 @@ e_view_set_dir(E_View *v, char *dir) v->restarter = e_fs_add_restart_handler(e_view_handle_fs_restart, v); if (e_fs_get_connection()) { - v->monitor_id = efsd_start_monitor_dir(e_fs_get_connection(), v->dir, - efsd_ops(2, - efsd_op_get_stat(), - efsd_op_get_filetype() - ) - ); + v->monitor_id = efsd_start_monitor(e_fs_get_connection(), v->dir, + efsd_ops(3, + efsd_op_get_stat(), + efsd_op_get_filetype(), + efsd_op_sort() + ), + TRUE + ); printf("monitor id for %s = %i\n", v->dir, v->monitor_id); v->is_listing = 1; v->changed = 1; @@ -2106,7 +2109,9 @@ e_view_handle_fs(EfsdEvent *ev) /* printf("Startmon file event %i\n", ev->efsd_reply_event.command.efsd_file_cmd.id); */ break; - case EFSD_CMD_STOPMON: + case EFSD_CMD_STOPMON_DIR: + break; + case EFSD_CMD_STOPMON_FILE: break; default: break;