Merge branch 'crash-659118'

[empathy.git] / src / empathy-main-window.c

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 0e75b1cbe07e4abba421779f973c36114dafd986..f3722524bb83abbe2f2994f5f8e0ce41c6c7f9ff 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -2010,7 +2010,7 @@ account_manager_prepared_cb (GObject      *source_object,
        EmpathyMainWindowPriv *priv = GET_PRIV (window);
        GError *error = NULL;
 
-       if (!tp_account_manager_prepare_finish (manager, result, &error)) {
+       if (!tp_proxy_prepare_finish (manager, result, &error)) {
                DEBUG ("Failed to prepare account manager: %s", error->message);
                g_error_free (error);
                return;
@@ -2212,7 +2212,7 @@ empathy_main_window_init (EmpathyMainWindow *window)
 
        priv->account_manager = tp_account_manager_dup ();
 
-       tp_account_manager_prepare_async (priv->account_manager, NULL,
+       tp_proxy_prepare_async (priv->account_manager, NULL,
                                          account_manager_prepared_cb, window);
 
        priv->errors = g_hash_table_new_full (g_direct_hash,