GNOME.org
 

[empathy] Use tp_proxy_prepare_async instead of tp_account_manager_prepare_async

commit 6670167794afb834c87fa7bae7286567b7a84cb3
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Sep 19 12:18:44 2011 +0200

    Use tp_proxy_prepare_async instead of tp_account_manager_prepare_async

 libempathy-gtk/empathy-account-chooser.c  |    4 ++--
 libempathy-gtk/empathy-account-widget.c   |    4 ++--
 libempathy-gtk/empathy-chat.c             |    4 ++--
 libempathy-gtk/empathy-location-manager.c |    8 ++++----
 libempathy-gtk/empathy-notify-manager.c   |    4 ++--
 libempathy-gtk/empathy-presence-chooser.c |    4 ++--
 libempathy/empathy-account-settings.c     |    4 ++--
 libempathy/empathy-chatroom-manager.c     |    4 ++--
 libempathy/empathy-contact-manager.c      |    4 ++--
 libempathy/empathy-presence-manager.c     |    4 ++--
 src/empathy-account-assistant.c           |    4 ++--
 src/empathy-accounts-dialog.c             |    4 ++--
 src/empathy-accounts.c                    |    4 ++--
 src/empathy-import-widget.c               |    4 ++--
 src/empathy-main-window.c                 |    4 ++--
 src/empathy-migrate-butterfly-logs.c      |    4 ++--
 src/empathy-status-icon.c                 |    4 ++--
 src/empathy.c                             |   10 +++++-----
 18 files changed, 41 insertions(+), 41 deletions(-)
---
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index c16f9c7..ad4f778 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -570,7 +570,7 @@ account_manager_prepared_cb (GObject *source_object,
 	EmpathyAccountChooserPriv *priv = GET_PRIV (chooser);
 	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;
@@ -686,7 +686,7 @@ account_chooser_setup (EmpathyAccountChooser *chooser)
 					NULL);
 
 	/* Populate accounts */
