*/
#include "config.h"
-
#include "empathy-sanity-cleaning.h"
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <libempathy/empathy-account-settings.h>
-#include <libempathy/empathy-gsettings.h>
-
-#include <libempathy-gtk/empathy-theme-manager.h>
-
#ifdef HAVE_UOA
-#include <libempathy/empathy-pkg-kit.h>
-#include <libempathy/empathy-uoa-utils.h>
-
#include <libaccounts-glib/ag-account-service.h>
#include <libaccounts-glib/ag-manager.h>
#include <libaccounts-glib/ag-service.h>
+#include <tp-account-widgets/tpaw-keyring.h>
+#include <tp-account-widgets/tpaw-uoa-utils.h>
+
+#include "empathy-pkg-kit.h"
#endif
+#include "empathy-gsettings.h"
+#include "empathy-theme-manager.h"
+
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-keyring.h>
+#include "empathy-debug.h"
/*
* This number has to be increased each time a new task is added or modified.
*/
#define SANITY_CLEANING_NUMBER 4
+typedef struct
+{
+ TpAccountManager *am;
+ GSimpleAsyncResult *result;
+
+ gint ref_count;
+} SanityCtx;
+
+static SanityCtx *
+sanity_ctx_new (TpAccountManager *am,
+ GSimpleAsyncResult *result)
+{
+ SanityCtx *ctx = g_slice_new0 (SanityCtx);
+
+ ctx->am = g_object_ref (am);
+ ctx->result = g_object_ref (result);
+
+ ctx->ref_count = 1;
+ return ctx;
+}
+
+#ifdef HAVE_UOA
+static SanityCtx *
+sanity_ctx_ref (SanityCtx *ctx)
+{
+ ctx->ref_count++;
+
+ return ctx;
+}
+#endif
+
+static void
+sanity_ctx_unref (SanityCtx *ctx)
+{
+ ctx->ref_count--;
+
+ if (ctx->ref_count != 0)
+ return;
+
+ g_simple_async_result_complete_in_idle (ctx->result);
+
+ g_object_unref (ctx->am);
+ g_object_unref (ctx->result);
+
+ g_slice_free (SanityCtx, ctx);
+}
+
static void
account_update_parameters_cb (GObject *source,
GAsyncResult *result,
{
GList *accounts, *l;
- accounts = tp_account_manager_get_valid_accounts (am);
+ accounts = tp_account_manager_dup_valid_accounts (am);
for (l = accounts; l != NULL; l = g_list_next (l))
{
TpAccount *account = l->data;
g_hash_table_unref (params);
}
- g_list_free (accounts);
+ g_list_free_full (accounts, g_object_unref);
}
static void
{
GList *accounts, *l;
- accounts = tp_account_manager_get_valid_accounts (am);
+ accounts = tp_account_manager_dup_valid_accounts (am);
for (l = accounts; l != NULL; l = g_list_next (l))
{
TpAccount *account = l->data;
g_hash_table_unref (params);
}
- g_list_free (accounts);
+ g_list_free_full (accounts, g_object_unref);
}
static void
g_slice_free (UoaMigrationData, data);
}
+#define DATA_SANITY_CTX "data-sanity-ctx"
+
+static void
+uoa_account_remove_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ TpAccount *account = TP_ACCOUNT (source);
+ GError *error = NULL;
+
+ if (!tp_account_remove_finish (account, result, &error))
+ {
+ DEBUG ("Failed to remove account '%s': %s",
+ tp_account_get_path_suffix (account), error->message);
+ g_error_free (error);
+ }
+
+ g_object_set_data (G_OBJECT (account), DATA_SANITY_CTX, NULL);
+}
+
static void
uoa_migration_done (UoaMigrationData *data)
{
- tp_account_remove_async (data->old_account, NULL, NULL);
- tp_account_set_enabled_async (data->new_account, data->enabled, NULL, NULL);
+ tp_account_remove_async (data->old_account, uoa_account_remove_cb, NULL);
+
+ if (data->new_account != NULL)
+ tp_account_set_enabled_async (data->new_account, data->enabled, NULL, NULL);
+
+ uoa_migration_data_free (data);
}
static void
UoaMigrationData *data = user_data;
GError *error = NULL;
- if (!empathy_keyring_set_account_password_finish (data->new_account, result,
+ if (!tpaw_keyring_set_account_password_finish (data->new_account, result,
&error))
{
DEBUG ("Error setting old account's password on the new one: %s\n",
const gchar *password;
GError *error = NULL;
- password = empathy_keyring_get_account_password_finish (data->old_account,
+ password = tpaw_keyring_get_account_password_finish (data->old_account,
result, &error);
if (password == NULL)
{
}
else
{
- empathy_keyring_set_account_password_async (data->new_account, password,
+ tpaw_keyring_set_account_password_async (data->new_account, password,
TRUE, uoa_set_account_password_cb, data);
}
}
tp_account_get_path_suffix (data->old_account), error->message);
g_clear_error (&error);
- uoa_migration_data_free (data);
+ uoa_migration_done (data);
}
else
{
tp_account_get_path_suffix (data->old_account));
/* Migrate password as well */
- empathy_keyring_get_account_password_async (data->old_account,
+ tpaw_keyring_get_account_password_async (data->old_account,
uoa_get_account_password_cb, data);
}
}
GVariant *param;
GVariantIter iter;
const gchar * const *supersedes;
+ guint i;
UoaMigrationData *data;
DEBUG ("Migrating account %s to UOA storage\n",
tp_account_request_set_enabled (ar, FALSE);
supersedes = tp_account_get_supersedes (account);
- while (*supersedes != NULL)
- tp_account_request_add_supersedes (ar, *supersedes);
+
+ for (i = 0; supersedes[i] != NULL; i++)
+ tp_account_request_add_supersedes (ar, supersedes[i]);
+
tp_account_request_add_supersedes (ar,
tp_proxy_get_object_path (account));
if (!empathy_pkg_kit_install_packages_finish (result, &error))
{
- DEBUG ("Failed to install plugin: %s", error->message);
+ DEBUG ("Failed to install plugin for account '%s' (%s); remove it",
+ tp_account_get_path_suffix (account), error->message);
+
g_error_free (error);
+
+ tp_account_remove_async (account, uoa_account_remove_cb, NULL);
goto out;
}
protocol = tp_account_get_protocol_name (account);
ag_account = ag_manager_create_account (manager, protocol);
- l = ag_account_list_services_by_type (ag_account, EMPATHY_UOA_SERVICE_TYPE);
+ l = ag_account_list_services_by_type (ag_account, TPAW_UOA_SERVICE_TYPE);
if (l == NULL)
{
const gchar *packages[2];
}
static void
-migrate_accounts_to_uoa (TpAccountManager *am)
+migrate_accounts_to_uoa (SanityCtx *ctx)
{
GList *accounts, *l;
AgManager *manager;
DEBUG ("Start migrating accounts to UOA");
- manager = empathy_uoa_manager_dup ();
+ manager = tpaw_uoa_manager_dup ();
- accounts = tp_account_manager_get_valid_accounts (am);
+ accounts = tp_account_manager_dup_valid_accounts (ctx->am);
for (l = accounts; l != NULL; l = g_list_next (l))
{
TpAccount *account = l->data;
if (!tp_str_empty (tp_account_get_storage_provider (account)))
continue;
+ g_object_set_data_full (G_OBJECT (account), DATA_SANITY_CTX,
+ sanity_ctx_ref (ctx), (GDestroyNotify) sanity_ctx_unref);
+
+ /* Try to install the plugin if it's missing */
if (!uoa_plugin_installed (manager, account))
continue;
- migrate_account_to_uoa (am, account);
+ migrate_account_to_uoa (ctx->am, account);
}
+ g_list_free_full (accounts, g_object_unref);
+
g_object_unref (manager);
}
#endif
static void
-run_sanity_cleaning_tasks (TpAccountManager *am)
+run_sanity_cleaning_tasks (SanityCtx *ctx)
{
DEBUG ("Starting sanity cleaning tasks");
- fix_xmpp_account_priority (am);
- set_facebook_account_fallback_server (am);
+ fix_xmpp_account_priority (ctx->am);
+ set_facebook_account_fallback_server (ctx->am);
upgrade_chat_theme_settings ();
#ifdef HAVE_UOA
- migrate_accounts_to_uoa (am);
+ migrate_accounts_to_uoa (ctx);
#endif
}
{
GError *error = NULL;
TpAccountManager *am = TP_ACCOUNT_MANAGER (source);
+ SanityCtx *ctx = user_data;
if (!tp_proxy_prepare_finish (am, result, &error))
{
DEBUG ("Failed to prepare account manager: %s", error->message);
- g_error_free (error);
- return;
+ g_simple_async_result_take_error (ctx->result, error);
+ goto out;
}
- run_sanity_cleaning_tasks (am);
+ run_sanity_cleaning_tasks (ctx);
+
+out:
+ sanity_ctx_unref (ctx);
}
-void empathy_sanity_checking_run_if_needed (void)
+void
+empathy_sanity_checking_run_async (GAsyncReadyCallback callback,
+ gpointer user_data)
{
GSettings *settings;
guint number;
TpAccountManager *am;
+ GSimpleAsyncResult *result;
+ SanityCtx *ctx;
+
+ result = g_simple_async_result_new (NULL, callback, user_data,
+ empathy_sanity_checking_run_async);
settings = g_settings_new (EMPATHY_PREFS_SCHEMA);
number = g_settings_get_uint (settings, EMPATHY_PREFS_SANITY_CLEANING_NUMBER);
if (number == SANITY_CLEANING_NUMBER)
- goto out;
+ {
+ g_simple_async_result_complete_in_idle (result);
+ goto out;
+ }
am = tp_account_manager_dup ();
- tp_proxy_prepare_async (am, NULL, am_prepare_cb, NULL);
+ ctx = sanity_ctx_new (am, result);
+ tp_proxy_prepare_async (am, NULL, am_prepare_cb, ctx);
g_settings_set_uint (settings, EMPATHY_PREFS_SANITY_CLEANING_NUMBER,
SANITY_CLEANING_NUMBER);
g_object_unref (am);
+
out:
g_object_unref (settings);
+ g_object_unref (result);
+}
+
+gboolean
+empathy_sanity_checking_run_finish (GAsyncResult *result,
+ GError **error)
+{
+ g_return_val_if_fail (g_simple_async_result_is_valid (result, NULL,
+ empathy_sanity_checking_run_async), FALSE);
+
+ if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result),
+ error))
+ return FALSE;
+
+ return TRUE;
}
projects / empathy.git / blobdiff