Introduce vf_pop_menu_file_list() as a wrapper to

vflist_pop_menu_file_list() and vficon_pop_menu_file_list().

diff --git a/src/view_file.c b/src/view_file.c
index ccacc6d..61303a4 100644 (file)
--- a/src/view_file.c
+++ b/src/view_file.c
@@ -271,6 +271,28 @@ static void vf_dnd_init(ViewFile *vf)
        }
 }
 
+/*
+ *-----------------------------------------------------------------------------
+ * pop-up menu
+ *-----------------------------------------------------------------------------
+ */
+
+GList *vf_pop_menu_file_list(ViewFile *vf)
+{
+       GList *ret = NULL;
+
+       switch(vf->type)
+       {
+       case FILEVIEW_LIST: ret = vflist_pop_menu_file_list(vf); break;
+       case FILEVIEW_ICON: ret = vficon_pop_menu_file_list(vf); break;
+       }
+
+       return ret;
+}
+
+
+
+
 gint vf_refresh(ViewFile *vf)
 {
        gint ret = FALSE;

diff --git a/src/view_file.h b/src/view_file.h
index 2387669..ab63f3c 100644 (file)
--- a/src/view_file.h
+++ b/src/view_file.h
@@ -30,6 +30,8 @@ void vf_thumb_set(ViewFile *vf, gint enable);
 void vf_marks_set(ViewFile *vf, gint enable);
 void vf_sort_set(ViewFile *vf, SortType type, gint ascend);
 
+GList *vf_pop_menu_file_list(ViewFile *vf);
+
 FileData *vf_index_get_data(ViewFile *vf, gint row);
 gint vf_index_by_path(ViewFile *vf, const gchar *path);
 gint vf_index_by_fd(ViewFile *vf, FileData *in_fd);

diff --git a/src/view_file_icon.c b/src/view_file_icon.c
index dfb096c..2ebdf16 100644 (file)
--- a/src/view_file_icon.c
+++ b/src/view_file_icon.c
@@ -164,7 +164,7 @@ static void vficon_populate_at_new_size(ViewFile *vf, gint w, gint h, gint force
  *-----------------------------------------------------------------------------
  */
 
-static GList *vficon_pop_menu_file_list(ViewFile *vf)
+GList *vficon_pop_menu_file_list(ViewFile *vf)
 {
        if (!VFICON_INFO(vf, click_id)) return NULL;
 
@@ -187,7 +187,7 @@ static void vficon_pop_menu_edit_cb(GtkWidget *widget, gpointer data)
 
        if (!vf) return;
 
-       list = vficon_pop_menu_file_list(vf);
+       list = vf_pop_menu_file_list(vf);
        start_editor_from_filelist(n, list);
        filelist_free(list);
 }
@@ -196,7 +196,7 @@ static void vficon_pop_menu_info_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
-       info_window_new(NULL, vficon_pop_menu_file_list(vf), NULL);
+       info_window_new(NULL, vf_pop_menu_file_list(vf), NULL);
 }
 
 static void vficon_pop_menu_view_cb(GtkWidget *widget, gpointer data)
@@ -223,35 +223,35 @@ static void vficon_pop_menu_copy_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
-       file_util_copy(NULL, vficon_pop_menu_file_list(vf), NULL, vf->listview);
+       file_util_copy(NULL, vf_pop_menu_file_list(vf), NULL, vf->listview);
 }
 
 static void vficon_pop_menu_move_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
-       file_util_move(NULL, vficon_pop_menu_file_list(vf), NULL, vf->listview);
+       file_util_move(NULL, vf_pop_menu_file_list(vf), NULL, vf->listview);
 }
 
 static void vficon_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
-       file_util_rename(NULL, vficon_pop_menu_file_list(vf), vf->listview);
+       file_util_rename(NULL, vf_pop_menu_file_list(vf), vf->listview);
 }
 
 static void vficon_pop_menu_delete_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
-       file_util_delete(NULL, vficon_pop_menu_file_list(vf), vf->listview);
+       file_util_delete(NULL, vf_pop_menu_file_list(vf), vf->listview);
 }
 
 static void vficon_pop_menu_copy_path_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
-       file_util_copy_path_list_to_clipboard(vficon_pop_menu_file_list(vf));
+       file_util_copy_path_list_to_clipboard(vf_pop_menu_file_list(vf));
 }
 
 static void vficon_pop_menu_sort_cb(GtkWidget *widget, gpointer data)

