Index: callbacks.c
===================================================================
RCS file: /cvs/gnome/gok/gok/callbacks.c,v
retrieving revision 1.45
diff -u -p -r1.45 callbacks.c
--- callbacks.c	14 Nov 2003 17:39:14 -0000	1.45
+++ callbacks.c	11 Dec 2003 10:41:47 -0000
@@ -98,47 +98,6 @@ on_window1_destroy                     (
 	SPI_event_quit ();
 }
 
-GdkFilterReturn
-gok_discard_focus_filter (GdkXEvent *xevent,
-			  GdkEvent  *event,
-			  gpointer  data)
-{
-  XEvent *xev = (XEvent *)xevent;	
-  GList *list, *l;
-  gint n_mapped;
-  GtkWindow *window;
-  gboolean has_focus;
-
-  if (xev->xany.type == ClientMessage &&
-      (Atom) xev->xclient.data.l[0] == gdk_x11_atom_to_xatom (
-	      gdk_atom_intern ("WM_TAKE_FOCUS", False)))
-    {
-      list = gtk_window_list_toplevels ();
-      n_mapped = 0;
-      has_focus = FALSE;
-      for (l = list; l; l = l->next)
-        {
-          if (GTK_WIDGET_MAPPED (GTK_WIDGET (l->data)))
-            {
-              n_mapped++;
-              window = GTK_WINDOW (l->data);
-              if (window->has_focus)
-                has_focus = TRUE;
-            }
-        }
-      if (!has_focus && n_mapped > 1)
-        XSetInputFocus (xev->xany.display, GDK_WINDOW_XID (GTK_WIDGET (window)->window), 
-			RevertToPointerRoot, CurrentTime);
-
-      g_list_free (list);
-      return GDK_FILTER_REMOVE;
-    }
-  else
-    {
-      return GDK_FILTER_CONTINUE;
-    }
-}
-
 void
 on_window1_realize                     (GtkWidget       *widget,
                                         gpointer         user_data)
@@ -188,11 +147,6 @@ on_window1_realize                     (
   gdk_window_add_filter (NULL,
 			 gok_xkb_filter,
 			 NULL);
-
-  gdk_window_add_filter (widget->window,
-			 gok_discard_focus_filter,
-			 NULL);
-
 }
 
 
Index: main.c
===================================================================
RCS file: /cvs/gnome/gok/gok/main.c,v
retrieving revision 1.125
diff -u -p -r1.125 main.c
--- main.c	19 Nov 2003 13:32:10 -0000	1.125
+++ main.c	11 Dec 2003 10:41:48 -0000
@@ -1252,6 +1252,7 @@ GtkWidget* gok_main_create_window (gbool
 				"allow_grow", TRUE,
 				"allow_shrink", TRUE,
 				"border_width", 0,
+				"accept_focus", FALSE,
 				NULL),
 			     "signal::realize", on_window1_realize, is_dock,
 			     "signal::destroy", on_window1_destroy, NULL,
