diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-03-22 01:52:10 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-03-22 01:52:10 +0800 |
| commit | 8688c876cd65d1bb058c1ed2ab18256089cf5f07 (patch) | |
| tree | 6ca1a6379430b8f32c16c3f381d548063fa0cd27 /libempathy-gtk/empathy-contact-menu.c | |
| parent | bfcad7858e75c99a2cb6fa51a5fc47c473df23dc (diff) | |
| download | gsoc2013-empathy-8688c876cd65d1bb058c1ed2ab18256089cf5f07.tar gsoc2013-empathy-8688c876cd65d1bb058c1ed2ab18256089cf5f07.tar.gz gsoc2013-empathy-8688c876cd65d1bb058c1ed2ab18256089cf5f07.tar.bz2 gsoc2013-empathy-8688c876cd65d1bb058c1ed2ab18256089cf5f07.tar.lz gsoc2013-empathy-8688c876cd65d1bb058c1ed2ab18256089cf5f07.tar.xz gsoc2013-empathy-8688c876cd65d1bb058c1ed2ab18256089cf5f07.tar.zst gsoc2013-empathy-8688c876cd65d1bb058c1ed2ab18256089cf5f07.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.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c index 9518cf494..aaf0ddf56 100644 --- a/libempathy-gtk/empathy-contact-menu.c +++ b/libempathy-gtk/empathy-contact-menu.c @@ -243,6 +243,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 */ @@ -250,8 +251,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; } |