Allow changing of individuals' aliases

diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 82b6381828d5a8fd6931423f79d8c4f719123a16..76271c6fc8294218d575fe7417e2ef563bc1e19f 100644 (file)
--- 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 0f607c59dfd07863d6da6b08190858b1f6e94667..398ed13571487aa4e2e6dc84728607edd67153e8 100644 (file)
--- 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);