Blob Blame History Raw
From: dane <dane>
Date: Sat, 9 Nov 2013 17:20:49 +0000
Subject: [PATCH] 	* fvwm/events.c (HandlePropertyNotify): Disable prior
 fix suspected of causing 	problems.


diff --git a/ChangeLog b/ChangeLog
index 701477c..31fbc57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-09  Dan Espen  <despen(at)1verizon.net>
+
+	* fvwm/events.c (HandlePropertyNotify): Disable prior fix suspected of causing
+	problems.
+
 2012-04-20  Thomas Adam  <thomas@fvwm.org>
 	* configure.ac:
 	* docs/ANNOUNCE:
diff --git a/fvwm/events.c b/fvwm/events.c
index e6a1a74..a58feb1 100644
--- a/fvwm/events.c
+++ b/fvwm/events.c
@@ -3383,8 +3383,15 @@ void HandlePropertyNotify(const evh_args_t *ea)
 		 * if the icon name is NoName, set the name of the icon to be
 		 * the same as the window
 		 */
-		if (!WAS_ICON_NAME_PROVIDED(fw) || (fw->icon_name.name &&
-			(fw->icon_name.name != fw->name.name)))
+		if (!WAS_ICON_NAME_PROVIDED(fw)
+#if 0
+		    /* dje, reported as causing various dumps.
+		       I tried to debug, but so far haven't even figured out
+		       how to exercise this logic. Mov 9, 2013. */
+		    || (fw->icon_name.name &&
+			(fw->icon_name.name != fw->name.name))
+#endif
+)
 		{
 			fw->icon_name = fw->name;
 			setup_visible_name(fw, True);