aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2010-07-02 19:00:55 +0800
committerTravis Reitter <treitter@gmail.com>2010-07-21 07:12:36 +0800
commitac58a4101765c64d94c18d10c59fde7fa67ea4ae (patch)
tree81336df626e7dd0e5642bdc7259ef4435f71ae90
parent265ea7ef4abb3df7cf6d8e1c9f4c5bfe68763179 (diff)
downloadgsoc2013-empathy-ac58a4101765c64d94c18d10c59fde7fa67ea4ae.tar
gsoc2013-empathy-ac58a4101765c64d94c18d10c59fde7fa67ea4ae.tar.gz
gsoc2013-empathy-ac58a4101765c64d94c18d10c59fde7fa67ea4ae.tar.bz2
gsoc2013-empathy-ac58a4101765c64d94c18d10c59fde7fa67ea4ae.tar.lz
gsoc2013-empathy-ac58a4101765c64d94c18d10c59fde7fa67ea4ae.tar.xz
gsoc2013-empathy-ac58a4101765c64d94c18d10c59fde7fa67ea4ae.tar.zst
gsoc2013-empathy-ac58a4101765c64d94c18d10c59fde7fa67ea4ae.zip
Allow changing of individuals' aliases
-rw-r--r--libempathy-gtk/empathy-contact-widget.c9
-rw-r--r--libempathy-gtk/empathy-individual-store.c4
2 files changed, 9 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 82b638182..76271c6fc 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -1336,7 +1336,14 @@ contact_widget_entry_alias_focus_event_cb (GtkEditable *editable,
}
else
{
- empathy_contact_set_alias (information->contact, alias);
+ FolksIndividual *individual = folks_individual_from_empathy_contact (
+ information->contact);
+
+ if (individual)
+ {
+ folks_alias_set_alias (FOLKS_ALIAS (individual), alias);
+ g_object_unref (individual);
+ }
}
}
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index 0f607c59d..398ed1357 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -748,9 +748,7 @@ individual_store_add_individual_and_connect (EmpathyIndividualStore *self,
G_CALLBACK (individual_store_contact_updated_cb), self);
g_signal_connect (individual, "notify::presence-message",
G_CALLBACK (individual_store_contact_updated_cb), self);
- g_signal_connect (individual, "notify::name",
- G_CALLBACK (individual_store_contact_updated_cb), self);
- g_signal_connect (individual, "notify::avatar",
+ g_signal_connect (individual, "notify::alias",
G_CALLBACK (individual_store_contact_updated_cb), self);
g_signal_connect (individual, "notify::capabilities",
G_CALLBACK (individual_store_contact_updated_cb), self);