From 811f8aeb91e0b501930359593ff6d3d3401bde3a Mon Sep 17 00:00:00 2001
From: sabetts <sabetts>
Date: Sun, 26 Aug 2001 22:10:34 +0000
Subject: raise request bug fix

---
 ChangeLog    |  3 +++
 src/events.c | 30 +++++++++++++++++-------------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 310e2ac..ab3849b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-08-26  Shawn  <sabetts@hotdog>
 
+	* src/events.c (configure_request): make sure the window is iconic
+	before notifying a raise request.
+
 	* src/split.c (num_frames): uncomment.
 	(set_active_frame): only show the frame indicator if, in addition,
 	there are more than 1 frames.
diff --git a/src/events.c b/src/events.c
index e887022..2759ae8 100644
--- a/src/events.c
+++ b/src/events.c
@@ -281,24 +281,28 @@ configure_request (XConfigureRequestEvent *e)
 	    {
 	      /* Depending on the rudeness level, actually map the
 		 window. */
-	      if ((rp_honour_transient_raise && win->transient)
-		  || (rp_honour_normal_raise && !win->transient))
+	      if (win->state == IconicState)
 		{
-		  if (win->state == IconicState)
-		    set_active_window (win);
+		  if ((rp_honour_transient_raise && win->transient)
+		      || (rp_honour_normal_raise && !win->transient))
+		    {
+		      set_active_window (win);
+		    }
+		  else 
+		    {
+		      if (win->transient)
+			marked_message_printf (0, 0, "Raise request from transient window %d (%s)", 
+					       win->number, win->name);
+		      else
+			marked_message_printf (0, 0, "Raise request from window %d (%s)",
+					       win->number, win->name);
+		    }
 		}
 	      else
 		{
-		  if (win->transient)
-		    marked_message_printf (0, 0, "Raise request from transient window %d (%s)", 
-					   win->number, win->name);
-		  else
-		    marked_message_printf (0, 0, "Raise request from window %d (%s)",
-					   win->number, win->name);
+		  if (find_windows_frame (win))
+		    goto_window (win);
 		}
-
-	      if (find_windows_frame (win))
-		goto_window (win);
 	    }
 
 	  PRINT_DEBUG("request CWStackMode %d\n", e->detail);
-- 
cgit v1.2.3