Merge branch 'backport' into work

Conflicts:
	openbox/event.c

diff --cc openbox/client.c
index 5686a93969b979f321b8f086b20f566fbf7979bb,03bbfe48e0d3934c4c61b164e7ad1da212b05c58..a8a15673f8e372bfe97ff15084c8719efa985d60
--- 1/openbox/client.c
--- 2/openbox/client.c
+++ b/openbox/client.c
@@@ -202,9 -247,44 +202,9 @@@ void client_manage(Window window, ObPro
      gboolean transient = FALSE;
      Rect place, *monitor;
      Time launch_time, map_time;
-     gint user_time;
+     guint32 user_time;
  
 -    grab_server(TRUE);
 -
 -    /* check if it has already been unmapped by the time we started
 -       mapping. the grab does a sync so we don't have to here */
 -    if (XCheckTypedWindowEvent(ob_display, window, DestroyNotify, &e) ||
 -        XCheckTypedWindowEvent(ob_display, window, UnmapNotify, &e))
 -    {
 -        XPutBackEvent(ob_display, &e);
 -
 -        ob_debug("Trying to manage unmapped window. Aborting that.\n");
 -        grab_server(FALSE);
 -        return; /* don't manage it */
 -    }
 -
 -    /* make sure it isn't an override-redirect window */
 -    if (!XGetWindowAttributes(ob_display, window, &attrib) ||
 -        attrib.override_redirect)
 -    {
 -        grab_server(FALSE);
 -        return; /* don't manage it */
 -    }
 -
 -    /* is the window a docking app */
 -    if ((wmhint = XGetWMHints(ob_display, window))) {
 -        if ((wmhint->flags & StateHint) &&
 -            wmhint->initial_state == WithdrawnState)
 -        {
 -            dock_add(window, wmhint);
 -            grab_server(FALSE);
 -            XFree(wmhint);
 -            return;
 -        }
 -        XFree(wmhint);
 -    }
 -
 -    ob_debug("Managing window: 0x%lx\n", window);
 +    ob_debug("Managing window: 0x%lx", window);
  
      map_time = event_get_server_time();
  

diff --cc openbox/event.c
index 44b6eb706c48d544289e6e4772dffdb09785379c,467af11c104a2d96c23845973dd4687e17205e38..30bc656fbfb641724746a47ec6d655bb970a04c2
--- 1/openbox/event.c
--- 2/openbox/event.c
+++ b/openbox/event.c
@@@ -1344,7 -1334,7 +1344,7 @@@ static void event_handle_client(ObClien
              } else
                  ob_debug_type(OB_DEBUG_APP_BUGS,
                                "_NET_ACTIVE_WINDOW message for window %s is "
-                               "missing source indication");
 -                              "missing source indication\n", client->title);
++                              "missing source indication", client->title);
              client_activate(client, TRUE, TRUE, TRUE,
                              (e->xclient.data.l[0] == 0 ||
                               e->xclient.data.l[0] == 2));

diff --cc openbox/screen.c
Simple merge