aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libempathy-gtk/empathy-individual-store.c4
-rw-r--r--libempathy-gtk/empathy-local-xmpp-assistant-widget.c2
-rw-r--r--libempathy-gtk/empathy-theme-adium.c4
-rw-r--r--libempathy/empathy-account-settings.c4
-rw-r--r--libempathy/empathy-contact.c4
-rw-r--r--src/empathy-accounts-common.c2
-rw-r--r--src/empathy-accounts-dialog.c4
-rw-r--r--src/empathy-debug-window.c4
-rw-r--r--src/empathy-new-chatroom-dialog.c4
-rw-r--r--src/empathy-roster-window.c4
-rw-r--r--src/empathy-sanity-cleaning.c2
11 files changed, 19 insertions, 19 deletions
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index 06ef65a33..9199af6b9 100644
--- 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 f7b18863a..aa4d6cfcb 100644
--- 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 634b4b2cd..64cbe0ec7 100644
--- 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 e32e085b7..6a588a955 100644
--- 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 960040d44..779d19a19 100644
--- 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 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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 11:40:10 +0800