diff src/typedefs.h @ 1523:24a12aa0cb54

Fix up event source ids type: gint -> guint. Functions like g_timeout_add() or g_idle_add() return a guint greater than 0, but in most places it was wrongly stored as int and initialized to -1. This broke assertions matching in g_source_remove() for example since id was always greater than 0 even when timer was not set (-1 was casted to the biggest guint).

--- a/src/typedefs.h	Mon Apr 06 21:52:49 2009 +0000
+++ b/src/typedefs.h	Mon Apr 06 22:13:54 2009 +0000
@@ -263,7 +263,7 @@
 
 	gpointer data;
 
-	gint idle_done_id;
+	guint idle_done_id; /* event source id */
 };
 
 struct _CollectInfo
@@ -316,7 +316,7 @@
 	CollectInfo *click_info;
 
 	GtkWidget *tip_window;
-	gint tip_delay_id;
+	guint tip_delay_id; /* event source id */
 	CollectInfo *tip_info;
 
 	GdkWindow *marker_window;
@@ -333,8 +333,8 @@
 	CollectInfo *drop_info;
 	GList *drop_list;
 
-	gint sync_idle_id;
-	gint drop_idle_id;
+	guint sync_idle_id; /* event source id */
+	guint drop_idle_id; /* event source id */
 
 	gboolean show_text;
 
@@ -681,7 +681,7 @@
 
 	FileData *drop_fd;
 	GList *drop_list;
-	gint drop_scroll_id;
+	guint drop_scroll_id; /* event source id */
 
 	/* func list */
 	void (*select_func)(ViewDir *vd, const gchar *path, gpointer data);
@@ -704,7 +704,7 @@
 
 struct _ViewDirInfoTree
 {
-	gint drop_expand_id;
+	guint drop_expand_id; /* event source id */
 	gint busy_ref;
 };
 
@@ -748,7 +748,7 @@
 	gint clicked_mark;
 	
 	/* refresh */
-	gint refresh_idle_id;
+	guint refresh_idle_id; /* event source id */
 
 	/* file list for edit menu */
 	GList *editmenu_fd_list;
@@ -761,7 +761,7 @@
 
 	gboolean thumbs_enabled;
 
-	gint select_idle_id;
+	guint select_idle_id; /* event source id */
 };
 
 struct _IconData;
@@ -776,7 +776,7 @@
 	struct _IconData *prev_selection;
 
 	GtkWidget *tip_window;
-	gint tip_delay_id;
+	guint tip_delay_id; /* event source id */
 	struct _IconData *tip_id;
 
 	struct _IconData *click_id;
@@ -803,7 +803,7 @@
 	FileData *slide_fd;
 
 	guint slide_count;
-	gint timeout_id;
+	guint timeout_id; /* event source id */
 
 	gboolean from_selection;
 
@@ -821,11 +821,12 @@
 	GtkWidget *normal_window;
 	ImageWindow *normal_imd;
 
-	gint hide_mouse_id;
-	gint busy_mouse_id;
+	guint hide_mouse_id; /* event source id */
+	guint busy_mouse_id; /* event source id */
+
 	gint cursor_state;
 
-	gint saver_block_id;
+	guint saver_block_id; /* event source id */
 
 	void (*stop_func)(FullScreenData *, gpointer);
 	gpointer stop_data;