GNOME.org
 

[empathy: 47/59] all: log error messages if preparing the account manager fails

commit d5f2776bacfe750f02782cef348e984ed68916af
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Fri Oct 30 10:10:26 2009 +0000

    all: log error messages if preparing the account manager fails
    
    Signed-off-by: Jonny Lamb <jonnylamb gnome org>

 libempathy-gtk/empathy-account-chooser.c  |    8 +++++++-
 libempathy-gtk/empathy-chat.c             |    5 ++++-
 libempathy-gtk/empathy-location-manager.c |   18 ++++++++++++++----
 libempathy-gtk/empathy-log-window.c       |    5 ++++-
 libempathy-gtk/empathy-presence-chooser.c |    5 ++++-
 libempathy/empathy-account-settings.c     |   18 ++++++++++++++----
 libempathy/empathy-chatroom-manager.c     |    9 +++++++--
 libempathy/empathy-contact-manager.c      |    5 ++++-
 libempathy/empathy-dispatcher.c           |    9 +++++++--
 libempathy/empathy-idle.c                 |    5 ++++-
 src/empathy-accounts-dialog.c             |    9 +++++++--
 src/empathy-import-widget.c               |    9 +++++++--
 src/empathy-main-window.c                 |    5 ++++-
 src/empathy-status-icon.c                 |    5 ++++-
 src/empathy.c                             |   27 +++++++++++++++++++++------
 15 files changed, 112 insertions(+), 30 deletions(-)
---
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 3e9b9a3..8256707 100644
--- 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 74dfdf6..7984b8a 100644
--- 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 086dc9c..5bdb724 100644
--- 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 c78f3a3..247a998 100644
--- 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 84b0c4d..678ec83 100644
--- 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 91f0b10..f33e437 100644
--- 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 d782f32..56295fe 100644
--- 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 3dc21c3..53ccfbd 100644
--- 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 5414f64..523bc2e 100644
--- 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 2d20210..b4cc0cf 100644
--- 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 cb43c97..014b736 100644
--- 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 629b151..5a0d82c 100644
--- 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 dbaf399..a2f9dde 100644
--- 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 33c2da0..ba1bef1 100644
--- 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 2acaf63..6487058 100644
--- 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);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]