aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-contact-menu.c
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-03-22 01:52:10 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-03-22 05:04:13 +0800
commit4d795d822f9590c2916bfa64b4cbc3d536e3ad4a (patch)
tree2dc38065a31b54e82da388f3acf5f42ae120fccc /libempathy-gtk/empathy-contact-menu.c
parent9c4deab9ee56bd39de5f4828d774a4d1be59a7bb (diff)
downloadgsoc2013-empathy-4d795d822f9590c2916bfa64b4cbc3d536e3ad4a.tar
gsoc2013-empathy-4d795d822f9590c2916bfa64b4cbc3d536e3ad4a.tar.gz
gsoc2013-empathy-4d795d822f9590c2916bfa64b4cbc3d536e3ad4a.tar.bz2
gsoc2013-empathy-4d795d822f9590c2916bfa64b4cbc3d536e3ad4a.tar.lz
gsoc2013-empathy-4d795d822f9590c2916bfa64b4cbc3d536e3ad4a.tar.xz
gsoc2013-empathy-4d795d822f9590c2916bfa64b4cbc3d536e3ad4a.tar.zst
gsoc2013-empathy-4d795d822f9590c2916bfa64b4cbc3d536e3ad4a.zip
Also show an avatar when blocking from a conversation
https://bugzilla.gnome.org/show_bug.cgi?id=645069
Diffstat (limited to 'libempathy-gtk/empathy-contact-menu.c')
-rw-r--r--libempathy-gtk/empathy-contact-menu.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 441b69212..15f47b206 100644
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -244,6 +244,7 @@ empathy_contact_block_menu_item_toggled (GtkCheckMenuItem *item,
if (blocked) {
/* confirm the user really wishes to block the contact */
GtkWidget *parent;
+ GdkPixbuf *avatar;
/* gtk_menu_get_attach_widget () doesn't behave properly here
* for some reason */
@@ -251,8 +252,10 @@ empathy_contact_block_menu_item_toggled (GtkCheckMenuItem *item,
G_OBJECT (gtk_widget_get_parent (GTK_WIDGET (item))),
"window");
+ avatar = empathy_pixbuf_avatar_from_contact_scaled (contact, 48, 48);
+
if (!empathy_block_contact_dialog_show (GTK_WINDOW (parent),
- contact, &abusive))
+ contact, avatar, &abusive))
return;
}