X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=src%2Ftypedefs.h;h=d3c5bcc8fc732d18704417ac96f55550cc11f71b;hp=f7725f2998da93a3caa737d7322b4bc8f4fe468b;hb=9828bbe6d27398f12c9a0b72504d9efebb87a945;hpb=6c65564fcd9c0814f215e232fe9cd80f1b6b3bf3

diff --git a/src/typedefs.h b/src/typedefs.h
index f7725f29..d3c5bcc8 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -575,6 +575,8 @@ struct _FileData {
 	GHashTable *modified_xmp; // hash table which contains unwritten xmp metadata in format: key->list of string values
 	GList *cached_metadata;
 	gint rating;
+
+	SelectionType selected;  // Used by view_file_icon.
 };
 
 struct _LayoutOptions
@@ -823,6 +825,7 @@ struct _ViewDirInfoTree
 struct _ViewFile
 {
 	FileViewType type;
+	// TODO(xsdg): Turn this into a union (see VFLIST and VFICON from view_file.h).
 	gpointer info;
 
 	GtkWidget *widget;
@@ -883,13 +886,6 @@ typedef enum {
 	SELECTION_FOCUS		= 1 << 2
 } SelectionType;
 
-typedef struct _IconData IconData;
-struct _IconData
-{
-	SelectionType selected;
-	FileData *fd;
-};
-
 struct _ViewFileInfoIcon
 {
 	/* table stuff */
@@ -897,15 +893,15 @@ struct _ViewFileInfoIcon
 	gint rows;
 
 	GList *selection;
-	struct _IconData *prev_selection;
+	FileData *prev_selection;
 
 	GtkWidget *tip_window;
 	guint tip_delay_id; /* event source id */
-	struct _IconData *tip_id;
+	FileData *tip_fd;
 
-	struct _IconData *click_id;
+	FileData *click_fd;
 
-	struct _IconData *focus_id;
+	FileData *focus_fd;
 	gint focus_row;
 	gint focus_column;