From 53a5a7f37188ffaf3e050c5ad2e0852095a85c4b Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sat, 25 Dec 2010 20:47:24 +0100 Subject: Simplify filter adding code by just using gdk_x11 functions instead of hoops --- libempathy-gtk/empathy-avatar-image.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c index a11627d15..3fb79692c 100644 --- a/libempathy-gtk/empathy-avatar-image.c +++ b/libempathy-gtk/empathy-avatar-image.c @@ -148,24 +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_x11_window_lookup_for_display (gdk_display_get_default (), - 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 (); -- cgit v1.2.3