Refactor: move view_file implementations to their own subdirectory.
[geeqie.git] / src / view_file.c
index da40981..d537e8a 100644 (file)
@@ -22,6 +22,8 @@
 #include "view_file.h"
 
 #include "dupe.h"
+#include "collect.h"
+#include "collect-table.h"
 #include "editors.h"
 #include "layout.h"
 #include "menu.h"
@@ -29,8 +31,8 @@
 #include "ui_menu.h"
 #include "ui_fileops.h"
 #include "utilops.h"
-#include "view_file_list.h"
-#include "view_file_icon.h"
+#include "view_file/view_file_list.h"
+#include "view_file/view_file_icon.h"
 
 /*
  *-----------------------------------------------------------------------------
@@ -407,7 +409,7 @@ static void vf_pop_menu_duplicates_cb(GtkWidget *widget, gpointer data)
        ViewFile *vf = data;
        DupeWindow *dw;
 
-       dw = dupe_window_new(DUPE_MATCH_NAME);
+       dw = dupe_window_new();
        dupe_window_add_files(dw, vf_pop_menu_file_list(vf), FALSE);
 }
 
@@ -1081,7 +1083,7 @@ void vf_notify_cb(FileData *fd, NotifyType type, gpointer data)
        if (!refresh)
                {
                gchar *base = remove_level_from_path(fd->path);
-               refresh = (strcmp(base, vf->dir_fd->path) == 0);
+               refresh = (g_strcmp0(base, vf->dir_fd->path) == 0);
                g_free(base);
                }
 
@@ -1090,14 +1092,14 @@ void vf_notify_cb(FileData *fd, NotifyType type, gpointer data)
                if (!refresh && fd->change->dest)
                        {
                        gchar *dest_base = remove_level_from_path(fd->change->dest);
-                       refresh = (strcmp(dest_base, vf->dir_fd->path) == 0);
+                       refresh = (g_strcmp0(dest_base, vf->dir_fd->path) == 0);
                        g_free(dest_base);
                        }
 
                if (!refresh && fd->change->source)
                        {
                        gchar *source_base = remove_level_from_path(fd->change->source);
-                       refresh = (strcmp(source_base, vf->dir_fd->path) == 0);
+                       refresh = (g_strcmp0(source_base, vf->dir_fd->path) == 0);
                        g_free(source_base);
                        }
                }