use new notification in img-view

diff --git a/src/img-view.c b/src/img-view.c
index e598c9c..7f3fded 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -68,6 +68,7 @@ static void view_window_close(ViewWindow *vw);
 
 static void view_window_dnd_init(ViewWindow *vw);
 
+static void view_window_notify_cb(FileData *fd, NotifyType type, gpointer data);
 
 /*
  *-----------------------------------------------------------------------------
@@ -805,6 +806,9 @@ static void view_window_destroy_cb(GtkWidget *widget, gpointer data)
        fullscreen_stop(vw->fs);
 
        filelist_free(vw->list);
+
+       file_data_unregister_notify_func(view_window_notify_cb, vw);
+
        g_free(vw);
 }
 
@@ -925,6 +929,8 @@ static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionDat
 
        view_window_list = g_list_append(view_window_list, vw);
 
+       file_data_register_notify_func(view_window_notify_cb, vw, NOTIFY_PRIORITY_LOW);
+
        return vw;
 }
 
@@ -1602,7 +1608,7 @@ static void view_window_dnd_init(ViewWindow *vw)
  *-----------------------------------------------------------------------------
  */
 
-static void view_real_removed(ViewWindow *vw, FileData *fd, GList *ignore_list)
+static void view_real_removed(ViewWindow *vw, FileData *fd)
 {
        ImageWindow *imd;
        FileData *image_fd;
@@ -1683,65 +1689,23 @@ static void view_real_removed(ViewWindow *vw, FileData *fd, GList *ignore_list)
        image_osd_update(imd);
 }
 
-static void view_real_moved(ViewWindow *vw, FileData *fd)
+static void view_window_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-/*
-       ImageWindow *imd;
-       const gchar *image_path;
-
-       imd = view_window_active_image(vw);
-*/
-/*
-       image_path = image_get_path(imd);
-
-       if (image_path && strcmp(image_path, fd->change->source) == 0)
-               {
-               image_set_fd(imd, dest);
-               }
-*/
-/*
-       if (vw->list)
-               {
-               GList *work;
-               work = vw->list;
-               while (work)
-                       {
-                       gchar *chk_path;
-
-                       chk_path = work->data;
-
-                       if (strcmp(chk_path, source) == 0)
-                               {
-                               work->data = g_strdup(dest);
-                               g_free(chk_path);
-                               }
-
-                       work = work->next;
-                       }
-               }
-*/
-}
-
-void view_window_maint_removed(FileData *fd, GList *ignore_list)
-{
-       GList *work = view_window_list;
-       while (work)
-               {
-               ViewWindow *vw = work->data;
-               work = work->next;
-
-               view_real_removed(vw, fd, ignore_list);
-               }
-}
+       ViewWindow *vw = data;
 
-void view_window_maint_moved(FileData *fd)
-{
-       GList *work = view_window_list;
-       while (work)
+       if (!fd->change) return;
+       
+       switch(fd->change->type)
                {
-               ViewWindow *vw = work->data;
-               work = work->next;
-
-               view_real_moved(vw, fd);
+               case FILEDATA_CHANGE_MOVE:
+               case FILEDATA_CHANGE_RENAME:
+                       break;
+               case FILEDATA_CHANGE_COPY:
+                       break;
+               case FILEDATA_CHANGE_DELETE:
+                       view_real_removed(vw, fd);
+                       break;
+               case FILEDATA_CHANGE_UNSPECIFIED:
+                       break;
                }
 }

diff --git a/src/img-view.h b/src/img-view.h
index bdf8997..0d27ba7 100644 (file)
--- a/src/img-view.h
+++ b/src/img-view.h
@@ -23,8 +23,6 @@ void view_window_colors_update(void);
 
 gint view_window_find_image(ImageWindow *imd, gint *index, gint *total);
 
-void view_window_maint_removed(FileData *fd, GList *ignore_list);
-void view_window_maint_moved(FileData *fd);
 
 
 #endif

diff --git a/src/utilops.c b/src/utilops.c
index f9f60d2..355875d 100644 (file)
--- a/src/utilops.c
+++ b/src/utilops.c
@@ -245,17 +245,14 @@ void file_data_notify_ci(FileData *fd)
                case FILEDATA_CHANGE_MOVE:
                        collection_maint_renamed(fd);
 
-                       view_window_maint_moved(fd);
                        break;
                case FILEDATA_CHANGE_COPY:
                        break;
                case FILEDATA_CHANGE_RENAME:
                        collection_maint_renamed(fd);
 
-                       view_window_maint_moved(fd);
                        break;
                case FILEDATA_CHANGE_DELETE:
-                       view_window_maint_removed(fd, NULL);
 
                        collection_maint_removed(fd);
                        break;