Move should_create_salut_account to local-xmpp-assistant-widget

[empathy.git] / libempathy-gtk / empathy-avatar-image.c

diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c
index a8041d2bad153e74edf0a8bc57b91f9f75335687..3fb79692c333405f94361e80156dfa08b4263240 100644 (file)
--- a/libempathy-gtk/empathy-avatar-image.c
+++ b/libempathy-gtk/empathy-avatar-image.c
@@ -148,23 +148,22 @@ avatar_image_filter_func (GdkXEvent  *gdkxevent,
 static void
 avatar_image_add_filter (EmpathyAvatarImage *avatar_image)
 {
+       Display    *display;
        Window     window;
-       GdkWindow *gdkwindow;
        gint       mask;
+       XWindowAttributes attrs;
 
        mask = PropertyChangeMask;
 
-       window = GDK_ROOT_WINDOW ();
-       gdkwindow = gdk_xid_table_lookup (window);
+       window = gdk_x11_get_default_root_xwindow ();
+       display = gdk_x11_get_default_xdisplay ();
 
        gdk_error_trap_push ();
-       if (gdkwindow) {
-               XWindowAttributes attrs;
-               XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), window, &attrs);
-               mask |= attrs.your_event_mask;
-       }
 
-       XSelectInput (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), window, mask);
+       XGetWindowAttributes (display, window, &attrs);
+       mask |= attrs.your_event_mask;
+
+       XSelectInput (display, window, mask);
 
        gdk_error_trap_pop_ignored ();