From 112645dd03ed5faef0bd0bb8406a586f480e437d Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Mon, 7 Jan 2002 11:54:02 +0000
Subject: [PATCH] r1053: Bugfix: Closing a filer window with a tooltip removes
 the tip now (before, the 	tooltip could get stuck on the screen).

---
 ROX-Filer/Help/Changes |  5 +++++
 ROX-Filer/Help/TODO    | 21 +++++++++++++++++++--
 ROX-Filer/src/filer.c  |  2 ++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ROX-Filer/Help/Changes b/ROX-Filer/Help/Changes
index 17dd5b6f..6214e86a 100644
--- a/ROX-Filer/Help/Changes
+++ b/ROX-Filer/Help/Changes
@@ -2,6 +2,11 @@
 			A RISC OS-like filer for X
 			by Thomas Leonard
 
+07-Jan-2001
+~~~~~~~~~~~
+Bugfix: Closing a filer window with a tooltip removes the tip now (before, the
+	tooltip could get stuck on the screen).
+
 06-Jan-2001
 ~~~~~~~~~~~
 Bugfix: Options box didn't work unless options had already been saved
diff --git a/ROX-Filer/Help/TODO b/ROX-Filer/Help/TODO
index 463e0036..90dbfa08 100644
--- a/ROX-Filer/Help/TODO
+++ b/ROX-Filer/Help/TODO
@@ -7,12 +7,14 @@ when someone sends patches!).
 
 BUGS
 
-Allow ~ in globicons.
+Clicking an unscanned item should scan it (as menu clicking does).
 
-qsorting a sorted collection shouldn't cause flicker.
+Allow ~ in globicons.
 
 Think about XXXs in dnd menu.
 
+Cancelling thumbnail creation doesn't allow it to be restarted.
+
 Deleting a symlink to a pinboard icon shows a warning
 
 The pinboard highlights to accept any type of drop (not just files).
@@ -28,15 +30,29 @@ Gtk+ 2.0:
 	- Spawning shell scripts sometimes gives Bad Address (glib bug)
 
 Rescanning sometimes causes the display to scroll (automounter problem).
+<<<<<<< TODO
+
+Panel sometimes won't accept drops (window frame problem?).
+
+Deleting / moving files should update the globicons.
+=======
 
 Panel sometimes won't accept drops:
 	- Create panel without a window manager running
 	- Start sawfish. Panel no longer accepts drops.
 	- Same thing happens with gnome-terminal => sawfish bug (WM_STATE)?
 
+>>>>>>> 1.171
 
+<<<<<<< TODO
+=======
 FEATURES FOR 1.3
+>>>>>>> 1.171
+
+<<<<<<< TODO
+FEATURES FOR 1.1
 
+=======
 Deleting / moving files should update the globicons?
 
 Pinboard icons can only be dragged one at a time.
@@ -45,6 +61,7 @@ Remove icon should work with MIME stuff.
 
 'Edit Item' doesn't make much sense for applets...
 
+>>>>>>> 1.171
 Option to mount on click, Shift+Click to open without mounting.
 
 When following symlinks, don't convert to the 'real' path. Up should
diff --git a/ROX-Filer/src/filer.c b/ROX-Filer/src/filer.c
index 135d7815..d5972695 100644
--- a/ROX-Filer/src/filer.c
+++ b/ROX-Filer/src/filer.c
@@ -521,6 +521,8 @@ static void filer_window_destroyed(GtkWidget 	*widget,
 		g_list_free(filer_window->thumb_queue);
 	}
 
+	filer_tooltip_prime(NULL, NULL);
+
 	g_free(filer_window->auto_select);
 	g_free(filer_window->path);
 	g_free(filer_window);
-- 
2.11.4.GIT