diff options
Diffstat (limited to 'libempathy-gtk')
-rw-r--r-- | libempathy-gtk/empathy-account-chooser.c | 8 | ||||
-rw-r--r-- | libempathy-gtk/empathy-chat.c | 5 | ||||
-rw-r--r-- | libempathy-gtk/empathy-location-manager.c | 18 | ||||
-rw-r--r-- | libempathy-gtk/empathy-log-window.c | 5 | ||||
-rw-r--r-- | libempathy-gtk/empathy-presence-chooser.c | 5 |
5 files changed, 33 insertions, 8 deletions
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c index 3e9b9a35f..8256707c0 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 74dfdf6a1..7984b8a3a 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 086dc9c1b..5bdb724b9 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 c78f3a36d..247a99806 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 84b0c4d08..678ec835c 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; } |