From: Dana Jansens <danakj@orodu.net>
Date: Tue, 22 May 2007 20:51:37 +0000 (+0000)
Subject: merge r6766-6767 from trunk
X-Git-Tag: openbox-3_3_992-RELEASE~4
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=de81508299bbd1eff15a7edd12fee13f4d7a2e3c;p=dana%2Fopenbox.git

merge r6766-6767 from trunk
---

diff --git a/openbox/event.c b/openbox/event.c
index aa082e68..d7c723d1 100644
--- 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 b69f2c1e..76b3b53f 100644
--- 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);