*/
#include "config.h"
+#include "empathy-avatar-image.h"
#include <glib/gi18n-lib.h>
-#include <gdk/gdkkeysyms.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
#include <gdk/gdkx.h>
-#include <libempathy/empathy-utils.h>
-#include "empathy-avatar-image.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
/**
* SECTION:empathy-avatar-image
priv = GET_PRIV (data);
- switch (xevent->type) {
- case PropertyNotify:
+ if (xevent->type == PropertyNotify) {
atom = gdk_x11_get_xatom_by_name ("_NET_CURRENT_DESKTOP");
if (xevent->xproperty.atom == atom) {
if (priv->popup) {
priv->popup = NULL;
}
}
- break;
}
return GDK_FILTER_CONTINUE;
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, window, &attrs);
- mask |= attrs.your_event_mask;
- }
- XSelectInput (gdk_display, window, mask);
+ XGetWindowAttributes (display, window, &attrs);
+ mask |= attrs.your_event_mask;
+
+ XSelectInput (display, window, mask);
- gdk_error_trap_pop ();
+ gdk_error_trap_pop_ignored ();
gdk_window_add_filter (NULL, avatar_image_filter_func, avatar_image);
}