Also show an avatar when blocking from a conversation

[empathy.git] / libempathy-gtk / empathy-contact-dialogs.c

diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c
index d16062eff2e57bc7950420e8332ddbdb921833ae..29552cccc186de0f155a8065400e8c41eaaae5fe 100644 (file)
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@ -88,8 +88,8 @@ subscription_dialog_response_cb (GtkDialog *dialog,
                gboolean abusive;
 
                /* confirm the blocking */
-               if (empathy_block_contact_dialog_show (GTK_WINDOW (dialog),
-                                                      contact, &abusive)) {
+               if (empathy_block_contact_dialog_show (GTK_WINDOW (dialog), contact,
+                                                      NULL, &abusive)) {
                        empathy_contact_list_remove (
                                        EMPATHY_CONTACT_LIST (manager),
                                        contact, "");
@@ -514,6 +514,7 @@ empathy_new_contact_dialog_show_with_contact (GtkWindow *parent,
 gboolean
 empathy_block_contact_dialog_show (GtkWindow      *parent,
                                   EmpathyContact *contact,
+                                  GdkPixbuf      *avatar,
                                   gboolean       *abusive)
 {
        EmpathyContactManager *manager;
@@ -542,6 +543,12 @@ empathy_block_contact_dialog_show (GtkWindow      *parent,
                        _("_Block"), GTK_RESPONSE_REJECT,
                        NULL);
 
+       if (avatar != NULL) {
+               GtkWidget *image = gtk_image_new_from_pixbuf (avatar);
+               gtk_message_dialog_set_image (GTK_MESSAGE_DIALOG (dialog), image);
+               gtk_widget_show (image);
+       }
+
        /* ask the user if they want to also report the contact as abusive */
        if (flags & EMPATHY_CONTACT_LIST_CAN_REPORT_ABUSIVE) {
                GtkWidget *vbox;