-	tp_account_manager_prepare_async (priv->manager, NULL,
+	tp_proxy_prepare_async (priv->manager, NULL,
 					  account_manager_prepared_cb, chooser);
 
 	g_object_unref (store);
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index f0e153c..911304c 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -1960,7 +1960,7 @@ account_manager_ready_cb (GObject *source_object,
   GError *error = NULL;
   TpConnectionPresenceType state;
 
-  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);
@@ -2191,7 +2191,7 @@ do_constructed (GObject *obj)
   priv->account_manager = tp_account_manager_dup ();
 
   g_object_ref (self);
-  tp_account_manager_prepare_async (priv->account_manager, NULL,
+  tp_proxy_prepare_async (priv->account_manager, NULL,
       account_manager_ready_cb, self);
 
   /* handle apply and cancel button */
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index b9313a9..4e5de6e 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -3263,7 +3263,7 @@ account_manager_prepared_cb (GObject *source_object,
 	EmpathyChat *chat = user_data;
 	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 the account manager: %s", error->message);
 		g_error_free (error);
 		return;
@@ -3297,7 +3297,7 @@ empathy_chat_init (EmpathyChat *chat)
 	priv->input_history_current = NULL;
 	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, chat);
 
 	priv->show_contacts = g_settings_get_boolean (priv->gsettings_chat,
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index 03b97d0..94df278 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -182,7 +182,7 @@ publish_to_all_am_prepared_cb (GObject *source_object,
   GList *accounts, *l;
   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);
@@ -214,7 +214,7 @@ publish_to_all_connections (EmpathyLocationManager *self,
   data->self = g_object_ref (self);
   data->force_publication = force_publication;
 
-  tp_account_manager_prepare_async (self->priv->account_manager, NULL,
+  tp_proxy_prepare_async (self->priv->account_manager, NULL,
       publish_to_all_am_prepared_cb, data);
 }
 
@@ -609,7 +609,7 @@ account_manager_prepared_cb (GObject *source_object,
   EmpathyLocationManager *self = user_data;
   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);
@@ -641,7 +641,7 @@ empathy_location_manager_init (EmpathyLocationManager *self)
   /* Setup account status callbacks */
   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, self);
 
   /* Setup settings status callbacks */
diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index 7a4374c..3fcf9af 100644
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -114,7 +114,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);
@@ -150,7 +150,7 @@ empathy_notify_manager_init (EmpathyNotifyManager *self)
 
   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, self);
 }
 
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 66d516c..65ec2f6 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -742,7 +742,7 @@ update_sensitivity_am_prepared_cb (GObject *source_object,
 	GList *accounts, *l;
 	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;
@@ -774,7 +774,7 @@ presence_chooser_update_sensitivity (EmpathyPresenceChooser *chooser)
 {
 	EmpathyPresenceChooserPriv *priv = GET_PRIV (chooser);
 
-	tp_account_manager_prepare_async (priv->account_manager, NULL,
+	tp_proxy_prepare_async (priv->account_manager, NULL,
 					  update_sensitivity_am_prepared_cb,
 					  chooser);
 }
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 04fa789..50c8f99 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 043f8a8..67ec6cd 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 b00f824..8dbf6d3 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 c3eae65..67867f9 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,
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 1b39000..efd6dc1 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -1161,7 +1161,7 @@ account_mgr_prepare_cb (GObject *source_object,
   TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
   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);
@@ -1277,7 +1277,7 @@ do_constructed (GObject *object)
   priv->salut_page = page;
   priv->display_salut_page = TRUE;
 
-  tp_account_manager_prepare_async (priv->account_mgr, NULL,
+  tp_proxy_prepare_async (priv->account_mgr, NULL,
       account_mgr_prepare_cb, self);
 
   gtk_window_set_resizable (GTK_WINDOW (self), FALSE);
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 0eeec82..a48bbc2 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -2118,7 +2118,7 @@ accounts_dialog_manager_ready_cb (GObject *source_object,
   TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
   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);
@@ -2444,7 +2444,7 @@ do_constructed (GObject *object)
   /* Set up signalling */
   priv->account_manager = tp_account_manager_dup ();
 
-  tp_account_manager_prepare_async (priv->account_manager, NULL,
+  tp_proxy_prepare_async (priv->account_manager, NULL,
       accounts_dialog_manager_ready_cb, dialog);
 
   priv->connectivity = empathy_connectivity_dup_singleton ();
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 78398c3..8c9ab68 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -95,7 +95,7 @@ account_manager_ready_for_accounts_cb (GObject *source_object,
   TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
   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_clear_error (&error);
@@ -248,7 +248,7 @@ main (int argc, char *argv[])
 
   account_manager = tp_account_manager_dup ();
 
-  tp_account_manager_prepare_async (account_manager, NULL,
+  tp_proxy_prepare_async (account_manager, NULL,
     account_manager_ready_for_accounts_cb, NULL);
 
   g_signal_connect (app, "command-line", G_CALLBACK (app_command_line_cb),
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index fc1e2f5..9a8917f 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -103,7 +103,7 @@ account_manager_prepared_cb (GObject *source_object,
   EmpathyImportWidgetPriv *priv = GET_PRIV (self);
   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);
@@ -156,7 +156,7 @@ import_widget_add_accounts_to_model (EmpathyImportWidget *self)
 
   manager = tp_account_manager_dup ();
 
-  tp_account_manager_prepare_async (manager, NULL,
+  tp_proxy_prepare_async (manager, NULL,
       account_manager_prepared_cb, self);
 
   g_object_unref (manager);
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 679f000..ad771b0 100644
--- 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;
@@ -2208,7 +2208,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,
diff --git a/src/empathy-migrate-butterfly-logs.c b/src/empathy-migrate-butterfly-logs.c
index 4a8bf97..c673a2f 100644
--- a/src/empathy-migrate-butterfly-logs.c
+++ b/src/empathy-migrate-butterfly-logs.c
@@ -140,7 +140,7 @@ migration_account_manager_prepared_cb (GObject *source_object,
   GList *accounts, *l;
   GSettings *gsettings;
 
-  if (!tp_account_manager_prepare_finish (am, result, &error))
+  if (!tp_proxy_prepare_finish (am, result, &error))
     {
       DEBUG ("Failed to prepare the account manager: %s", error->message);
       g_error_free (error);
@@ -189,7 +189,7 @@ migrate_logs (gpointer data)
 
   account_manager = tp_account_manager_dup ();
 
-  tp_account_manager_prepare_async (account_manager, NULL,
+  tp_proxy_prepare_async (account_manager, NULL,
       migration_account_manager_prepared_cb, NULL);
 
   g_object_unref (account_manager);
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 008ea47..d6f5b2e 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -437,7 +437,7 @@ account_manager_prepared_cb (GObject *source_object,
 	EmpathyStatusIcon *icon = user_data;
 	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;
@@ -465,7 +465,7 @@ empathy_status_icon_init (EmpathyStatusIcon *icon)
 	priv->account_manager = tp_account_manager_dup ();
 	priv->event_manager = empathy_event_manager_dup_singleton ();
 
-	tp_account_manager_prepare_async (priv->account_manager, NULL,
+	tp_proxy_prepare_async (priv->account_manager, NULL,
 	    account_manager_prepared_cb, icon);
 
 	/* make icon listen and respond to MAIN_WINDOW_HIDDEN changes */
diff --git a/src/empathy.c b/src/empathy.c
index 9294557..32aa25a 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 ();
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]