diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-09-19 12:18:44 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-09-19 12:18:44 +0200 |
| commit | 6670167794afb834c87fa7bae7286567b7a84cb3 (patch) | |
| tree | eabbae5536c4d90a12579ec145582332722c7d40 /libempathy | |
| parent | e832dfa825bd284600ffa28d2a9180d96c7024a5 (diff) | |
| download | empathy-6670167794afb834c87fa7bae7286567b7a84cb3.tar.gz | |
Use tp_proxy_prepare_async instead of tp_account_manager_prepare_async
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-account-settings.c | 4 | ||||
| -rw-r--r-- | libempathy/empathy-chatroom-manager.c | 4 | ||||
| -rw-r--r-- | libempathy/empathy-contact-manager.c | 4 | ||||
| -rw-r--r-- | libempathy/empathy-presence-manager.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c index 04fa789d5..50c8f992d 100644 --- a/libempathy/empathy-account-settings.c +++ b/libempathy/empathy-account-settings.c @@ -1617,7 +1617,7 @@ empathy_account_settings_manager_ready_cb (GObject *source_object, TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object); GError *error = NULL; - if (!tp_account_manager_prepare_finish (account_manager, result, &error)) + if (!tp_proxy_prepare_finish (account_manager, result, &error)) { DEBUG ("Failed to prepare account manager: %s", error->message); g_error_free (error); @@ -1652,7 +1652,7 @@ empathy_account_settings_apply_async (EmpathyAccountSettings *settings, if (priv->account == NULL) { - tp_account_manager_prepare_async (priv->account_manager, NULL, + tp_proxy_prepare_async (priv->account_manager, NULL, empathy_account_settings_manager_ready_cb, settings); } else diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c index 043f8a829..67ec6cddb 100644 --- a/libempathy/empathy-chatroom-manager.c +++ b/libempathy/empathy-chatroom-manager.c @@ -518,7 +518,7 @@ account_manager_ready_cb (GObject *source_object, GError *error = NULL; GFile *file = 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); @@ -575,7 +575,7 @@ empathy_chatroom_manager_constructor (GType type, 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_ready_cb, g_object_ref (self)); if (priv->file == NULL) diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c index b00f82477..8dbf6d3d5 100644 --- a/libempathy/empathy-contact-manager.c +++ b/libempathy/empathy-contact-manager.c @@ -436,7 +436,7 @@ account_manager_prepared_cb (GObject *source_object, TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object); GError *error = NULL; - if (!tp_account_manager_prepare_finish (account_manager, result, &error)) { + if (!tp_proxy_prepare_finish (account_manager, result, &error)) { DEBUG ("Failed to prepare account manager: %s", error->message); g_error_free (error); return; @@ -578,7 +578,7 @@ empathy_contact_manager_init (EmpathyContactManager *manager) 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, manager); bus = tp_dbus_daemon_dup (&error); diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c index c3eae6583..67867f96d 100644 --- a/libempathy/empathy-presence-manager.c +++ b/libempathy/empathy-presence-manager.c @@ -463,7 +463,7 @@ account_manager_ready_cb (GObject *source_object, self->priv->ready = TRUE; - if (!tp_account_manager_prepare_finish (account_manager, result, &error)) + if (!tp_proxy_prepare_finish (account_manager, result, &error)) { DEBUG ("Failed to prepare account manager: %s", error->message); g_error_free (error); @@ -500,7 +500,7 @@ empathy_presence_manager_init (EmpathyPresenceManager *self) self->priv->manager = tp_account_manager_dup (); - tp_account_manager_prepare_async (self->priv->manager, NULL, + tp_proxy_prepare_async (self->priv->manager, NULL, account_manager_ready_cb, self); tp_g_signal_connect_object (self->priv->manager, |