Merge branch 'master' into next

2012-09-29 00:03:42 +02:00
parent 43d486441d 01ce4bbc92
commit 72c66a2091
2 changed files with 11 additions and 4 deletions
--- a/src/x.c
+++ b/src/x.c
@ -811,7 +811,7 @@ static void x_push_node_unmaps(Con *con) {
        }

        cookie = xcb_unmap_window(conn, con->frame);
-        DLOG("unmapping container (serial %d)\n", cookie.sequence);
+        DLOG("unmapping container %p / %s (serial %d)\n", con, con->name, cookie.sequence);
        /* we need to increase ignore_unmap for this container (if it
         * contains a window) and for every window "under" this one which
         * contains a window */