[empathy] have EmpathyContactWidget set the account on the account chooser

[Davyd Madeley <davyd src gnome org>]

commit 234ee3923f26d46219410a4561a0516b7efaf3b3
Author: Davyd Madeley <davyd madeley id au>
Date:   Wed Feb 25 13:55:56 2009 +0900

    have EmpathyContactWidget set the account on the account chooser

 libempathy-gtk/empathy-contact-menu.c   |    1 -
 libempathy-gtk/empathy-contact-widget.c |    7 +++++++
 2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 5792903..03db5fd 100644
--- a/libempathy-gtk/empathy-contact-menu.c
+++ b/libempathy-gtk/empathy-contact-menu.c
@@ -136,7 +136,6 @@ empathy_contact_add_menu_item_activated (GtkMenuItem *item,
 		toplevel = NULL;
 	}
 
-	/* FIXME - the contact dialog doesn't set the source account right */
 	empathy_new_contact_dialog_show_with_contact (GTK_WINDOW (toplevel),
 						      contact);
 }
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index f078f52..a9a673c 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -400,6 +400,13 @@ contact_widget_set_contact (EmpathyContactWidget *information,
       information->factory = empathy_tp_contact_factory_dup_singleton (connection);
     }
 
+  /* set the selected account to be the account this contact came from */
+  if (contact && EMPATHY_IS_ACCOUNT_CHOOSER (information->widget_account)) {
+      empathy_account_chooser_set_account (
+		      EMPATHY_ACCOUNT_CHOOSER (information->widget_account),
+		      empathy_contact_get_account (contact));
+  }
+
   /* Update information for widgets */
   contact_widget_contact_update (information);
   contact_widget_groups_update (information);