[Pkg-telepathy-commits] [telepathy-glib] 15/111: stop using tp_account_is_prepared()

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-glib.

commit 523dca7d96d328a92c940be5cb4550e8d72cef6d
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Fri Sep 27 15:07:50 2013 +0200

    stop using tp_account_is_prepared()
---
 telepathy-glib/account-manager.c | 2 +-
 tests/dbus/account-manager.c     | 2 +-
 tests/dbus/account.c             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index 8a121a4..94f3f13 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -1221,7 +1221,7 @@ tp_account_manager_set_all_requested_presences (TpAccountManager *manager,
     {
       TpAccount *account = TP_ACCOUNT (value);
 
-      if (tp_account_is_prepared (account, TP_ACCOUNT_FEATURE_CORE))
+      if (tp_proxy_is_prepared (account, TP_ACCOUNT_FEATURE_CORE))
         tp_account_request_presence_async (account, type, status, message,
             NULL, NULL);
     }
diff --git a/tests/dbus/account-manager.c b/tests/dbus/account-manager.c
index 092933e..060dd18 100644
--- a/tests/dbus/account-manager.c
+++ b/tests/dbus/account-manager.c
@@ -437,7 +437,7 @@ finish_account_prepare_action (GObject *source_object,
 
   g_assert (test->account == account);
   test->prepared = tp_account_prepare_finish (account, res, &test->error);
-  g_assert (test->prepared == tp_account_is_prepared (account, TP_ACCOUNT_FEATURE_CORE));
+  g_assert (test->prepared == tp_proxy_is_prepared (account, TP_ACCOUNT_FEATURE_CORE));
 
   script_continue (test);
 }
diff --git a/tests/dbus/account.c b/tests/dbus/account.c
index 75d4710..eb21dc1 100644
--- a/tests/dbus/account.c
+++ b/tests/dbus/account.c
@@ -371,7 +371,7 @@ test_prepare_success (Test *test,
   g_main_loop_run (test->mainloop);
 
   /* the obvious accessors */
-  g_assert (tp_account_is_prepared (test->account, TP_ACCOUNT_FEATURE_CORE));
+  g_assert (tp_proxy_is_prepared (test->account, TP_ACCOUNT_FEATURE_CORE));
   g_assert (tp_account_is_enabled (test->account));
   assert_boolprop (test->account, "enabled", TRUE);
   g_assert (tp_account_is_valid (test->account));
@@ -738,7 +738,7 @@ test_connection (Test *test,
       account_prepare_cb, test);
   g_main_loop_run (test->mainloop);
 
-  g_assert (tp_account_is_prepared (test->account, TP_ACCOUNT_FEATURE_CORE));
+  g_assert (tp_proxy_is_prepared (test->account, TP_ACCOUNT_FEATURE_CORE));
 
   /* a connection turns up */
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib.git