diff --git a/src/view_file_icon.h b/src/view_file_icon.h
index 1adc097..41ee627 100644 (file)
--- a/src/view_file_icon.h
+++ b/src/view_file_icon.h
@@ -27,6 +27,9 @@ gint vficon_refresh(ViewFile *vf);
 
 void vficon_sort_set(ViewFile *vf, SortType type, gint ascend);
 
+GList *vficon_pop_menu_file_list(ViewFile *vf);
+
+
 FileData *vficon_index_get_data(ViewFile *vf, gint row);
 gint vficon_index_by_path(ViewFile *vf, const gchar *path);
 gint vficon_index_by_fd(ViewFile *vf, FileData *in_fd);

diff --git a/src/view_file_list.c b/src/view_file_list.c
index cc54275..7ca7f47 100644 (file)
--- a/src/view_file_list.c
+++ b/src/view_file_list.c
@@ -277,7 +277,7 @@ void vflist_dnd_init(ViewFile *vf)
  *-----------------------------------------------------------------------------
  */
 
-static GList *vflist_pop_menu_file_list(ViewFile *vf)
+GList *vflist_pop_menu_file_list(ViewFile *vf)
 {
        if (!VFLIST_INFO(vf, click_fd)) return NULL;
 
@@ -300,7 +300,7 @@ static void vflist_pop_menu_edit_cb(GtkWidget *widget, gpointer data)
 
        if (!vf) return;
 
-       list = vflist_pop_menu_file_list(vf);
+       list = vf_pop_menu_file_list(vf);
        start_editor_from_filelist(n, list);
        filelist_free(list);
 }
@@ -309,7 +309,7 @@ static void vflist_pop_menu_info_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
-       info_window_new(NULL, vflist_pop_menu_file_list(vf), NULL);
+       info_window_new(NULL, vf_pop_menu_file_list(vf), NULL);
 }
 
 static void vflist_pop_menu_view_cb(GtkWidget *widget, gpointer data)
@@ -334,21 +334,21 @@ static void vflist_pop_menu_copy_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
-       file_util_copy(NULL, vflist_pop_menu_file_list(vf), NULL, vf->listview);
+       file_util_copy(NULL, vf_pop_menu_file_list(vf), NULL, vf->listview);
 }
 
 static void vflist_pop_menu_copy_path_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
-       file_util_copy_path_list_to_clipboard(vflist_pop_menu_file_list(vf));
+       file_util_copy_path_list_to_clipboard(vf_pop_menu_file_list(vf));
 }
 
 static void vflist_pop_menu_move_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
-       file_util_move(NULL, vflist_pop_menu_file_list(vf), NULL, vf->listview);
+       file_util_move(NULL, vf_pop_menu_file_list(vf), NULL, vf->listview);
 }
 
 static void vflist_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
@@ -356,7 +356,7 @@ static void vflist_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
        ViewFile *vf = data;
        GList *list;
 
-       list = vflist_pop_menu_file_list(vf);
+       list = vf_pop_menu_file_list(vf);
        if (options->file_ops.enable_in_place_rename &&
            list && !list->next && VFLIST_INFO(vf, click_fd))
                {
@@ -386,7 +386,7 @@ static void vflist_pop_menu_delete_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = data;
 
-       file_util_delete(NULL, vflist_pop_menu_file_list(vf), vf->listview);
+       file_util_delete(NULL, vf_pop_menu_file_list(vf), vf->listview);
 }
 
 static void vflist_pop_menu_sort_cb(GtkWidget *widget, gpointer data)

diff --git a/src/view_file_list.h b/src/view_file_list.h
index 963129b..71e3661 100644 (file)
--- a/src/view_file_list.h
+++ b/src/view_file_list.h
@@ -32,6 +32,8 @@ void vflist_thumb_set(ViewFile *vf, gint enable);
 void vflist_marks_set(ViewFile *vf, gint enable);
 void vflist_sort_set(ViewFile *vf, SortType type, gint ascend);
 
+GList *vflist_pop_menu_file_list(ViewFile *vf);
+
 FileData *vflist_index_get_data(ViewFile *vf, gint row);
 gint vflist_index_by_path(ViewFile *vf, const gchar *path);
 gint vflist_count(ViewFile *vf, gint64 *bytes);