Created attachment 183673 [details] [review]
show the avatar for the blocked user

http://git.collabora.co.uk/?p=user/pochu/empathy.git;a=shortlog;h=refs/heads/block-avatar-645069

Review of attachment 183673 [details] [review]:

Looks pretty good, but you forgot empathy-contact-dialogs.

Personally though I'd like take the remove dialog, and nuke it from orbit. I feel like it could be better implemented, and wrap all of these bits and pieces up inside itself.

::: libempathy-gtk/empathy-individual-view.c
@@ +2247,3 @@
       GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", message);
 
+  if (avatar)

Be explicit. avatar != NULL

(In reply to comment #2)
> Review of attachment 183673 [details] [review]:
> 
> Looks pretty good, but you forgot empathy-contact-dialogs.

I've left out that for now because for incoming authorization requests, the contact is not on your contact list yet, and displaying their photo right away may not be such a good idea.

> Personally though I'd like take the remove dialog, and nuke it from orbit. I
> feel like it could be better implemented, and wrap all of these bits and pieces
> up inside itself.

Not sure what you mean here...

> 
> ::: libempathy-gtk/empathy-individual-view.c
> @@ +2247,3 @@
>        GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", message);
> 
> +  if (avatar)
> 
> Be explicit. avatar != NULL

Fixed.

Pushed to master and gnome-2-34.

I forgot empathy_block_contact_dialog_show, which you get from a conversation (contact->block) or from an incoming authorization request (here we don't want to show the avatar in case it's offensive).

http://git.collabora.co.uk/?p=user/pochu/empathy.git;a=shortlog;h=refs/heads/block-avatar-645069

Merged to gnome-2-34 and master.