#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-keyring.h"
#include "empathy-pkg-kit.h"
-#include "empathy-uoa-utils.h"
#endif
#include "empathy-gsettings.h"
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));
/* 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);
}
}
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];
DEBUG ("Start migrating accounts to UOA");
- manager = empathy_uoa_manager_dup ();
+ manager = tpaw_uoa_manager_dup ();
accounts = tp_account_manager_dup_valid_accounts (ctx->am);
for (l = accounts; l != NULL; l = g_list_next (l))