summaryrefslogtreecommitdiff
path: root/finch/gntprefs.c
diff options
context:
space:
mode:
authorGary Kramlich <grim@reaperworld.com>2021-01-02 19:06:28 -0600
committerGary Kramlich <grim@reaperworld.com>2021-01-02 19:06:28 -0600
commit5f043fb1772ef61bac43aef176681a74fba359e1 (patch)
tree844772fe9e8e252561bbaa96936f6e985a622608 /finch/gntprefs.c
parent6c96c5c81650bd91f7476dfd450fd12573496b3d (diff)
downloadpidgin-5f043fb1772ef61bac43aef176681a74fba359e1.tar.gz
Use PurpleCredentialManager instead of the old keyring api.
Testing Done: Connected with bonjour (no password), irc (optional password, non set), and xmpp (password required, not saved, entered manually, not saved) and verified that all of them connected properly. Reviewed at https://reviews.imfreedom.org/r/289/
Diffstat (limited to 'finch/gntprefs.c')
-rw-r--r--finch/gntprefs.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/finch/gntprefs.c b/finch/gntprefs.c
index c06ef52d89..cfa46a8ac5 100644
--- a/finch/gntprefs.c
+++ b/finch/gntprefs.c
@@ -270,9 +270,11 @@ void finch_prefs_show_all()
static void
finch_prefs_keyring_save(void *data, PurpleRequestFields *fields)
{
+ PurpleCredentialManager *manager = purple_credential_manager_get_default();
+
pref_request.keyring_window = NULL;
- purple_keyring_apply_settings(NULL, fields);
+ purple_credential_manager_write_settings(manager, fields, NULL);
}
static void
@@ -284,13 +286,15 @@ finch_prefs_keyring_cancel(void)
void finch_prefs_show_keyring(void)
{
PurpleRequestFields *fields;
+ PurpleCredentialManager *manager = NULL;
if (pref_request.keyring_window != NULL) {
gnt_window_present(pref_request.keyring_window);
return;
}
- fields = purple_keyring_read_settings();
+ manager = purple_credential_manager_get_default();
+ fields = purple_credential_manager_read_settings(manager, NULL);
if (fields == NULL) {
purple_notify_info(NULL, _("Keyring settings"),
_("Selected keyring doesn't allow any configuration"),