no \n in g_messages

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index dfc7034838dd9ec4b485522c0d804a28a7b55f0a..3100993b2747c909e865b3147e84cd9d92adc502 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -121,6 +121,7 @@ void client_manage(Window window)
     XWindowAttributes attrib;
     XSetWindowAttributes attrib_set;
 /*    XWMHints *wmhint; */
+    guint i;
 
     grab_server(TRUE);
 
@@ -187,6 +188,15 @@ void client_manage(Window window)
     stacking_list = g_list_append(stacking_list, client);
     g_hash_table_insert(client_map, (gpointer)window, client);
 
+    /* update the focus lists */
+    if (client->desktop == DESKTOP_ALL) {
+        for (i = 0; i < screen_num_desktops; ++i)
+            focus_order[i] = g_list_append(focus_order[i], client);
+    } else {
+        i = client->desktop;
+        focus_order[i] = g_list_append(focus_order[i], client);
+    }
+
     stacking_raise(client);
 
     screen_update_struts();
@@ -197,9 +207,6 @@ void client_manage(Window window)
 
     dispatch_client(Event_Client_Mapped, client, 0, 0);
 
-    /* grab all mouse bindings */
-    /*pointer_grab_all(client, TRUE);XXX*/
-
     /* update the list hints */
     client_set_list();
 
@@ -228,9 +235,6 @@ void client_unmanage(Client *client)
     /* we dont want events no more */
     XSelectInput(ob_display, client->window, NoEventMask);
 
-    /* ungrab any mouse bindings */
-    /*pointer_grab_all(client, FALSE);XXX*/
-     
     engine_frame_hide(client->frame);
 
     /* give the client its border back */
@@ -1461,7 +1465,7 @@ void client_iconify(Client *self, gboolean iconic, gboolean curdesk)
 {
     if (self->iconic == iconic) return; /* nothing to do */
 
-    g_message("%sconifying window: 0x%lx\n", (iconic ? "I" : "Uni"),
+    g_message("%sconifying window: 0x%lx", (iconic ? "I" : "Uni"),
              self->window);
 
     self->iconic = iconic;