From: Mikael Magnusson <mikachu@comhem.se>
Date: Sun, 27 May 2007 21:37:29 +0000 (+0000)
Subject: a missed and a failed merge
X-Git-Tag: openbox-3_3_995-RELEASE~56
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=f56a8d39b0f52a6a749273bad844ab114f8a24a7;p=dana%2Fopenbox.git

a missed and a failed merge
---

diff --git a/openbox/client.c b/openbox/client.c
index f00c737f..275742b3 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2878,7 +2878,7 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h, gint b,
     }
 
     /* if the client is shrinking, then resize the frame before the client */
-    if (send_resize_client && (w <= oldw || h <= oldh)) {
+    if (send_resize_client && (w <= oldw && h <= oldh)) {
         /* resize the plate to show the client padding color underneath */
         frame_adjust_client_area(self->frame);
 
diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 12284312..e282465e 100644
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -470,9 +470,6 @@ void focus_cycle_popup_hide()
     /* kill enter events cause by this unmapping */
     event_ignore_all_queued_enters();
 
-    /* kill enter events cause by this unmapping */
-    event_ignore_all_queued_enters();
-
     while(popup.targets) {
         ObFocusCyclePopupTarget *t = popup.targets->data;