Updated Kannada translation

[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 a11627d1587a6ed6ed516776697610c38f806e2b..78a3e5ff313c326f863333879af3804464b752ac 100644 (file)
--- a/libempathy-gtk/empathy-avatar-image.c
+++ b/libempathy-gtk/empathy-avatar-image.c
@@ -22,16 +22,14 @@
  */
 
 #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 <tp-account-widgets/tpaw-pixbuf-utils.h>
 
-#include <libempathy/empathy-utils.h>
-#include "empathy-avatar-image.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 /**
  * SECTION:empathy-avatar-image
@@ -148,24 +146,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 ();
 
@@ -216,7 +212,7 @@ avatar_image_button_press_event (GtkWidget *widget, GdkEventButton *event)
                return TRUE;
        }
 
-       pixbuf = empathy_pixbuf_scale_down_if_necessary (priv->pixbuf, MAX_LARGE);
+       pixbuf = tpaw_pixbuf_scale_down_if_necessary (priv->pixbuf, MAX_LARGE);
        popup_width = gdk_pixbuf_get_width (pixbuf);
        popup_height = gdk_pixbuf_get_height (pixbuf);
 
@@ -307,7 +303,7 @@ empathy_avatar_image_set (EmpathyAvatarImage *avatar_image,
        }
 
        if (avatar) {
-               priv->pixbuf = empathy_pixbuf_from_data ((gchar *) avatar->data,
+               priv->pixbuf = tpaw_pixbuf_from_data ((gchar *) avatar->data,
                                avatar->len);
        }
 
@@ -316,7 +312,7 @@ empathy_avatar_image_set (EmpathyAvatarImage *avatar_image,
                return;
        }
 
-       scaled_pixbuf = empathy_pixbuf_scale_down_if_necessary (priv->pixbuf, MAX_SMALL);
+       scaled_pixbuf = tpaw_pixbuf_scale_down_if_necessary (priv->pixbuf, MAX_SMALL);
        gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), scaled_pixbuf);
 
        if (scaled_pixbuf != priv->pixbuf) {