[empathy/gnome-2-34] empathy-accounts: allow to pass the full path of the account



commit 6dfdd570279f24ea16f51a63ff5edf0b09055dc1
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Feb 28 13:13:33 2011 +0100

    empathy-accounts: allow to pass the full path of the account

 src/empathy-accounts.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 0b44b6d..75bc8ea 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -111,8 +111,12 @@ account_manager_ready_for_accounts_cb (GObject *source_object,
 
       /* create and prep the corresponding TpAccount so it's fully ready by the
        * time we try to select it in the accounts dialog */
-      account_path = g_strdup_printf ("%s%s", TP_ACCOUNT_OBJECT_PATH_BASE,
-          account_id);
+      if (g_str_has_prefix (account_id, TP_ACCOUNT_OBJECT_PATH_BASE))
+        account_path = g_strdup (account_id);
+      else
+        account_path = g_strdup_printf ("%s%s", TP_ACCOUNT_OBJECT_PATH_BASE,
+            account_id);
+
       bus = tp_dbus_daemon_dup (NULL);
       if ((account = tp_account_new (bus, account_path, &error)))
         {



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