aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libempathy-gtk/empathy-account-chooser.c8
-rw-r--r--libempathy-gtk/empathy-chat.c5
-rw-r--r--libempathy-gtk/empathy-location-manager.c18
-rw-r--r--libempathy-gtk/empathy-log-window.c5
-rw-r--r--libempathy-gtk/empathy-presence-chooser.c5
-rw-r--r--libempathy/empathy-account-settings.c18
-rw-r--r--libempathy/empathy-chatroom-manager.c9
-rw-r--r--libempathy/empathy-contact-manager.c5
-rw-r--r--libempathy/empathy-dispatcher.c9
-rw-r--r--libempathy/empathy-idle.c5
-rw-r--r--src/empathy-accounts-dialog.c9
-rw-r--r--src/empathy-import-widget.c9
-rw-r--r--src/empathy-main-window.c5
-rw-r--r--src/empathy-status-icon.c5
-rw-r--r--src/empathy.c27
15 files changed, 112 insertions, 30 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;
}
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 91f0b1065..f33e43799 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 d782f3271..56295fe5a 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 3dc21c332..53ccfbd63 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 5414f64cd..523bc2eee 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 2d2021054..b4cc0cf6e 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 cb43c972e..014b73611 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 629b15162..5a0d82c8c 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 dbaf399f8..a2f9dde13 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 33c2da031..ba1bef1a4 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 2acaf63df..6487058a4 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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 07:18:13 +0800