It compiles!

diff --git a/src/typedefs.h b/src/typedefs.h
index d3c5bcc..9d7db51 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -252,6 +252,13 @@ typedef enum {
 
 #define MAX_SPLIT_IMAGES 4
 
+typedef enum {
+       SELECTION_NONE          = 0,
+       SELECTION_SELECTED      = 1 << 0,
+       SELECTION_PRELIGHT      = 1 << 1,
+       SELECTION_FOCUS         = 1 << 2
+} SelectionType;
+
 typedef struct _ImageLoader ImageLoader;
 typedef struct _ThumbLoader ThumbLoader;
 
@@ -879,13 +886,6 @@ struct _ViewFileInfoList
        guint select_idle_id; /* event source id */
 };
 
-typedef enum {
-       SELECTION_NONE          = 0,
-       SELECTION_SELECTED      = 1 << 0,
-       SELECTION_PRELIGHT      = 1 << 1,
-       SELECTION_FOCUS         = 1 << 2
-} SelectionType;
-
 struct _ViewFileInfoIcon
 {
        /* table stuff */

diff --git a/src/view_file.c b/src/view_file.c
index d537e8a..cd4cf09 100644 (file)
--- a/src/view_file.c
+++ b/src/view_file.c
@@ -555,7 +555,7 @@ GtkWidget *vf_pop_menu(ViewFile *vf)
                active = (VFLIST(vf)->click_fd != NULL);
                break;
        case FILEVIEW_ICON:
-               active = (VFICON(vf)->click_id != NULL);
+               active = (VFICON(vf)->click_fd != NULL);
                break;
        }
 

diff --git a/src/view_file/view_file_icon.c b/src/view_file/view_file_icon.c
index e8f5c56..3d39748 100644 (file)
--- a/src/view_file/view_file_icon.c
+++ b/src/view_file/view_file_icon.c
@@ -80,14 +80,14 @@ GList *vficon_selection_get_one(ViewFile *vf, FileData *fd)
 
 GList *vficon_pop_menu_file_list(ViewFile *vf)
 {
-       if (!VFICON(vf)->click_id) return NULL;
+       if (!VFICON(vf)->click_fd) return NULL;
 
-       if (VFICON(vf)->click_id->selected & SELECTION_SELECTED)
+       if (VFICON(vf)->click_fd->selected & SELECTION_SELECTED)
                {
                return vf_selection_get_list(vf);
                }
 
-       return vficon_selection_get_one(vf, VFICON(vf)->click_id->fd);
+       return vficon_selection_get_one(vf, VFICON(vf)->click_fd);
 }
 
 void vficon_pop_menu_view_cb(GtkWidget *widget, gpointer data)
@@ -883,8 +883,7 @@ GList *vficon_selection_get_list_by_index(ViewFile *vf)
 void vficon_select_by_fd(ViewFile *vf, FileData *fd)
 {
        if (!fd) return;
-       FileData *found_fd = g_list_find(vf->list, fd);
-       if (!found_fd) return;
+       if (!g_list_find(vf->list, fd)) return;
 
        if (!(fd->selected & SELECTION_SELECTED))
                {
@@ -1271,13 +1270,13 @@ gboolean vficon_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
                                {
                                if (!options->collections.rectangular_selection)
                                        {
-                                       vficon_select_region_util(vf, old_id, new_fd, FALSE);
+                                       vficon_select_region_util(vf, old_fd, new_fd, FALSE);
                                        }
                                else
                                        {
                                        vficon_select_region_util(vf, VFICON(vf)->click_fd, old_fd, FALSE);
                                        }
-                               vficon_select_region_util(vf, VFICON(vf)->click_fd, new_id, TRUE);
+                               vficon_select_region_util(vf, VFICON(vf)->click_fd, new_fd, TRUE);
                                vficon_send_layout_select(vf, new_fd);
                                }
                        else if (event->state & GDK_CONTROL_MASK)
@@ -1695,7 +1694,8 @@ void vficon_set_thumb_fd(ViewFile *vf, FileData *fd)
        GtkTreeIter iter;
        GList *list;
 
-       if (!vficon_find_iter(vf, g_list_find(vf->list, fd), &iter, NULL)) return;
+       if (!g_list_find(vf->list, fd)) return;
+       if (!vficon_find_iter(vf, fd, &iter, NULL)) return;
 
        store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));