[empathy/gnome-2-34: 56/60] account-settings: use tp_account_get_path_suffix



commit bd5957d475411222883d93a87dd228a2ce20b2a0
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Wed Dec 22 11:58:38 2010 +0000

    account-settings: use tp_account_get_path_suffix
    
    Signed-off-by: Jonny Lamb <jonnylamb gnome org>

 libempathy/empathy-account-settings.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 163fc4d..e0474e9 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -425,7 +425,7 @@ empathy_account_settings_try_migrating_password (EmpathyAccountSettings *self)
 {
   EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
   const GValue *v;
-  const gchar *account_id, *password;
+  const gchar *password;
   const gchar *unset[] = { "password", NULL };
   GHashTable *empty;
 
@@ -436,11 +436,9 @@ empathy_account_settings_try_migrating_password (EmpathyAccountSettings *self)
   /* mission-control still has our password, although the CM
    * supports SASL. Let's try migrating it. */
 
-  account_id = tp_proxy_get_object_path (priv->account)
-    + strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
-
   DEBUG ("Trying to migrate password parameter from MC to the "
-      "keyring ourselves for account %s", account_id);
+      "keyring ourselves for account %s",
+      tp_account_get_path_suffix (priv->account));
 
   v = empathy_account_settings_get (self, "password");
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]