all: log error messages if preparing the account manager fails

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 3e9b9a35fdb988ee3923436be8f52be5f0ee3406..8256707c067925e2f4905ac55827448dcb22f7d8 100644 (file)
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -36,6 +36,9 @@
 #include "empathy-ui-utils.h"
 #include "empathy-account-chooser.h"
 
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include <libempathy/empathy-debug.h>
+
 /**
  * SECTION:empathy-account-chooser
  * @title:EmpathyAccountChooser
@@ -447,8 +450,11 @@ account_manager_prepared_cb (GObject *source_object,
        GList *accounts, *l;
        TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
        EmpathyAccountChooser *chooser = user_data;
+       GError *error = NULL;
 
-       if (!tp_account_manager_prepare_finish (manager, result, NULL)) {
+       if (!tp_account_manager_prepare_finish (manager, result, &error)) {
+               DEBUG ("Failed to prepare account manager: %s", error->message);
+               g_error_free (error);
                return;
        }
 

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 74dfdf6a10d0efc162db09a2a988532336ba2230..7984b8a3a622825fa1bda41adef05493fec0fe2a 100644 (file)
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -1707,8 +1707,11 @@ account_manager_prepared_cb (GObject *source_object,
        GList *accounts, *l;
        TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
        EmpathyChat *chat = user_data;
+       GError *error = NULL;
 
-       if (!tp_account_manager_prepare_finish (account_manager, result, NULL)) {
+       if (!tp_account_manager_prepare_finish (account_manager, result, &error)) {
+               DEBUG ("Failed to prepare the account manager: %s", error->message);
+               g_error_free (error);
                return;
        }
 

diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index 086dc9c1b8267c1229fc9980045c807df9d0081b..5bdb724b9228f6edd8f0e5d4b8816527e32b2ee3 100644 (file)
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -231,9 +231,14 @@ publish_to_all_am_prepared_cb (GObject *source_object,
   TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
   PublishToAllData *data = user_data;
   GList *accounts, *l;
+  GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (manager, result, NULL))
-    goto out;
+  if (!tp_account_manager_prepare_finish (manager, result, &error))
+    {
+      DEBUG ("Failed to prepare account manager: %s", error->message);
+      g_error_free (error);
+      goto out;
+    }
 
   accounts = tp_account_manager_get_valid_accounts (manager);
   for (l = accounts; l; l = l->next)
@@ -671,9 +676,14 @@ account_manager_prepared_cb (GObject *source_object,
   GList *accounts, *l;
   TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
   EmpathyLocationManager *self = user_data;
+  GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (account_manager, result, NULL))
-    return;
+  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+    {
+      DEBUG ("Failed to prepare account manager: %s", error->message);
+      g_error_free (error);
+      return;
+    }
 
   accounts = tp_account_manager_get_valid_accounts (account_manager);
   for (l = accounts; l != NULL; l = l->next)

diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index c78f3a36dc1098eb4ff6ced018cf73e7897a20d6..247a99806e737c1ea9a61280ba61ee9cd18ddeff 100644 (file)
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -144,8 +144,11 @@ account_manager_prepared_cb (GObject *source_object,
        EmpathyLogWindow *window = user_data;
        guint account_num;
        GList *accounts;
+       GError *error = NULL;
 
-       if (!tp_account_manager_prepare_finish (account_manager, result, NULL)) {
+       if (!tp_account_manager_prepare_finish (account_manager, result, &error)) {
+               DEBUG ("Failed to prepare account manager: %s", error->message);
+               g_error_free (error);
                return;
        }
 

diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 84b0c4d08efef1e74df25b6f80e5ebd3b1569215..678ec835c5126f74cf9422fc3113331419c4ac37 100644 (file)
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -724,8 +724,11 @@ update_sensitivity_am_prepared_cb (GObject *source_object,
        EmpathyPresenceChooserPriv *priv = GET_PRIV (chooser);
        gboolean sensitive = FALSE;
        GList *accounts, *l;
+       GError *error = NULL;
 
-       if (!tp_account_manager_prepare_finish (manager, result, NULL)) {
+       if (!tp_account_manager_prepare_finish (manager, result, &error)) {
+               DEBUG ("Failed to prepare account manager: %s", error->message);
+               g_error_free (error);
                return;
        }
 

diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 91f0b1065c31c2a468e6422b2961bdabcdc42c5e..f33e437996590fe8cffd04650c4ace00ed1c8141 100644 (file)
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -415,9 +415,14 @@ empathy_account_settings_account_ready_cb (GObject *source_object,
 {
   EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (user_data);
   TpAccount *account = TP_ACCOUNT (source_object);
+  GError *error = NULL;
 
-  if (!tp_account_prepare_finish (account, result, NULL))
-    return;
+  if (!tp_account_prepare_finish (account, result, &error))
+    {
+      DEBUG ("Failed to prepare account: %s", error->message);
+      g_error_free (error);
+      return;
+    }
 
   empathy_account_settings_check_readyness (settings);
 }
@@ -1168,9 +1173,14 @@ empathy_account_settings_manager_ready_cb (GObject *source_object,
   EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (user_data);
   EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
   TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
+  GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (account_manager, result, NULL))
-    return;
+  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+    {
+      DEBUG ("Failed to prepare account manager: %s", error->message);
+      g_error_free (error);
+      return;
+    }
 
   g_assert (priv->apply_result != NULL && priv->account == NULL);
   empathy_account_settings_do_create_account (settings);

diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index d782f327159e105deb814507e10b5a5ea2700ad0..56295fe5a9c80834f22e73508febe075078bd35c 100644 (file)
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -402,9 +402,14 @@ account_manager_ready_cb (GObject *source_object,
 {
   EmpathyChatroomManager *self = EMPATHY_CHATROOM_MANAGER (user_data);
   TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
+  GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (manager, result, NULL))
-    return;
+  if (!tp_account_manager_prepare_finish (manager, result, &error))
+    {
+      DEBUG ("Failed to prepare account manager: %s", error->message);
+      g_error_free (error);
+      return;
+    }
 
   chatroom_manager_get_all (self);
 }

diff --git a/libempathy/empathy-contact-manager.c b/libempathy/empathy-contact-manager.c
index 3dc21c3321e1aa39d2e42bc67a0de7bc8d1bcc4c..53ccfbd63bdbc18e7742a15da4256624ef429871 100644 (file)
--- a/libempathy/empathy-contact-manager.c
+++ b/libempathy/empathy-contact-manager.c
@@ -244,8 +244,11 @@ account_manager_prepared_cb (GObject *source_object,
        GList *accounts, *l;
        EmpathyContactManager *manager = user_data;
        TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
+       GError *error = NULL;
 
-       if (!tp_account_manager_prepare_finish (account_manager, result, NULL)) {
+       if (!tp_account_manager_prepare_finish (account_manager, result, &error)) {
+               DEBUG ("Failed to prepare account manager: %s", error->message);
+               g_error_free (error);
                return;
        }
 

diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 5414f64cd3b2e495f5ef537c5d41dcfdb1aa465f..523bc2eee83073adc6879e70e0f435d71fcbae19 100644 (file)
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -1122,9 +1122,14 @@ account_manager_prepared_cb (GObject *source_object,
   GList *accounts, *l;
   EmpathyDispatcher *self = user_data;
   TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
+  GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (account_manager, result, NULL))
-    return;
+  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+    {
+      DEBUG ("Failed to prepare account manager: %s", error->message);
+      g_error_free (error);
+      return;
+    }
 
   accounts = tp_account_manager_get_valid_accounts (account_manager);
   for (l = accounts; l; l = l->next)

diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c
index 2d202105496f1a3407f3bf37aa94d128caa7239d..b4cc0cf6ed49a3c298713354f362cfa3897c3e1c 100644 (file)
--- a/libempathy/empathy-idle.c
+++ b/libempathy/empathy-idle.c
@@ -474,8 +474,11 @@ account_manager_ready_cb (GObject *source_object,
        TpConnectionPresenceType state;
        gchar *status, *status_message;
        GList *accounts, *l;
+       GError *error = NULL;
 
-       if (!tp_account_manager_prepare_finish (account_manager, result, NULL)) {
+       if (!tp_account_manager_prepare_finish (account_manager, result, &error)) {
+               DEBUG ("Failed to prepare account manager: %s", error->message);
+               g_error_free (error);
                return;
        }
 

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index cb43c972e9a25159779d7913bf3d33260ceb1a39..014b73611970313c7865b5ad6477ab9104c49a3b 100644 (file)
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -1561,9 +1561,14 @@ accounts_dialog_manager_ready_cb (GObject *source_object,
     gpointer user_data)
 {
   TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
+  GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (manager, result, NULL))
-    return;
+  if (!tp_account_manager_prepare_finish (manager, result, &error))
+    {
+      DEBUG ("Failed to prepare account manager: %s", error->message);
+      g_error_free (error);
+      return;
+    }
 
   accounts_dialog_accounts_setup (user_data);
 }

diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index 629b15162b2e24874d99c6106b4526a3c0975363..5a0d82c8c151ead5ec664d6d5bb4e4c24056b8fd 100644 (file)
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -99,9 +99,14 @@ account_manager_prepared_cb (GObject *source_object,
   GtkTreeIter iter;
   GList *l;
   EmpathyImportWidgetPriv *priv = GET_PRIV (self);
+  GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (manager, result, NULL))
-    return;
+  if (!tp_account_manager_prepare_finish (manager, result, &error))
+    {
+      DEBUG ("Failed to prepare account manager: %s", error->message);
+      g_error_free (error);
+      return;
+    }
 
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
 

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index dbaf399f8b512da72f910065697d50c969fcd96f..a2f9dde132afed2fe9582baa9c2705d482918b68 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -1193,8 +1193,11 @@ account_manager_prepared_cb (GObject *source_object,
        GList *accounts, *j;
        TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
        EmpathyMainWindow *window = user_data;
+       GError *error = NULL;
 
-       if (!tp_account_manager_prepare_finish (manager, result, NULL)) {
+       if (!tp_account_manager_prepare_finish (manager, result, &error)) {
+               DEBUG ("Failed to prepare account manager: %s", error->message);
+               g_error_free (error);
                return;
        }
 

diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 33c2da0311cee74dca0522792cdd4091e7603c35..ba1bef1a4455dd600b3fcf8de0cf5ff541356338 100644 (file)
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -560,8 +560,11 @@ account_manager_prepared_cb (GObject *source_object,
        GList *list, *l;
        TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
        EmpathyStatusIcon *icon = user_data;
+       GError *error = NULL;
 
-       if (!tp_account_manager_prepare_finish (account_manager, result, NULL)) {
+       if (!tp_account_manager_prepare_finish (account_manager, result, &error)) {
+               DEBUG ("Failed to prepare account manager: %s", error->message);
+               g_error_free (error);
                return;
        }
 

diff --git a/src/empathy.c b/src/empathy.c
index 2acaf63dfc6d1e9b35c73ca967ac8f4bb618a4c1..6487058a4f581f60eeb168f30dfb52397f62b9cf 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -465,9 +465,14 @@ account_manager_ready_for_accounts_cb (GObject *source_object,
     gpointer user_data)
 {
   TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
+  GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (manager, result, NULL))
-    return;
+  if (!tp_account_manager_prepare_finish (manager, result, &error))
+    {
+      DEBUG ("Failed to prepare account manager: %s", error->message);
+      g_error_free (error);
+      return;
+    }
 
   do_show_accounts_ui (user_data, manager);
 }
@@ -607,9 +612,14 @@ account_manager_ready_cb (GObject *source_object,
     gpointer user_data)
 {
   TpAccountManager *manager = TP_ACCOUNT_MANAGER (source_object);
+  GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (manager, result, NULL))
-    return;
+  if (!tp_account_manager_prepare_finish (manager, result, &error))
+    {
+      DEBUG ("Failed to prepare account manager: %s", error->message);
+      g_error_free (error);
+      return;
+    }
 
   if (should_create_salut_account () || !empathy_import_mc4_has_imported ())
     {
@@ -743,9 +753,14 @@ account_manager_chatroom_ready_cb (GObject *source_object,
   TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
   EmpathyChatroomManager *chatroom_manager = user_data;
   GList *accounts, *l;
+  GError *error = NULL;
 
-  if (!tp_account_manager_prepare_finish (account_manager, result, NULL))
-    return;
+  if (!tp_account_manager_prepare_finish (account_manager, result, &error))
+    {
+      DEBUG ("Failed to prepare account manager: %s", error->message);
+      g_error_free (error);
+      return;
+    }
 
   accounts = tp_account_manager_get_valid_accounts (account_manager);