Use new tp_account_* getters

diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index 06ef65a331eddec0d4db0e965c9f4c53bf56f707..9199af6b94c877f935f0a01bd524838395dbd422 100644 (file)
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -1132,8 +1132,8 @@ individual_store_contact_sort (FolksIndividual *individual_a,
       g_assert (account_b != NULL);
 
       /* protocol */
-      ret_val = g_strcmp0 (tp_account_get_protocol (account_a),
-          tp_account_get_protocol (account_b));
+      ret_val = g_strcmp0 (tp_account_get_protocol_name (account_a),
+          tp_account_get_protocol_name (account_b));
 
       if (ret_val != 0)
         goto out;

diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
index f7b18863a4e2521cd1b938dfc80116439833ccee..aa4d6cfcb16f2cd4a97637a3ea91df2b00ef6f64 100644 (file)
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
@@ -226,7 +226,7 @@ empathy_local_xmpp_assistant_widget_should_create_account (
     {
       TpAccount *account = TP_ACCOUNT (l->data);
 
-      if (!tp_strdiff (tp_account_get_protocol (account), "local-xmpp"))
+      if (!tp_strdiff (tp_account_get_protocol_name (account), "local-xmpp"))
         {
           salut_created = TRUE;
           break;

diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 634b4b2cdc63f0a7e6a1747e107dd90271956bda..64cbe0ec70de5831af9a6a4beb972da7e3cdddcc 100644 (file)
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -864,9 +864,9 @@ empathy_theme_adium_append_message (EmpathyThemeAdium *self,
   sender = empathy_message_get_sender (msg);
   account = empathy_contact_get_account (sender);
   service_name = empathy_protocol_name_to_display_name
-    (tp_account_get_protocol (account));
+    (tp_account_get_protocol_name (account));
   if (service_name == NULL)
-    service_name = tp_account_get_protocol (account);
+    service_name = tp_account_get_protocol_name (account);
   timestamp = empathy_message_get_timestamp (msg);
   body_escaped = theme_adium_parse_body (self,
     empathy_message_get_body (msg),

diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index e32e085b71b450c4028b82314648b3ed7c5951f5..6a588a955f5418b4922711fd74a924a427eab54e 100644 (file)
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -228,9 +228,9 @@ empathy_account_settings_constructed (GObject *object)
       g_free (priv->service);
 
       priv->cm_name =
-        g_strdup (tp_account_get_connection_manager (priv->account));
+        g_strdup (tp_account_get_cm_name (priv->account));
       priv->protocol =
-        g_strdup (tp_account_get_protocol (priv->account));
+        g_strdup (tp_account_get_protocol_name (priv->account));
       priv->service =
         g_strdup (tp_account_get_service (priv->account));
       priv->icon_name = g_strdup

diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 960040d44017956a9137e0c9546d37256b621095..779d19a19154238d2915a2827ebfb54f64819c61 100644 (file)
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -1351,8 +1351,8 @@ contact_get_avatar_filename (EmpathyContact *contact,
   avatar_path = g_build_filename (g_get_user_cache_dir (),
       "telepathy",
       "avatars",
-      tp_account_get_connection_manager (account),
-      tp_account_get_protocol (account),
+      tp_account_get_cm_name (account),
+      tp_account_get_protocol_name (account),
       NULL);
   g_mkdir_with_parents (avatar_path, 0700);
 

diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index f6bb4027846cd0f5bb30ca427958167dcac984fe..7550c7183fd727d4bf50eeb44ddca7dca2cf4481 100644 (file)
--- 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 7645d1642563b27f137dbdf421dce49b31f6499a..2a630d257f1d5fa2be38f41b1942356adab593da 100644 (file)
--- 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 b2e229da2531564e98932892163be58ab51074dd..11c33453d07a0c815bd9d9ee2a0b116e2f7df1c1 100644 (file)
--- 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 f0b6147b1e649663432a206edf2dec22fa2e9e06..8b6e9a3809c32fd3cd4ffba3d9530e07ad6d870c 100644 (file)
--- 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 73ef21224ea3628ce5fa340682211abd9c1675d0..b292bf976ea541308122ef98113cf4b8d93b73db 100644 (file)
--- 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 5b366ddf0fea631c9487d537e7661e93346e2258..7437be47d890acb65c7064e9373f710601e8bed7 100644 (file)
--- 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);