Merge branch 'backport' into work

Conflicts:
	openbox/event.c

3 files changed, 9 insertions, 6 deletions

diff --git a/openbox/client.c b/openbox/client.c
index 5686a939..a8a15673 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -202,7 +202,7 @@ void client_manage(Window window, ObPrompt *prompt)
     gboolean transient = FALSE;
     Rect place, *monitor;
     Time launch_time, map_time;
-    gint user_time;
+    guint32 user_time;
 
     ob_debug("Managing window: 0x%lx", window);
 
@@ -3816,12 +3816,15 @@ static void client_present(ObClient *self, gboolean here, gboolean raise,
     client_focus(self);
 }
 
-/* this function exists to map to the client_activate message in the ewmh,
-   the user arg is unused because nobody uses it correctly anyway. */
+/* this function exists to map to the net_active_window message in the ewmh */
 void client_activate(ObClient *self, gboolean here, gboolean raise,
                      gboolean unshade, gboolean user)
 {
-    client_present(self, here, raise, unshade);
+    if (user || (self->desktop == DESKTOP_ALL ||
+                 self->desktop == screen_desktop))
+        client_present(self, here, raise, unshade);
+    else
+        client_hilite(self, TRUE);
 }
 
 static void client_bring_windows_recursive(ObClient *self,
diff --git a/openbox/event.c b/openbox/event.c
index 44b6eb70..30bc656f 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1344,7 +1344,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
             } else
                 ob_debug_type(OB_DEBUG_APP_BUGS,
                               "_NET_ACTIVE_WINDOW message for window %s is "
-                              "missing source indication");
+                              "missing source indication", client->title);
             client_activate(client, TRUE, TRUE, TRUE,
                             (e->xclient.data.l[0] == 0 ||
                              e->xclient.data.l[0] == 2));
diff --git a/openbox/screen.c b/openbox/screen.c
index 3b9f66ff..74d073c4 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -399,7 +399,7 @@ void screen_startup(gboolean reconfig)
                arguments, you can use %1$d for the first one and %2$d for the
                second one. For example,
                "The current session has %2$d desktops, but Openbox is configured for %1$d ..." */
-            g_warning(_("Openbox is configured for %d desktops, but the current session has %d.  Overriding the Openbox configuration."),
+            g_warning(ngettext("Openbox is configured for %d desktop, but the current session has %d.  Overriding the Openbox configuration.", "Openbox is configured for %d desktops, but the current session has %d.  Overriding the Openbox configuration.", config_desktops_num),
                       config_desktops_num, d);
         }
         screen_set_num_desktops(d);