diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-09-19 18:18:44 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-09-19 18:18:44 +0800 |
| commit | 6670167794afb834c87fa7bae7286567b7a84cb3 (patch) | |
| tree | eabbae5536c4d90a12579ec145582332722c7d40 /src/empathy.c | |
| parent | e832dfa825bd284600ffa28d2a9180d96c7024a5 (diff) | |
| download | gsoc2013-empathy-6670167794afb834c87fa7bae7286567b7a84cb3.tar gsoc2013-empathy-6670167794afb834c87fa7bae7286567b7a84cb3.tar.gz gsoc2013-empathy-6670167794afb834c87fa7bae7286567b7a84cb3.tar.bz2 gsoc2013-empathy-6670167794afb834c87fa7bae7286567b7a84cb3.tar.lz gsoc2013-empathy-6670167794afb834c87fa7bae7286567b7a84cb3.tar.xz gsoc2013-empathy-6670167794afb834c87fa7bae7286567b7a84cb3.tar.zst gsoc2013-empathy-6670167794afb834c87fa7bae7286567b7a84cb3.zip | |
Use tp_proxy_prepare_async instead of tp_account_manager_prepare_async
Diffstat (limited to 'src/empathy.c')
| -rw-r--r-- | src/empathy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/empathy.c b/src/empathy.c index 9294557ec..32aa25a86 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -382,7 +382,7 @@ empathy_app_command_line (GApplication *app, empathy_window_present (GTK_WINDOW (self->window)); /* Display the accounts dialog if needed */ - tp_account_manager_prepare_async (self->account_manager, NULL, + tp_proxy_prepare_async (self->account_manager, NULL, account_manager_ready_cb, self); return 0; @@ -626,7 +626,7 @@ account_manager_ready_cb (GObject *source_object, GError *error = NULL; TpConnectionPresenceType presence; - if (!tp_account_manager_prepare_finish (manager, result, &error)) + if (!tp_proxy_prepare_finish (manager, result, &error)) { GtkWidget *dialog; @@ -718,7 +718,7 @@ account_manager_chatroom_ready_cb (GObject *source_object, GList *accounts, *l; 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); @@ -748,7 +748,7 @@ chatroom_manager_ready_cb (EmpathyChatroomManager *chatroom_manager, { TpAccountManager *account_manager = user_data; - tp_account_manager_prepare_async (account_manager, NULL, + tp_proxy_prepare_async (account_manager, NULL, account_manager_chatroom_ready_cb, chatroom_manager); } @@ -786,7 +786,7 @@ empathy_app_constructed (GObject *object) /* account management */ self->account_manager = tp_account_manager_dup (); - tp_account_manager_prepare_async (self->account_manager, NULL, + tp_proxy_prepare_async (self->account_manager, NULL, account_manager_ready_cb, self); migrate_config_to_xdg_dir (); |