aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorDavyd Madeley <davyd@madeley.id.au>2009-02-25 12:55:56 +0800
committerDavyd Madeley <davyd@madeley.id.au>2009-07-15 18:12:16 +0800
commit234ee3923f26d46219410a4561a0516b7efaf3b3 (patch)
tree170640670f56edf21449a78a077e0392a2a5daba /libempathy-gtk
parentfa028af2e446e6246b43c887f42099d60ad6c219 (diff)
downloadgsoc2013-empathy-234ee3923f26d46219410a4561a0516b7efaf3b3.tar
gsoc2013-empathy-234ee3923f26d46219410a4561a0516b7efaf3b3.tar.gz
gsoc2013-empathy-234ee3923f26d46219410a4561a0516b7efaf3b3.tar.bz2
gsoc2013-empathy-234ee3923f26d46219410a4561a0516b7efaf3b3.tar.lz
gsoc2013-empathy-234ee3923f26d46219410a4561a0516b7efaf3b3.tar.xz
gsoc2013-empathy-234ee3923f26d46219410a4561a0516b7efaf3b3.tar.zst
gsoc2013-empathy-234ee3923f26d46219410a4561a0516b7efaf3b3.zip
have EmpathyContactWidget set the account on the account chooser
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-contact-menu.c1
-rw-r--r--libempathy-gtk/empathy-contact-widget.c7
2 files changed, 7 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-contact-menu.c b/libempathy-gtk/empathy-contact-menu.c
index 5792903c2..03db5fda1 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 f078f5248..a9a673c43 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);