Attachment #287547 for bug #221909

Lines 456-462 init() Link Here

(-)fbxkb.c.bak (-2 / +2 lines)
456		456
457	ENTER;	457	ENTER;
458	sym2pix = g_hash_table_new(g_str_hash, (GEqualFunc) my_str_equal);	458	sym2pix = g_hash_table_new(g_str_hash, (GEqualFunc) my_str_equal);
459	dpy = GDK_DISPLAY();	459	dpy = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
460	a_XKB_RULES_NAMES = XInternAtom(dpy, "_XKB_RULES_NAMES", False);	460	a_XKB_RULES_NAMES = XInternAtom(dpy, "_XKB_RULES_NAMES", False);
461	if (a_XKB_RULES_NAMES == None)	461	if (a_XKB_RULES_NAMES == None)
462	ERR("_XKB_RULES_NAMES - can't get this atom\n");	462	ERR("_XKB_RULES_NAMES - can't get this atom\n");
Lines 536-542 Xerror_handler(Display * d, XErrorEvent Link Here
536	char buf[256];	536	char buf[256];
537		537
538	ENTER;	538	ENTER;
539	XGetErrorText(GDK_DISPLAY(), ev->error_code, buf, 256);	539	XGetErrorText(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), ev->error_code, buf, 256);
540	ERR( "fbxkb : X error: %s\n", buf);	540	ERR( "fbxkb : X error: %s\n", buf);
541	RET();	541	RET();
542	}	542	}




#if HAVE_GTK_MULTIHEAD
  display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
#else
  display = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
#endif
  
  gdk_error_trap_push ();

#if HAVE_GTK_MULTIHEAD
  xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
#else
  xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
#endif
  
  if (icon->manager_window != None)

EggTrayIcon*
egg_tray_icon_new (const gchar *name)
{
  return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (GDK_DISPLAY_XDISPLAY(gdk_display_get_default())), name);
}

guint

#if HAVE_GTK_MULTIHEAD
      xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
#else
      xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
#endif
      
      ev.type = ClientMessage;

Return to bug 221909

Lines 153-159 egg_tray_icon_send_manager_message (EggT Link Here

(-)eggtrayicon.c.bak (-4 / +4 lines)
153	#if HAVE_GTK_MULTIHEAD	153	#if HAVE_GTK_MULTIHEAD
154	display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));	154	display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
155	#else	155	#else
156	display = gdk_display;	156	display = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
157	#endif	157	#endif
158		158
159	gdk_error_trap_push ();	159	gdk_error_trap_push ();
Lines 181-187 egg_tray_icon_update_manager_window (Egg Link Here
181	#if HAVE_GTK_MULTIHEAD	181	#if HAVE_GTK_MULTIHEAD
182	xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));	182	xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
183	#else	183	#else
184	xdisplay = gdk_display;	184	xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
185	#endif	185	#endif
186		186
187	if (icon->manager_window != None)	187	if (icon->manager_window != None)
Lines 300-306 egg_tray_icon_new_for_screen (GdkScreen Link Here
300	EggTrayIcon*	300	EggTrayIcon*
301	egg_tray_icon_new (const gchar *name)	301	egg_tray_icon_new (const gchar *name)
302	{	302	{
303	return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (gdk_display), name);	303	return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (GDK_DISPLAY_XDISPLAY(gdk_display_get_default())), name);
304	}	304	}
305		305
306	guint	306	guint
Lines 338-344 egg_tray_icon_send_message (EggTrayIcon Link Here
338	#if HAVE_GTK_MULTIHEAD	338	#if HAVE_GTK_MULTIHEAD
339	xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));	339	xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
340	#else	340	#else
341	xdisplay = gdk_display;	341	xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
342	#endif	342	#endif
343		343
344	ev.type = ClientMessage;	344	ev.type = ClientMessage;