use new notification in vficon

diff --git a/src/layout.c b/src/layout.c
index 5328a02..a56d4a6 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -2016,7 +2016,7 @@ static void layout_real_renamed(LayoutWindow *lw, FileData *fd)
 {
        if (lw->image) layout_image_maint_renamed(lw, fd);
 
-       if (lw->vf && vf_maint_renamed(lw->vf, fd))
+//     if (lw->vf && vf_maint_renamed(lw->vf, fd))
                layout_real_time_update(lw);
                
 }
@@ -2025,7 +2025,7 @@ static void layout_real_removed(LayoutWindow *lw, FileData *fd, GList *ignore_li
 {
        if (lw->image) layout_image_maint_removed(lw, fd);
 
-       if (lw->vf && vf_maint_removed(lw->vf, fd, ignore_list))
+//     if (lw->vf && vf_maint_removed(lw->vf, fd, ignore_list))
                layout_real_time_update(lw);
 }
 
@@ -2033,7 +2033,7 @@ static void layout_real_moved(LayoutWindow *lw, FileData *fd, GList *ignore_list
 {
        if (lw->image) layout_image_maint_moved(lw, fd);
 
-       if (lw->vf && vf_maint_moved(lw->vf, fd, ignore_list))
+//     if (lw->vf && vf_maint_moved(lw->vf, fd, ignore_list))
                layout_real_time_update(lw);
 }
 

diff --git a/src/view_file.c b/src/view_file.c
index 0bbcf4f..aeb69cc 100644 (file)
--- a/src/view_file.c
+++ b/src/view_file.c
@@ -742,12 +742,14 @@ void vf_set_layout(ViewFile *vf, LayoutWindow *layout)
        vf->layout = layout;
 }
 
+#if 0
 /*
  *-----------------------------------------------------------------------------
  * maintenance (for rename, move, remove)
  *-----------------------------------------------------------------------------
  */
 
+
 gint vf_maint_renamed(ViewFile *vf, FileData *fd)
 {
        gint ret = FALSE;
@@ -786,3 +788,4 @@ gint vf_maint_moved(ViewFile *vf, FileData *fd, GList *ignore_list)
 
        return ret;
 }
+#endif
\ No newline at end of file

diff --git a/src/view_file.h b/src/view_file.h
index 06c9c91..0213386 100644 (file)
--- a/src/view_file.h
+++ b/src/view_file.h
@@ -61,9 +61,4 @@ void vf_selection_to_mark(ViewFile *vf, gint mark, SelectionToMarkMode mode);
 void vf_select_marked(ViewFile *vf, gint mark);
 void vf_mark_selected(ViewFile *vf, gint mark, gint value);
 
-gint vf_maint_renamed(ViewFile *vf, FileData *fd);
-gint vf_maint_removed(ViewFile *vf, FileData *fd, GList *ignore_list);
-gint vf_maint_moved(ViewFile *vf, FileData *fd, GList *ignore_list);
-
-
 #endif /* VIEW_FILE_H */

diff --git a/src/view_file_icon.c b/src/view_file_icon.c
index 76ab7bc..440daf8 100644 (file)
--- a/src/view_file_icon.c
+++ b/src/view_file_icon.c
@@ -65,6 +65,7 @@ struct _IconData
        FileData *fd;
 };
 
+static void vficon_notify_cb(FileData *fd, gpointer data);
 static gint vficon_index_by_id(ViewFile *vf, IconData *in_id);
 
 static IconData *vficon_icon_data(ViewFile *vf, FileData *fd)
@@ -2233,6 +2234,8 @@ void vficon_destroy_cb(GtkWidget *widget, gpointer data)
        ViewFile *vf = data;
 
        if (VFICON_INFO(vf, sync_idle_id) != -1) g_source_remove(VFICON_INFO(vf, sync_idle_id));
+       
+       file_data_unregister_notify_func(vficon_notify_cb, vf);
 
        tip_unschedule(vf);
 
@@ -2298,6 +2301,8 @@ ViewFile *vficon_new(ViewFile *vf, FileData *dir_fd)
        /* force VFICON_INFO(vf, columns) to be at least 1 (sane) - this will be corrected in the size_cb */
        vficon_populate_at_new_size(vf, 1, 1, FALSE);
 
