From e8877141b735074f588ae3fb080020e89e569f13 Mon Sep 17 00:00:00 2001
From: Elijah Newren <newren@src.gnome.org>
Date: Mon, 4 Oct 2004 20:43:55 +0000
Subject: [PATCH] Ooops, forgot to update the patch to account for change in
 bug 152000

---
 src/display.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/display.c b/src/display.c
index ebf3065ad..81cd81b65 100644
--- a/src/display.c
+++ b/src/display.c
@@ -1838,10 +1838,14 @@ event_callback (XEvent   *event,
           if (event->type == FocusIn &&
               event->xfocus.detail == NotifyDetailNone)
             {
+              MetaScreen * screen;
+              screen = 
+                meta_display_screen_for_root (display, event->xany.window);
+
               meta_topic (META_DEBUG_FOCUS, 
                           "Focus got set to None, probably due to brain-damage in the X protocol (see bug 125492).  Setting the default focus window.\n");
 
-              meta_workspace_focus_default_window (screen->active_workspace, NULL, meta_display_thou_shalt_return_a_timestamp (display));
+              meta_workspace_focus_default_window (screen->active_workspace, NULL, meta_display_get_current_time_roundtrip (display));
             }
         }
       break;