6 files changed, 10 insertions, 10 deletions

diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index f6bb40278..7550c7183 100644
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -55,7 +55,7 @@ empathy_accounts_has_non_salut_accounts (TpAccountManager *manager)
 
   for (l = accounts ; l != NULL; l = g_list_next (l))
     {
-      if (tp_strdiff (tp_account_get_protocol (l->data), "local-xmpp"))
+      if (tp_strdiff (tp_account_get_protocol_name (l->data), "local-xmpp"))
         {
           ret = TRUE;
           break;
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 7645d1642..2a630d257 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -326,7 +326,7 @@ account_can_be_enabled (TpAccount *account)
     return FALSE;
 
   /* Butterfly accounts shouldn't be used any more */
-  if (!tp_strdiff (tp_account_get_connection_manager (account),
+  if (!tp_strdiff (tp_account_get_cm_name (account),
         "butterfly"))
     return FALSE;
 
@@ -482,7 +482,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
     }
   else
     {
-      if (!tp_strdiff (tp_account_get_connection_manager (account),
+      if (!tp_strdiff (tp_account_get_cm_name (account),
             "butterfly"))
         {
           const gchar *packages[] = { "telepathy-haze", NULL };
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index b2e229da2..11c33453d 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -801,10 +801,10 @@ get_cm_display_name (EmpathyDebugWindow *self,
     {
       TpAccount *account = TP_ACCOUNT (ptr->data);
 
-      if (!tp_strdiff (tp_account_get_connection_manager (account), cm_name))
+      if (!tp_strdiff (tp_account_get_cm_name (account), cm_name))
         {
           g_hash_table_insert (protocols,
-              (char *) tp_account_get_protocol (account),
+              (char *) tp_account_get_protocol_name (account),
               GUINT_TO_POINTER (TRUE));
         }
     }
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index f0b6147b1..8b6e9a380 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -297,7 +297,7 @@ update_join_button_sensitivity (EmpathyNewChatroomDialog *self)
   gboolean sensitive = FALSE;
 
   room = gtk_entry_get_text (GTK_ENTRY (self->priv->entry_room));
-  protocol = tp_account_get_protocol (self->priv->account);
+  protocol = tp_account_get_protocol_name (self->priv->account);
   if (EMP_STR_EMPTY (room))
     goto out;
 
@@ -326,7 +326,7 @@ new_chatroom_dialog_update_widgets (EmpathyNewChatroomDialog *self)
   if (self->priv->account == NULL)
     return;
 
-  protocol = tp_account_get_protocol (self->priv->account);
+  protocol = tp_account_get_protocol_name (self->priv->account);
 
   gtk_entry_set_text (GTK_ENTRY (self->priv->entry_server), "");
 
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 73ef21224..b292bf976 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -501,8 +501,8 @@ roster_window_error_upgrade_sw_clicked_cb (GtkButton *button,
       GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
       GTK_BUTTONS_OK,
       _("Sorry, %s accounts can’t be used until your %s software is updated."),
-      tp_account_get_protocol (account),
-      tp_account_get_protocol (account));
+      tp_account_get_protocol_name (account),
+      tp_account_get_protocol_name (account));
 
   g_signal_connect_swapped (dialog, "response",
       G_CALLBACK (gtk_widget_destroy),
diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c
index 5b366ddf0..7437be47d 100644
--- a/src/empathy-sanity-cleaning.c
+++ b/src/empathy-sanity-cleaning.c
@@ -75,7 +75,7 @@ fix_xmpp_account_priority (TpAccountManager *am)
       GHashTable *params;
       gint priority;
 
-      if (tp_strdiff (tp_account_get_protocol (account), "jabber"))
+      if (tp_strdiff (tp_account_get_protocol_name (account), "jabber"))
         continue;
 
       params = (GHashTable *) tp_account_get_parameters (account);