summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@src.gnome.org>2004-10-04 20:43:55 +0000
committerElijah Newren <newren@src.gnome.org>2004-10-04 20:43:55 +0000
commite8877141b735074f588ae3fb080020e89e569f13 (patch)
treeee17ca5d74b359c68504afd3eff6c147459311c9
parent546fe7b5b301138af8e2fc252666c0545c933f38 (diff)
downloadmetacity-e8877141b735074f588ae3fb080020e89e569f13.tar.gz
Ooops, forgot to update the patch to account for change in bug 152000
-rw-r--r--src/display.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/display.c b/src/display.c
index ebf3065a..81cd81b6 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;