diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-07-16 17:10:57 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-07-16 17:10:57 +0800 |
| commit | 0751b2d498a4fedde128f9a55bcb89d859794ee3 (patch) | |
| tree | 4d003bd63f6f395b5d439553cf9ab8b0ded4b8f7 /libempathy-gtk | |
| parent | 25c022091cf9527a80db041e554e8ec35b131bf2 (diff) | |
| download | gsoc2013-empathy-0751b2d498a4fedde128f9a55bcb89d859794ee3.tar gsoc2013-empathy-0751b2d498a4fedde128f9a55bcb89d859794ee3.tar.gz gsoc2013-empathy-0751b2d498a4fedde128f9a55bcb89d859794ee3.tar.bz2 gsoc2013-empathy-0751b2d498a4fedde128f9a55bcb89d859794ee3.tar.lz gsoc2013-empathy-0751b2d498a4fedde128f9a55bcb89d859794ee3.tar.xz gsoc2013-empathy-0751b2d498a4fedde128f9a55bcb89d859794ee3.tar.zst gsoc2013-empathy-0751b2d498a4fedde128f9a55bcb89d859794ee3.zip | |
Use new tp_account_* getters
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-individual-store.c | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-local-xmpp-assistant-widget.c | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-theme-adium.c | 4 |
3 files changed, 5 insertions, 5 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), |