--- fbxkb.c.bak	2011-09-23 22:05:02.876902303 +0400
+++ fbxkb.c	2011-09-23 22:05:44.363383880 +0400
@@ -456,7 +456,7 @@ init()
 
     ENTER;
     sym2pix  = g_hash_table_new(g_str_hash, (GEqualFunc) my_str_equal);
-    dpy = GDK_DISPLAY();
+    dpy = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
     a_XKB_RULES_NAMES = XInternAtom(dpy, "_XKB_RULES_NAMES", False);
     if (a_XKB_RULES_NAMES == None)
         ERR("_XKB_RULES_NAMES - can't get this atom\n");
@@ -536,7 +536,7 @@ Xerror_handler(Display * d, XErrorEvent
     char buf[256];
 
     ENTER;
-    XGetErrorText(GDK_DISPLAY(), ev->error_code, buf, 256);
+    XGetErrorText(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), ev->error_code, buf, 256);
     ERR( "fbxkb : X error: %s\n", buf);
     RET();
 }
--- eggtrayicon.c.bak	2011-09-23 22:14:18.839952417 +0400
+++ eggtrayicon.c	2011-09-23 22:27:41.201921138 +0400
@@ -153,7 +153,7 @@ egg_tray_icon_send_manager_message (EggT
 #if HAVE_GTK_MULTIHEAD
   display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
 #else
-  display = gdk_display;
+  display = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
 #endif
   
   gdk_error_trap_push ();
@@ -181,7 +181,7 @@ egg_tray_icon_update_manager_window (Egg
 #if HAVE_GTK_MULTIHEAD
   xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
 #else
-  xdisplay = gdk_display;
+  xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
 #endif
   
   if (icon->manager_window != None)
@@ -300,7 +300,7 @@ egg_tray_icon_new_for_screen (GdkScreen
 EggTrayIcon*
 egg_tray_icon_new (const gchar *name)
 {
-  return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (gdk_display), name);
+  return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (GDK_DISPLAY_XDISPLAY(gdk_display_get_default())), name);
 }
 
 guint
@@ -338,7 +338,7 @@ egg_tray_icon_send_message (EggTrayIcon
 #if HAVE_GTK_MULTIHEAD
       xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
 #else
-      xdisplay = gdk_display;
+      xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
 #endif
       
       ev.type = ClientMessage;