aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-07-16 17:10:57 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-07-16 17:10:57 +0800
commit0751b2d498a4fedde128f9a55bcb89d859794ee3 (patch)
tree4d003bd63f6f395b5d439553cf9ab8b0ded4b8f7 /libempathy
parent25c022091cf9527a80db041e554e8ec35b131bf2 (diff)
downloadgsoc2013-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')
-rw-r--r--libempathy/empathy-account-settings.c4
-rw-r--r--libempathy/empathy-contact.c4
2 files changed, 4 insertions, 4 deletions
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);