+       file_data_register_notify_func(vficon_notify_cb, vf);
+
        return vf;
 }
 
@@ -2369,7 +2374,10 @@ static gint vficon_maint_find_closest(ViewFile *vf, gint row, gint count, GList
                }
 }
 
-gint vficon_maint_renamed(ViewFile *vf, FileData *fd)
+static gint vficon_maint_removed(ViewFile *vf, FileData *fd, GList *ignore_list);
+
+
+static gint vficon_maint_renamed(ViewFile *vf, FileData *fd)
 {
        gint ret = FALSE;
        gint row;
@@ -2404,7 +2412,7 @@ gint vficon_maint_renamed(ViewFile *vf, FileData *fd)
        return ret;
 }
 
-gint vficon_maint_removed(ViewFile *vf, FileData *fd, GList *ignore_list)
+static gint vficon_maint_removed(ViewFile *vf, FileData *fd, GList *ignore_list)
 {
        gint row;
        gint new_row = -1;
@@ -2530,7 +2538,7 @@ gint vficon_maint_removed(ViewFile *vf, FileData *fd, GList *ignore_list)
        return TRUE;
 }
 
-gint vficon_maint_moved(ViewFile *vf, FileData *fd, GList *ignore_list)
+static gint vficon_maint_moved(ViewFile *vf, FileData *fd, GList *ignore_list)
 {
        gint ret = FALSE;
        gchar *buf;
@@ -2548,3 +2556,28 @@ gint vficon_maint_moved(ViewFile *vf, FileData *fd, GList *ignore_list)
 
        return ret;
 }
+
+static void vficon_notify_cb(FileData *fd, gpointer data)
+{
+       ViewFile *vf = data;
+
+       if (!fd->change) return;
+       
+       switch(fd->change->type)
+               {
+               case FILEDATA_CHANGE_MOVE:
+                       vficon_maint_moved(vf, fd, NULL);
+                       break;
+               case FILEDATA_CHANGE_COPY:
+                       break;
+               case FILEDATA_CHANGE_RENAME:
+                       vficon_maint_renamed(vf, fd);
+                       break;
+               case FILEDATA_CHANGE_DELETE:
+                       vficon_maint_removed(vf, fd, NULL);
+                       break;
+               case FILEDATA_CHANGE_UNSPECIFIED:
+                       break;
+               }
+
+}

diff --git a/src/view_file_icon.h b/src/view_file_icon.h
index 70b0584..48b47d2 100644 (file)
--- a/src/view_file_icon.h
+++ b/src/view_file_icon.h
@@ -53,9 +53,4 @@ void vficon_select_by_fd(ViewFile *vf, FileData *fd);
 void vficon_mark_to_selection(ViewFile *vf, gint mark, MarkToSelectionMode mode);
 void vficon_selection_to_mark(ViewFile *vf, gint mark, SelectionToMarkMode mode);
 
-gint vficon_maint_renamed(ViewFile *vf, FileData *fd);
-gint vficon_maint_removed(ViewFile *vf, FileData *fd, GList *ignore_list);
-gint vficon_maint_moved(ViewFile *vf, FileData *fd, GList *ignore_list);
-
-
 #endif

diff --git a/src/view_file_list.h b/src/view_file_list.h
index 3d2309b..e25f201 100644 (file)
--- a/src/view_file_list.h
+++ b/src/view_file_list.h
@@ -60,13 +60,6 @@ void vflist_selection_to_mark(ViewFile *vf, gint mark, SelectionToMarkMode mode)
 void vflist_select_marked(ViewFile *vf, gint mark);
 void vflist_mark_selected(ViewFile *vf, gint mark, gint value);
 
-/*
-gint vflist_maint_renamed(ViewFile *vf, FileData *fd);
-gint vflist_maint_removed(ViewFile *vf, FileData *fd, GList *ignore_list);
-gint vflist_maint_moved(ViewFile *vf, FileData *fd, GList *ignore_list);
-*/
-
 void vflist_color_set(ViewFile *vf, FileData *fd, gint color_set);
 
-
 #endif