Merge EmpathyContact:name and *_set_alias() to EmpathyContact:alias

The "name" API was a relic of Gossip.

10 files changed, 37 insertions, 37 deletions

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index edb132936..5d8fe71d3 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -1119,7 +1119,7 @@ chat_message_received (EmpathyChat *chat, EmpathyMessage *message)
 	sender = empathy_message_get_sender (message);
 
 	DEBUG ("Appending new message from %s (%d)",
-		empathy_contact_get_name (sender),
+		empathy_contact_get_alias (sender),
 		empathy_contact_get_handle (sender));
 
 	empathy_chat_view_append_message (chat->view, message);
@@ -1600,7 +1600,7 @@ chat_input_key_press_event_cb (GtkWidget   *widget,
 				 * which might be cased all wrong.
 				 * Fixes #120876
 				 * */
-				text = empathy_contact_get_name (completed_list->data);
+				text = empathy_contact_get_alias (completed_list->data);
 			} else {
 				text = completed;
 
@@ -1610,7 +1610,7 @@ chat_input_key_press_event_cb (GtkWidget   *widget,
 				 * */
 				 message = g_string_new ("");
 				 for (l = completed_list; l != NULL; l = l->next) {
-					g_string_append (message, empathy_contact_get_name (l->data));
+					g_string_append (message, empathy_contact_get_alias (l->data));
 					g_string_append (message, " - ");
 				 }
 				 empathy_chat_view_append_event (chat->view, message->str);
@@ -2057,7 +2057,7 @@ build_part_message (guint           reason,
 	const gchar *actor_name = NULL;
 
 	if (actor != NULL) {
-		actor_name = empathy_contact_get_name (actor);
+		actor_name = empathy_contact_get_alias (actor);
 	}
 
 	/* Having an actor only really makes sense for a few actions... */
@@ -2113,7 +2113,7 @@ chat_members_changed_cb (EmpathyTpChat  *tp_chat,
 			 EmpathyChat    *chat)
 {
 	EmpathyChatPriv *priv = GET_PRIV (chat);
-	const gchar *name = empathy_contact_get_name (contact);
+	const gchar *name = empathy_contact_get_alias (contact);
 	gchar *str;
 
 	g_return_if_fail (TP_CHANNEL_GROUP_CHANGE_REASON_RENAMED != reason);
@@ -2148,8 +2148,8 @@ chat_member_renamed_cb (EmpathyTpChat  *tp_chat,
 		gchar *str;
 
 		str = g_strdup_printf (_("%s is now known as %s"),
-				       empathy_contact_get_name (old_contact),
-				       empathy_contact_get_name (new_contact));
+				       empathy_contact_get_alias (old_contact),
+				       empathy_contact_get_alias (new_contact));
 		empathy_chat_view_append_event (chat->view, str);
 		g_free (str);
 	}
@@ -2817,7 +2817,7 @@ empathy_chat_init (EmpathyChat *chat)
 		g_timeout_add_seconds (1, chat_block_events_timeout_cb, chat);
 
 	/* Add nick name completion */
-	priv->completion = g_completion_new ((GCompletionFunc) empathy_contact_get_name);
+	priv->completion = g_completion_new ((GCompletionFunc) empathy_contact_get_alias);
 	g_completion_set_compare (priv->completion, chat_contacts_completion_func);
 
 	chat_create_ui (chat);
@@ -3118,7 +3118,7 @@ empathy_chat_get_name (EmpathyChat *chat)
 
 	ret = priv->name;
 	if (!ret && priv->remote_contact) {
-		ret = empathy_contact_get_name (priv->remote_contact);
+		ret = empathy_contact_get_alias (priv->remote_contact);
 	}
 
 	if (!ret)
diff --git a/libempathy-gtk/empathy-contact-dialogs.c b/libempathy-gtk/empathy-contact-dialogs.c
index b359b86cd..003710b03 100644
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@ -181,7 +181,7 @@ empathy_contact_information_dialog_show (EmpathyContact *contact,
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 	gtk_window_set_title (GTK_WINDOW (dialog),
-		empathy_contact_get_name (contact));
+		empathy_contact_get_alias (contact));
 
 	/* Close button */
 	button = gtk_button_new_with_label (GTK_STOCK_CLOSE);
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index de838441f..a7a5beca9 100644
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -982,7 +982,7 @@ add_contact_to_store (GtkTreeStore *store,
 		      EmpathyContactListFlags flags)
 {
 	gtk_tree_store_insert_with_values (store, iter, parent, 0,
-			    EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_name (contact),
+			    EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_alias (contact),
 			    EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, contact,
 			    EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, FALSE,
 			    EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
@@ -1009,7 +1009,7 @@ contact_list_store_add_contact (EmpathyContactListStore *store,
 
 	priv = GET_PRIV (store);
 
-	if (EMP_STR_EMPTY (empathy_contact_get_name (contact)) ||
+	if (EMP_STR_EMPTY (empathy_contact_get_alias (contact)) ||
 	    (!priv->show_offline && !empathy_contact_is_online (contact))) {
 		return;
 	}
@@ -1155,7 +1155,7 @@ contact_list_store_contact_update (EmpathyContactListStore *store,
 	if (!in_list && !should_be_in_list) {
 		/* Nothing to do. */
 		DEBUG ("Contact:'%s' in list:NO, should be:NO",
-			empathy_contact_get_name (contact));
+			empathy_contact_get_alias (contact));
 
 		g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL);
 		g_list_free (iters);
@@ -1163,7 +1163,7 @@ contact_list_store_contact_update (EmpathyContactListStore *store,
 	}
 	else if (in_list && !should_be_in_list) {
 		DEBUG ("Contact:'%s' in list:YES, should be:NO",
-			empathy_contact_get_name (contact));
+			empathy_contact_get_alias (contact));
 
 		if (priv->show_active) {
 			do_remove = TRUE;
@@ -1179,7 +1179,7 @@ contact_list_store_contact_update (EmpathyContactListStore *store,
 	}
 	else if (!in_list && should_be_in_list) {
 		DEBUG ("Contact:'%s' in list:NO, should be:YES",
-			empathy_contact_get_name (contact));
+			empathy_contact_get_alias (contact));
 
 		contact_list_store_add_contact (store, contact);
 
@@ -1190,7 +1190,7 @@ contact_list_store_contact_update (EmpathyContactListStore *store,
 		}
 	} else {
 		DEBUG ("Contact:'%s' in list:YES, should be:YES",
-			empathy_contact_get_name (contact));
+			empathy_contact_get_alias (contact));
 
 		/* Get online state before. */
 		if (iters && g_list_length (iters) > 0) {
@@ -1230,7 +1230,7 @@ contact_list_store_contact_update (EmpathyContactListStore *store,
 				    EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, pixbuf_status,
 				    EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR, pixbuf_avatar,
 				    EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR_VISIBLE, show_avatar,
-				    EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_name (contact),
+				    EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_alias (contact),
 				    EMPATHY_CONTACT_LIST_STORE_COL_PRESENCE_TYPE,
 				      empathy_contact_get_presence (contact),
 				    EMPATHY_CONTACT_LIST_STORE_COL_STATUS,
@@ -1278,7 +1278,7 @@ contact_list_store_contact_updated_cb (EmpathyContact          *contact,
 				       EmpathyContactListStore *store)
 {
 	DEBUG ("Contact:'%s' updated, checking roster is in sync...",
-		empathy_contact_get_name (contact));
+		empathy_contact_get_alias (contact));
 
 	contact_list_store_contact_update (store, contact);
 }
@@ -1326,7 +1326,7 @@ contact_list_store_contact_active_new (EmpathyContactListStore *store,
 	ShowActiveData *data;
 
 	DEBUG ("Contact:'%s' now active, and %s be removed",
-		empathy_contact_get_name (contact),
+		empathy_contact_get_alias (contact),
 		remove_ ? "WILL" : "WILL NOT");
 
 	data = g_slice_new0 (ShowActiveData);
@@ -1358,12 +1358,12 @@ contact_list_store_contact_active_cb (ShowActiveData *data)
 	    !priv->show_offline &&
 	    !empathy_contact_is_online (data->contact)) {
 		DEBUG ("Contact:'%s' active timeout, removing item",
-			empathy_contact_get_name (data->contact));
+			empathy_contact_get_alias (data->contact));
 		contact_list_store_remove_contact (data->store, data->contact);
 	}
 
 	DEBUG ("Contact:'%s' no longer active",
-		empathy_contact_get_name (data->contact));
+		empathy_contact_get_alias (data->contact));
 
 	contact_list_store_contact_set_active (data->store,
 					       data->contact,
@@ -1574,8 +1574,8 @@ contact_list_store_contact_sort (EmpathyContact *contact_a,
 	g_return_val_if_fail (contact_a != NULL || contact_b != NULL, 0);
 
 	/* alias */
-	ret_val = g_utf8_collate (empathy_contact_get_name (contact_a),
-				  empathy_contact_get_name (contact_b));
+	ret_val = g_utf8_collate (empathy_contact_get_alias (contact_a),
+				  empathy_contact_get_alias (contact_b));
 
 	if (ret_val != 0)
 		goto out;
diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index 0e7c227d9..5860adef8 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -152,7 +152,7 @@ contact_list_view_is_visible_contact (EmpathyContactListView *self,
 	g_assert (live != NULL);
 
 	/* check alias name */
-	str = empathy_contact_get_name (contact);
+	str = empathy_contact_get_alias (contact);
 	if (empathy_live_search_match (live, str))
 		return TRUE;
 
@@ -2063,7 +2063,7 @@ contact_list_view_remove_activate_cb (GtkMenuItem            *menuitem,
 
 		parent = empathy_get_toplevel_window (GTK_WIDGET (view));
 		text = g_strdup_printf (_("Do you really want to remove the contact '%s'?"),
-					empathy_contact_get_name (contact));
+					empathy_contact_get_alias (contact));
 		if (contact_list_view_remove_dialog_show (parent, _("Removing contact"), text)) {
 			EmpathyContactList *list;
 
diff --git a/libempathy-gtk/empathy-contact-selector-dialog.c b/libempathy-gtk/empathy-contact-selector-dialog.c
index c09b25cef..b04e56daa 100644
--- a/libempathy-gtk/empathy-contact-selector-dialog.c
+++ b/libempathy-gtk/empathy-contact-selector-dialog.c
@@ -135,16 +135,16 @@ contact_selector_dialog_account_changed_cb (GtkWidget *widget,
 
       DEBUG ("Adding contact ID %s, Name %s",
              empathy_contact_get_id (contact),
-             empathy_contact_get_name (contact));
+             empathy_contact_get_alias (contact));
 
       tmpstr = g_strdup_printf ("%s (%s)",
-        empathy_contact_get_name (contact),
+        empathy_contact_get_alias (contact),
         empathy_contact_get_id (contact));
 
       gtk_list_store_insert_with_values (priv->store, &iter, -1,
         COMPLETION_COL_TEXT, tmpstr,
         COMPLETION_COL_ID, empathy_contact_get_id (contact),
-        COMPLETION_COL_NAME, empathy_contact_get_name (contact),
+        COMPLETION_COL_NAME, empathy_contact_get_alias (contact),
         -1);
 
       g_free (tmpstr);
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 0da9e0091..77d22c915 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -1086,7 +1086,7 @@ contact_widget_location_update (EmpathyContactWidget *information)
       champlain_view_add_layer (information->map_view, layer);
 
       marker = champlain_marker_new_with_text (
-          empathy_contact_get_name (information->contact), NULL, NULL, NULL);
+          empathy_contact_get_alias (information->contact), NULL, NULL, NULL);
       champlain_base_marker_set_position (CHAMPLAIN_BASE_MARKER (marker), lat, lon);
       clutter_container_add (CLUTTER_CONTAINER (layer), marker, NULL);
 
@@ -1378,10 +1378,10 @@ contact_widget_name_notify_cb (EmpathyContactWidget *information)
 {
   if (GTK_IS_ENTRY (information->widget_alias))
       gtk_entry_set_text (GTK_ENTRY (information->widget_alias),
-          empathy_contact_get_name (information->contact));
+          empathy_contact_get_alias (information->contact));
   else
       gtk_label_set_label (GTK_LABEL (information->widget_alias),
-          empathy_contact_get_name (information->contact));
+          empathy_contact_get_alias (information->contact));
 }
 
 static void
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index c2267f767..53c78c18a 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -461,7 +461,7 @@ theme_adium_append_message (EmpathyChatView *view,
 	timestamp = empathy_message_get_timestamp (msg);
 	body = empathy_message_get_body (msg);
 	body_escaped = theme_adium_parse_body (body);
-	name = empathy_contact_get_name (sender);
+	name = empathy_contact_get_alias (sender);
 	contact_id = empathy_contact_get_id (sender);
 
 	/* If this is a /me, append an event */
diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c
index 531f2baa6..24b7fc5b4 100644
--- a/libempathy-gtk/empathy-theme-boxes.c
+++ b/libempathy-gtk/empathy-theme-boxes.c
@@ -204,7 +204,7 @@ theme_boxes_maybe_append_header (EmpathyThemeBoxes *theme,
 	gboolean              consecutive;
 
 	contact = empathy_message_get_sender (msg);
-	name = empathy_contact_get_name (contact);
+	name = empathy_contact_get_alias (contact);
 	last_contact = empathy_chat_text_view_get_last_contact (view);
 	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (theme));
 	time_ = empathy_message_get_timestamp (msg);
@@ -347,7 +347,7 @@ theme_boxes_append_message (EmpathyChatTextView *view,
 		gchar *body;
 
 		body = g_strdup_printf (" * %s %s",
-					empathy_contact_get_name (sender),
+					empathy_contact_get_alias (sender),
 					empathy_message_get_body (message));
 		empathy_chat_text_view_append_body (EMPATHY_CHAT_TEXT_VIEW (view),
 						    body,
diff --git a/libempathy-gtk/empathy-theme-irc.c b/libempathy-gtk/empathy-theme-irc.c
index 5d298564e..afd59523e 100644
--- a/libempathy-gtk/empathy-theme-irc.c
+++ b/libempathy-gtk/empathy-theme-irc.c
@@ -62,11 +62,11 @@ theme_irc_append_message (EmpathyChatTextView *view,
 	buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
 
 	contact = empathy_message_get_sender (message);
-	name = empathy_contact_get_name (contact);
+	name = empathy_contact_get_alias (contact);
 
 	if (empathy_message_get_tptype (message) == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) {
 		tmp = g_strdup_printf (" * %s %s",
-				       empathy_contact_get_name (contact),
+				       empathy_contact_get_alias (contact),
 				       empathy_message_get_body (message));
 		empathy_chat_text_view_append_body (view, tmp,
 						    EMPATHY_CHAT_TEXT_VIEW_TAG_ACTION);
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index b10b42a44..9fcdc985e 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -1858,7 +1858,7 @@ empathy_receive_file_with_file_chooser (EmpathyFTHandler *handler)
 	g_assert (contact != NULL);
 
 	title = g_strdup_printf (_("Incoming file from %s"),
-		empathy_contact_get_name (contact));
+		empathy_contact_get_alias (contact));
 
 	widget = gtk_file_chooser_dialog_new (title,
 					      NULL,