a missed and a failed merge

diff --git a/openbox/client.c b/openbox/client.c
index f00c737f0bae8178bccb4f275109f6c298429f49..275742b3d8a39e06f28902aabe6d95476ffd30eb 100644 (file)
--- 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 12284312035c0f5cee7720ae9b164bfef3110367..e282465e4d44295d56244a1e5da2f8b3855cf9b2 100644 (file)
--- 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;