merge r6766-6767 from trunk

diff --git a/openbox/event.c b/openbox/event.c
index aa082e68a8c66a187b615e2405f3a1405b1457b1..d7c723d120f1abbc1708f2ddbddf7b84305975b0 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1227,11 +1227,16 @@ static void event_handle_client(ObClient *client, XEvent *e)
                       (e->xclient.data.l[0] == 1 ? "application" :
                        (e->xclient.data.l[0] == 2 ? "user" : "INVALID"))));
             /* XXX make use of data.l[2] !? */
-            event_curtime = e->xclient.data.l[1];
-            if (event_curtime == 0)
+            if (e->xclient.data.l[0] == 1 || e->xclient.data.l[0] == 2) {
+                event_curtime = e->xclient.data.l[1];
+                if (event_curtime == 0)
+                    ob_debug_type(OB_DEBUG_APP_BUGS,
+                                  "_NET_ACTIVE_WINDOW message for window %s is"
+                                  " missing a timestamp\n", client->title);
+            } else
                 ob_debug_type(OB_DEBUG_APP_BUGS,
                               "_NET_ACTIVE_WINDOW message for window %s is "
-                              "missing a timestamp\n", client->title);
+                              "missing source indication\n");
             client_activate(client, FALSE,
                             (e->xclient.data.l[0] == 0 ||
                              e->xclient.data.l[0] == 2));

diff --git a/openbox/openbox.c b/openbox/openbox.c
index b69f2c1e41fac5d08be5544dd9bd4a31140dc0f5..76b3b53f4cd8a3f984e19a60678a478aace3c7e7 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -177,7 +177,7 @@ gint main(gint argc, gchar **argv)
 
     ob_rr_inst = RrInstanceNew(ob_display, ob_screen);
     if (ob_rr_inst == NULL)
-        ob_exit_with_error(_("Failed to initialize the render library."));
+        ob_exit_with_error(_("Failed to initialize the obrender library."));
 
     XSynchronize(ob_display, xsync);