[empathy] Don't show the presence twice

[Guillaume Desmottes <gdesmott src gnome org>]

commit f2b53c32d44e3a670f266f542c571ff345cbfe55
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Fri Jul 15 17:27:34 2011 +1000

    Don't show the presence twice

 libempathy-gtk/empathy-contact-widget.c |    4 +++-
 libempathy-gtk/empathy-contact-widget.h |    1 +
 src/empathy-accounts-dialog.c           |    1 +
 3 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 3a08b6f..531f8e4 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -1436,8 +1436,10 @@ contact_widget_contact_update (EmpathyContactWidget *information)
 
       gtk_widget_show (information->label_alias);
       gtk_widget_show (information->widget_alias);
-      gtk_widget_show (information->hbox_presence);
       gtk_widget_show (information->widget_avatar);
+
+      gtk_widget_set_visible (information->hbox_presence,
+          !(information->flags & EMPATHY_CONTACT_WIDGET_NO_STATUS));
     }
   else
     {
diff --git a/libempathy-gtk/empathy-contact-widget.h b/libempathy-gtk/empathy-contact-widget.h
index e683b1a..2533248 100644
--- a/libempathy-gtk/empathy-contact-widget.h
+++ b/libempathy-gtk/empathy-contact-widget.h
@@ -63,6 +63,7 @@ typedef enum
   EMPATHY_CONTACT_WIDGET_NO_SET_ALIAS = 1 << 7,
   EMPATHY_CONTACT_WIDGET_SHOW_DETAILS = 1 << 8,
   EMPATHY_CONTACT_WIDGET_EDIT_DETAILS = 1 << 9,
+  EMPATHY_CONTACT_WIDGET_NO_STATUS    = 1 << 10,
 } EmpathyContactWidgetFlags;
 
 GtkWidget * empathy_contact_widget_new (EmpathyContact *contact,
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index ae312df..6c8fe1c 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -648,6 +648,7 @@ account_dialog_got_self_contact (TpConnection *conn,
   editor = empathy_contact_widget_new (contact,
       EMPATHY_CONTACT_WIDGET_EDIT_ALIAS |
       EMPATHY_CONTACT_WIDGET_EDIT_AVATAR |
+      EMPATHY_CONTACT_WIDGET_NO_STATUS |
       EMPATHY_CONTACT_WIDGET_EDIT_DETAILS);
   gtk_box_pack_start (GTK_BOX (priv->dialog_content), editor, FALSE, FALSE, 0);
   gtk_widget_show (editor);