diff options
Diffstat (limited to 'eggtrayicon.c')
| -rw-r--r-- | eggtrayicon.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/eggtrayicon.c b/eggtrayicon.c index abdd69c..1a6dcca 100644 --- a/eggtrayicon.c +++ b/eggtrayicon.c @@ -111,7 +111,7 @@ egg_tray_icon_unrealize (GtkWidget *widget) gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget), icon->manager_window); #else - gdkwin = gdk_x11_window_lookup_for_display (gdk_display_get_default(), icon->manager_window); + gdkwin = gdk_window_lookup (icon->manager_window); #endif gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon); @@ -120,7 +120,7 @@ egg_tray_icon_unrealize (GtkWidget *widget) #if HAVE_GTK_MULTIHEAD root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget)); #else - root_window = gdk_x11_window_lookup_for_display (gdk_display_get_default(), gdk_x11_get_default_root_xwindow ()); + root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ()); #endif gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter, icon); @@ -153,7 +153,7 @@ egg_tray_icon_send_manager_message (EggTrayIcon *icon, #if HAVE_GTK_MULTIHEAD display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); #else - display = gdk_x11_get_default_xdisplay(); + display = gdk_display; #endif gdk_error_trap_push (); @@ -181,7 +181,7 @@ egg_tray_icon_update_manager_window (EggTrayIcon *icon) #if HAVE_GTK_MULTIHEAD xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); #else - xdisplay = gdk_x11_get_default_xdisplay(); + xdisplay = gdk_display; #endif if (icon->manager_window != None) @@ -192,7 +192,7 @@ egg_tray_icon_update_manager_window (EggTrayIcon *icon) gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), icon->manager_window); #else - gdkwin = gdk_x11_window_lookup_for_display (gdk_display_get_default(), icon->manager_window); + gdkwin = gdk_window_lookup (icon->manager_window); #endif gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon); @@ -218,7 +218,7 @@ egg_tray_icon_update_manager_window (EggTrayIcon *icon) gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), icon->manager_window); #else - gdkwin = gdk_x11_window_lookup_for_display (gdk_display_get_default(), icon->manager_window); + gdkwin = gdk_window_lookup (icon->manager_window); #endif gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon); @@ -274,7 +274,7 @@ egg_tray_icon_new_for_xscreen (Screen *xscreen, const char *name) #if HAVE_GTK_MULTIHEAD root_window = gdk_screen_get_root_window (gtk_widget_get_screen (screen)); #else - root_window = gdk_x11_window_lookup_for_display (gdk_display_get_default(), gdk_x11_get_default_root_xwindow ()); + root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ()); #endif /* Add a root window filter so that we get changes on MANAGER */ @@ -300,7 +300,7 @@ egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name) EggTrayIcon* egg_tray_icon_new (const gchar *name) { - return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (gdk_x11_get_default_xdisplay()), name); + return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (gdk_display), name); } guint @@ -338,7 +338,7 @@ egg_tray_icon_send_message (EggTrayIcon *icon, #if HAVE_GTK_MULTIHEAD xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon))); #else - xdisplay = gdk_x11_get_default_xdisplay(); + xdisplay = gdk_display; #endif ev.type = ClientMessage; |