diff options
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-account-settings.c | 18 | ||||
| -rw-r--r-- | libempathy/empathy-chatroom-manager.c | 9 | ||||
| -rw-r--r-- | libempathy/empathy-contact-manager.c | 5 | ||||
| -rw-r--r-- | libempathy/empathy-dispatcher.c | 9 | ||||
| -rw-r--r-- | libempathy/empathy-idle.c | 5 |
5 files changed, 36 insertions, 10 deletions
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; } |