add a comparitor to timers. use this in event.c to let you remove timers from the...

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index 3fd8b22a69e06bf01e59bbe450295f56d7850e71..052f12df8d44e33613c0b52494d58411974deead 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -238,28 +238,18 @@ void frame_show(ObFrame *self)
         self->visible = TRUE;
         XMapWindow(ob_display, self->client->window);
         XMapWindow(ob_display, self->window);
-        self->firstmap = TRUE;
     }
 }
 
 void frame_hide(ObFrame *self)
 {
-    if (self->visible || self->firstmap == FALSE) {
-        if (self->visible) {
-            self->visible = FALSE;
-            self->client->ignore_unmaps += 2;
-            /* we unmap the client itself so that we can get MapRequest
-               events, and because the ICCCM tells us to! */
-            XUnmapWindow(ob_display, self->window);
-            XUnmapWindow(ob_display, self->client->window);
-        } else {
-            /* the frame wasn't visible, but the frame is being hidden now.
-               so we don't need to unmap the frame, but we do need to unmap
-               the client. */
-            self->client->ignore_unmaps += 1;
-            XUnmapWindow(ob_display, self->client->window);
-        }
-        self->firstmap = TRUE;
+    if (self->visible) {
+        self->visible = FALSE;
+        self->client->ignore_unmaps += 1;
+        /* we unmap the client itself so that we can get MapRequest
+           events, and because the ICCCM tells us to! */
+        XUnmapWindow(ob_display, self->window);
+        XUnmapWindow(ob_display, self->client->window);
     }
 }
 
@@ -987,6 +977,7 @@ void frame_flash_start(ObFrame *self)
                                  G_USEC_PER_SEC * 0.6,
                                  flash_timeout,
                                  self,
+                                 g_direct_equal,
                                  flash_done);
     g_get_current_time(&self->flash_end);
     g_time_val_add(&self->flash_end, G_USEC_PER_SEC * 5);