diff options
| author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-07-25 23:24:14 +0800 |
|---|---|---|
| committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 18:03:05 +0800 |
| commit | 2d543808216afa7bd287ec78fa69a16f576652a3 (patch) | |
| tree | 5af8d2a84927d1fbcc65bc9b960a42fc0f8f432a /src | |
| parent | 53a376be8d68d95c30cb66495d42d3c18947473f (diff) | |
| download | gsoc2013-empathy-2d543808216afa7bd287ec78fa69a16f576652a3.tar.gz gsoc2013-empathy-2d543808216afa7bd287ec78fa69a16f576652a3.tar.zst gsoc2013-empathy-2d543808216afa7bd287ec78fa69a16f576652a3.zip | |
keyring: move from Empathy to tp-account-widgets
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-sanity-cleaning.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c index 827a34eba..6ad0990aa 100644 --- a/src/empathy-sanity-cleaning.c +++ b/src/empathy-sanity-cleaning.c @@ -28,8 +28,8 @@ #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 "empathy-keyring.h" #include "empathy-pkg-kit.h" #include "empathy-uoa-utils.h" #endif @@ -318,7 +318,7 @@ uoa_set_account_password_cb (GObject *source, 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", @@ -338,7 +338,7 @@ uoa_get_account_password_cb (GObject *source, 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) { @@ -349,7 +349,7 @@ uoa_get_account_password_cb (GObject *source, } 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); } } @@ -380,7 +380,7 @@ uoa_account_created_cb (GObject *source, 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); } } |