From 1ef4bea74021d7715125a3fa964a886c19633a0c Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Tue, 28 May 2002 10:15:46 +0000
Subject: [PATCH] r1523: Check for application/x-executable.

---
 ROX-Filer/Help/Changes   | 5 +++++
 ROX-Filer/src/tasklist.c | 7 +++++++
 install.sh               | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ROX-Filer/Help/Changes b/ROX-Filer/Help/Changes
index c8315889..f7b18cd8 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
 
+28-May-2002
+~~~~~~~~~~~
+Bugfix: When showing iconified windows, the filer could crash if a window
+	disappeared at the wrong moment.
+
 27-May-2002
 ~~~~~~~~~~~
 Set _XROOTPMAP_ID property on root window so that Eterm and friends show
diff --git a/ROX-Filer/src/tasklist.c b/ROX-Filer/src/tasklist.c
index 87e7d9f5..156e56ab 100644
--- a/ROX-Filer/src/tasklist.c
+++ b/ROX-Filer/src/tasklist.c
@@ -349,8 +349,13 @@ static void add_window(Window win)
 
 		XGetWindowAttributes(gdk_display, win, &attr);
 
+		if (gdk_error_trap_pop() != Success)
+			return;
+		gdk_error_trap_push();
+
 		XSelectInput(gdk_display, win, attr.your_event_mask |
 			PropertyChangeMask);
+		gdk_flush();
 
 		if (gdk_error_trap_pop() != Success)
 			return;
@@ -694,6 +699,8 @@ static GdkPixbuf *get_image_for(IconWindow *win)
 		}
 	}
 
+	gdk_flush();
+
 	gdk_error_trap_pop();
 	
 	if (!retval)
diff --git a/install.sh b/install.sh
index 1bae5943..39bb0a1b 100755
--- a/install.sh
+++ b/install.sh
@@ -191,7 +191,7 @@ for DIR in $CHOICESPATH; do
   
   echo Looking for files in $DIR...
 
-  if [ -f "$DIR/MIME-icons/special_executable.xpm" ]; then
+  if [ -f "$DIR/MIME-icons/application_x-executable.png" ]; then
     REPORT=""
     echo "Found them!"
     break
-- 
2.11.4.GIT