From b6e55ee2dce619dfcd13866b1d743a616cfcef68 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Fri, 28 Jun 2002 13:56:03 +0000
Subject: [PATCH] r1609: Bugfix: Tooltips for files sometimes didn't get
 displayed.

---
 ROX-Filer/Help/Changes          |  4 ++++
 ROX-Filer/Help/TODO             |  5 ++---
 ROX-Filer/src/type.c            | 13 +++++++++++++
 ROX-Filer/src/view_collection.c |  3 +++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ROX-Filer/Help/Changes b/ROX-Filer/Help/Changes
index b37a7542..47124d6a 100644
--- a/ROX-Filer/Help/Changes
+++ b/ROX-Filer/Help/Changes
@@ -2,6 +2,10 @@
 			A RISC OS-like filer for X
 			by Thomas Leonard
 
+28-Jun-2002
+~~~~~~~~~~~
+Bugfix: Tooltips for files sometimes didn't get displayed.
+
 26-Jun-2002
 ~~~~~~~~~~~
 Added reminder about having NumLock on when using groups from the keypad
diff --git a/ROX-Filer/Help/TODO b/ROX-Filer/Help/TODO
index c621f0a5..8a394b5e 100644
--- a/ROX-Filer/Help/TODO
+++ b/ROX-Filer/Help/TODO
@@ -8,9 +8,6 @@ when someone sends patches!).
 
 BUGS
 
-After showing the tooltip for an app, moving off and back onto the icon
-doesn't show it again.
-
 Dragging a pinboard icon doesn't remove the tooltip.
 
 When the minibuffer is highlighted in red, scanning more items should recheck.
@@ -25,6 +22,8 @@ Dirs in /proc which have no access permission keep bringing up error boxes.
 
 FEATURES FOR 1.3
 
+Geometry in SOAP message?
+
 Put groups on Select menu.
 
 Click Refresh to reload MIME info.
diff --git a/ROX-Filer/src/type.c b/ROX-Filer/src/type.c
index b0486ea8..d3a13e3f 100644
--- a/ROX-Filer/src/type.c
+++ b/ROX-Filer/src/type.c
@@ -1193,6 +1193,19 @@ static void import_for_dir(guchar *path, GHashTable *globs, gboolean *freedesk)
 		}
 		
 		import_file(make_path(path, item->d_name)->str, globs);
+#if 0
+		{
+			struct timeval start, end;
+			g_print("[ %s ]\n", item->d_name);
+			gettimeofday(&start, NULL);
+			import_file(make_path(path, item->d_name)->str, globs);
+			gettimeofday(&end, NULL);
+
+			g_print("Delay = %lf s\n", 
+						(end.tv_sec +   ((double) end.tv_usec)   / 1000000) - 
+						(start.tv_sec + ((double) start.tv_usec) / 1000000));
+		}
+#endif
 	}
 
 	closedir(dir);
diff --git a/ROX-Filer/src/view_collection.c b/ROX-Filer/src/view_collection.c
index 109ce73f..ed37961c 100644
--- a/ROX-Filer/src/view_collection.c
+++ b/ROX-Filer/src/view_collection.c
@@ -853,7 +853,10 @@ static gint coll_motion_notify(GtkWidget *widget,
 	i = collection_get_item(collection, event->x, event->y);
 
 	if (i == -1)
+	{
 		tooltip_show(NULL);
+		tip_item = NULL;
+	}
 	else
 	{
 		DirItem *item = (DirItem *) collection->items[i].data;
-- 
2.11.4.GIT