projects
/
geeqie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove all references to "IconData"
[geeqie.git]
/
src
/
typedefs.h
diff --git
a/src/typedefs.h
b/src/typedefs.h
index
f7725f2
..
d3c5bcc
100644
(file)
--- 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;
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
};
struct _LayoutOptions
@@
-823,6
+825,7
@@
struct _ViewDirInfoTree
struct _ViewFile
{
FileViewType type;
struct _ViewFile
{
FileViewType type;
+ // TODO(xsdg): Turn this into a union (see VFLIST and VFICON from view_file.h).
gpointer info;
GtkWidget *widget;
gpointer info;
GtkWidget *widget;
@@
-883,13
+886,6
@@
typedef enum {
SELECTION_FOCUS = 1 << 2
} SelectionType;
SELECTION_FOCUS = 1 << 2
} SelectionType;
-typedef struct _IconData IconData;
-struct _IconData
-{
- SelectionType selected;
- FileData *fd;
-};
-
struct _ViewFileInfoIcon
{
/* table stuff */
struct _ViewFileInfoIcon
{
/* table stuff */
@@
-897,15
+893,15
@@
struct _ViewFileInfoIcon
gint rows;
GList *selection;
gint rows;
GList *selection;
-
struct _Icon
Data *prev_selection;
+
File
Data *prev_selection;
GtkWidget *tip_window;
guint tip_delay_id; /* event source id */
GtkWidget *tip_window;
guint tip_delay_id; /* event source id */
-
struct _IconData *tip_i
d;
+
FileData *tip_f
d;
-
struct _IconData *click_i
d;
+
FileData *click_f
d;
-
struct _IconData *focus_i
d;
+
FileData *focus_f
d;
gint focus_row;
gint focus_column;
gint focus_row;
gint focus_column;