aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--empathy.doap1
-rw-r--r--libempathy-gtk/empathy-contact-widget.c7
2 files changed, 6 insertions, 2 deletions
diff --git a/empathy.doap b/empathy.doap
index 7b5e75642..acd6494bc 100644
--- a/empathy.doap
+++ b/empathy.doap
@@ -6,6 +6,7 @@
xmlns="http://usefulinc.com/ns/doap#">
<name xml:lang="en">Empathy Instant Messenger</name>
<shortdesc xml:lang="en">Send and receive instant messages</shortdesc>
+ <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
<homepage rdf:resource="http://live.gnome.org/Empathy" />
<mailing-list rdf:resource="http://lists.freedesktop.org/mailman/listinfo/telepathy" />
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index c78aafeaa..0821066fa 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -234,7 +234,11 @@ empathy_contact_widget_new (EmpathyContact *contact,
contact_widget_client_setup (information);
if (contact != NULL)
- contact_widget_set_contact (information, contact);
+ contact_widget_set_contact (information, contact);
+
+ else if (information->flags & EMPATHY_CONTACT_WIDGET_EDIT_ACCOUNT ||
+ information->flags & EMPATHY_CONTACT_WIDGET_EDIT_ID)
+ contact_widget_change_contact (information);
return empathy_builder_unref_and_keep_widget (gui,
information->vbox_contact_widget);
@@ -561,7 +565,6 @@ contact_widget_contact_setup (EmpathyContactWidget *information)
{
information->widget_account = empathy_account_chooser_new ();
- contact_widget_change_contact (information);
g_signal_connect_swapped (information->widget_account, "changed",
G_CALLBACK (contact_widget_change_contact),
information);