Merge branch 'sasl'

[empathy.git] / libempathy-gtk / empathy-ui-utils.c

diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 4014f92b59020b81a70e94d12169bd81c76ba01a..4c128742405b72274640e1b50b70b986c9594de2 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -231,7 +231,8 @@ empathy_icon_name_for_individual (FolksIndividual *individual)
        FolksPresenceType folks_presence;
        TpConnectionPresenceType presence;
 
-       folks_presence = folks_individual_get_presence_type (individual);
+       folks_presence =
+           folks_presence_get_presence_type (FOLKS_PRESENCE (individual));
        presence = empathy_folks_presence_type_to_tp (folks_presence);
 
        return empathy_icon_name_for_presence (presence);
@@ -603,7 +604,7 @@ avatar_file_load_contents_cb (GObject      *object,
        }
 
        g_simple_async_result_set_op_res_gpointer (closure->result,
-                       avatar_pixbuf_from_loader (loader), NULL);
+                       avatar_pixbuf_from_loader (loader), g_object_unref);
 
 out:
        g_simple_async_result_complete (closure->result);
@@ -653,6 +654,7 @@ out:
        g_object_unref (result);
 }
 
+/* Return a ref on the GdkPixbuf */
 GdkPixbuf *
 empathy_pixbuf_avatar_from_individual_scaled_finish (
                FolksIndividual *individual,
@@ -661,6 +663,7 @@ empathy_pixbuf_avatar_from_individual_scaled_finish (
 {
        GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
        gboolean result_valid;
+       GdkPixbuf *pixbuf;
 
        g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
        g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (simple), NULL);
@@ -673,7 +676,8 @@ empathy_pixbuf_avatar_from_individual_scaled_finish (
                        empathy_pixbuf_avatar_from_individual_scaled_async);
        g_return_val_if_fail (result_valid, NULL);
 
-       return g_simple_async_result_get_op_res_gpointer (simple);
+       pixbuf = g_simple_async_result_get_op_res_gpointer (simple);
+       return pixbuf != NULL ? g_object_ref (pixbuf) : NULL;
 }
 
 GdkPixbuf *
@@ -1560,7 +1564,7 @@ empathy_window_iconify (GtkWindow *window, GtkStatusIcon *status_icon)
 
        gtk_status_icon_get_geometry (status_icon, NULL, &icon_location, NULL);
        gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
-       dpy = gdk_x11_drawable_get_xdisplay (gdk_window);
+       dpy = GDK_WINDOW_XDISPLAY (gdk_window);
 
        data[0] = icon_location.x;
        data[1] = icon_location.y;
@@ -1570,7 +1574,7 @@ empathy_window_iconify (GtkWindow *window, GtkStatusIcon *status_icon)
        XChangeProperty (dpy,
                         GDK_WINDOW_XID (gdk_window),
                         gdk_x11_get_xatom_by_name_for_display (
-                               gdk_drawable_get_display (gdk_window),
+                               gdk_window_get_display (gdk_window),
                         "_NET_WM_ICON_GEOMETRY"),
                         XA_CARDINAL, 32, PropModeReplace,
                         (guchar *)&data, 4);