soc.2008.masterpassword: 8aff600b: Remove deprecated API since we're target...
qulogic at pidgin.im
qulogic at pidgin.im
Mon Oct 31 04:10:30 EDT 2011
----------------------------------------------------------------------
Revision: 8aff600b3575e718460cbd6fcec1357c1a0544c3
Parent: a6a57e928cd4f8cef833b39a0dc98bf6161f815d
Author: qulogic at pidgin.im
Date: 10/30/11 23:11:52
Branch: im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/8aff600b3575e718460cbd6fcec1357c1a0544c3
Changelog:
Remove deprecated API since we're targeting 3.0.0 here. Don't mind the
warnings; I'll take care of them later.
Changes against parent a6a57e928cd4f8cef833b39a0dc98bf6161f815d
patched finch/gntaccount.c
patched libpurple/account.c
patched libpurple/account.h
patched libpurple/example/nullclient.c
patched libpurple/keyring.c
patched libpurple/keyring.h
patched libpurple/plugins/keyrings/gnomekeyring.c
patched libpurple/plugins/keyrings/internalkeyring.c
patched libpurple/plugins/keyrings/kwallet.cpp
patched libpurple/plugins/one_time_password.c
patched libpurple/protocols/gg/gg.c
patched libpurple/protocols/jabber/auth.c
patched libpurple/protocols/jabber/auth_cyrus.c
patched libpurple/protocols/jabber/jabber.c
patched libpurple/protocols/msn/session.c
patched libpurple/protocols/mxit/actions.c
patched libpurple/protocols/mxit/login.c
patched libpurple/protocols/myspace/myspace.c
patched libpurple/protocols/novell/novell.c
patched libpurple/protocols/oscar/clientlogin.c
patched libpurple/protocols/oscar/flap_connection.c
patched libpurple/protocols/oscar/oscar.c
patched libpurple/protocols/silc/silc.c
patched libpurple/protocols/simple/simple.c
patched libpurple/protocols/yahoo/libymsg.c
patched libpurple/prpl.c
patched pidgin/gtkaccount.c
-------------- next part --------------
============================================================
--- libpurple/prpl.c 0d1b808b23ca2d2762fd863108889ddc2c78c486
+++ libpurple/prpl.c 7227b9798f913079521ee9dd5f1f52e250e3acda
@@ -361,7 +361,7 @@ do_prpl_change_account_status(PurpleAcco
if (!purple_account_get_remember_password(account)) {
PurpleConnection *gc = purple_account_get_connection(account);
if (gc && purple_connection_had_error(gc))
- purple_account_set_password_async(account, NULL, NULL, NULL, NULL);
+ purple_account_set_password(account, NULL, NULL, NULL, NULL);
}
if (!purple_account_is_disconnected(account))
============================================================
--- libpurple/protocols/jabber/jabber.c f8a6d992e6a1e9fd28662e7f2939d15ec1d06d6b
+++ libpurple/protocols/jabber/jabber.c 90488a8cae9ce1368c744ba936ea7e85a60aa070
@@ -1264,7 +1264,7 @@ jabber_register_cb(JabberRegisterCBData
cbdata->js->user->node = g_strdup(value);
}
if(cbdata->js->registration && !strcmp(id, "password"))
- purple_account_set_password(purple_connection_get_account(cbdata->js->gc), value);
+ purple_account_set_password(purple_connection_get_account(cbdata->js->gc), value, NULL, NULL, NULL);
}
}
}
@@ -2488,7 +2488,7 @@ jabber_password_change_result_cb(JabberS
purple_notify_info(js->gc, _("Password Changed"), _("Password Changed"),
_("Your password has been changed."));
- purple_account_set_password(purple_connection_get_account(js->gc), (char *)data);
+ purple_account_set_password(purple_connection_get_account(js->gc), (char *)data, NULL, NULL, NULL);
} else {
char *msg = jabber_parse_error(js, packet, NULL);
@@ -2744,7 +2744,7 @@ char *jabber_parse_error(JabberStream *j
SET_REASON(PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED);
/* Clear the pasword if it isn't being saved */
if (!purple_account_get_remember_password(purple_connection_get_account(js->gc)))
- purple_account_set_password(purple_connection_get_account(js->gc), NULL);
+ purple_account_set_password(purple_connection_get_account(js->gc), NULL, NULL, NULL, NULL);
text = _("Not Authorized");
} else if(xmlnode_get_child(packet, "temporary-auth-failure")) {
text = _("Temporary Authentication Failure");
============================================================
--- libpurple/protocols/oscar/oscar.c d27e9d401f21dc6360a401905d74b7b5bf6cf10f
+++ libpurple/protocols/oscar/oscar.c 948dcfb8c93b09820078b1fac2c93c3b487748d9
@@ -1095,7 +1095,7 @@ purple_parse_auth_resp(OscarData *od, Fl
case 0x05:
/* Incorrect password */
if (!purple_account_get_remember_password(account))
- purple_account_set_password(account, NULL);
+ purple_account_set_password(account, NULL, NULL, NULL, NULL);
purple_connection_error(gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Incorrect password"));
break;
case 0x11:
============================================================
--- libpurple/protocols/gg/gg.c d5d34030a0c0a4d66d5747a02da654f7a2439fa5
+++ libpurple/protocols/gg/gg.c d8146e71887d89f863cf2ce9fe419f0a6396669d
@@ -386,7 +386,7 @@ static void ggp_callback_register_accoun
t = g_strdup_printf("%u", uin);
purple_account_set_username(account, t);
/* Save the password if remembering passwords for the account */
- purple_account_set_password(account, p1);
+ purple_account_set_password(account, p1, NULL, NULL, NULL);
purple_notify_info(NULL, _("New Gadu-Gadu Account Registered"),
_("Registration completed successfully!"), NULL);
@@ -651,7 +651,7 @@ static void ggp_callback_change_passwd_h
if (req->http_req->data != NULL &&
((struct gg_pubdir*)req->http_req->data)->success == 1)
{
- purple_account_set_password(req->account, req->new_password);
+ purple_account_set_password(req->account, req->new_password, NULL, NULL, NULL);
purple_notify_info(req->account, messagesTitle,
_("Password was changed successfully!"), NULL);
goto exit_cleanup;
============================================================
--- libpurple/protocols/yahoo/libymsg.c 23474bb96a40b979634cbb4ed7a330f94521cee0
+++ libpurple/protocols/yahoo/libymsg.c 3dacf0342505d556df616c08fc85720ce52dde20
@@ -158,7 +158,7 @@ static void yahoo_process_status(PurpleC
if (pkt->service == YAHOO_SERVICE_LOGOFF && pkt->status == -1) {
if (!purple_account_get_remember_password(account))
- purple_account_set_password(account, NULL);
+ purple_account_set_password(account, NULL, NULL, NULL, NULL);
purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NAME_IN_USE,
_("You have signed on from another location"));
return;
@@ -1959,7 +1959,7 @@ static void yahoo_auth16_stage1_cb(Purpl
/* Password incorrect */
/* Set password to NULL. Avoids account locking. Brings dialog to enter password if clicked on Re-enable account */
if (!purple_account_get_remember_password(account))
- purple_account_set_password(account, NULL);
+ purple_account_set_password(account, NULL, NULL, NULL, NULL);
error_reason = g_strdup(_("Incorrect password"));
error = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
break;
@@ -2256,7 +2256,7 @@ static void yahoo_process_authresp(Purpl
}
#endif /* TRY_WEBMESSENGER_LOGIN */
if (!purple_account_get_remember_password(account))
- purple_account_set_password(account, NULL);
+ purple_account_set_password(account, NULL, NULL, NULL, NULL);
msg = g_strdup(_("Invalid username or password"));
reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
============================================================
--- libpurple/protocols/msn/session.c 942c0db801f3605c4ee4b56cfb23853109c5dbbb
+++ libpurple/protocols/msn/session.c c9573707140eafe2699e21289fa35223431b59c5
@@ -384,7 +384,7 @@ msn_session_set_error(MsnSession *sessio
reason = PURPLE_CONNECTION_ERROR_NAME_IN_USE;
msg = g_strdup(_("You have signed on from another location"));
if (!purple_account_get_remember_password(session->account))
- purple_account_set_password(session->account, NULL);
+ purple_account_set_password(session->account, NULL, NULL, NULL, NULL);
break;
case MSN_ERROR_SERV_UNAVAILABLE:
reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
@@ -404,7 +404,7 @@ msn_session_set_error(MsnSession *sessio
_("Unknown error") : info);
/* Clear the password if it isn't being saved */
if (!purple_account_get_remember_password(session->account))
- purple_account_set_password(session->account, NULL);
+ purple_account_set_password(session->account, NULL, NULL, NULL, NULL);
break;
case MSN_ERROR_BAD_BLIST:
reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
============================================================
--- libpurple/account.c 6d70ea61527a81fb515536be4c0a9831e0a0c8e2
+++ libpurple/account.c 7cea897395ca0545ebcc1907f24ad4087e736afc
@@ -1181,7 +1181,7 @@ purple_account_register(PurpleAccount *a
purple_debug_info("account", "Registering account %s\n",
purple_account_get_username(account));
- purple_keyring_get_password_async(account, purple_account_register_got_password_cb, NULL);
+ purple_keyring_get_password(account, purple_account_register_got_password_cb, NULL);
}
@@ -1213,7 +1213,7 @@ purple_account_unregister(PurpleAccount
data->cb = cb;
data->user_data = user_data;
- purple_keyring_get_password_async(account, purple_account_unregister_got_password_cb, data);
+ purple_keyring_get_password(account, purple_account_unregister_got_password_cb, data);
}
@@ -1248,13 +1248,13 @@ request_password_ok_cb(PurpleAccount *ac
return;
}
- if(!remember)
- purple_keyring_set_password_async(account, NULL, NULL, NULL, NULL);
+ if (!remember)
+ purple_keyring_set_password(account, NULL, NULL, NULL, NULL);
purple_account_set_remember_password(account, remember);
password = g_strdup(entry);
- purple_account_set_password(account, password);
+ purple_account_set_password(account, password, NULL, NULL, NULL);
g_free(password);
_purple_connection_new(account, FALSE, entry);
@@ -1340,7 +1340,7 @@ purple_account_connect(PurpleAccount *ac
purple_debug_info("account", "Connecting to account %s.\n", username);
prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
- purple_keyring_get_password_async(account, purple_account_connect_got_password_cb, prpl_info);
+ purple_keyring_get_password(account, purple_account_connect_got_password_cb, prpl_info);
}
@@ -1736,27 +1736,12 @@ purple_account_set_username(PurpleAccoun
blist_ops->save_account(account);
}
-void
-purple_account_set_password(PurpleAccount *account, const char *password)
-{
- schedule_accounts_save();
-
- g_return_if_fail(account != NULL);
-
- g_free(account->password);
-
- account->password = g_strdup(password);
-
- if (purple_account_get_remember_password(account) == TRUE)
- purple_keyring_set_password_async(account, g_strdup(password), g_free, NULL, NULL);
-}
-
void
-purple_account_set_password_async(PurpleAccount * account,
- gchar * password,
- GDestroyNotify destroypassword,
- PurpleKeyringSaveCallback cb,
- gpointer data)
+purple_account_set_password(PurpleAccount *account,
+ gchar *password,
+ GDestroyNotify destroy,
+ PurpleKeyringSaveCallback cb,
+ gpointer data)
{
/**
* This is so we can force an account sync by calling
@@ -1781,10 +1766,11 @@ purple_account_set_password_async(Purple
cb(account, NULL, data);
} else {
- purple_keyring_set_password_async(account, password,
- destroypassword, cb, data);
+ purple_keyring_set_password(account, password,
+ destroy, cb, data);
}
}
+
void
purple_account_set_alias(PurpleAccount *account, const char *alias)
{
@@ -2289,38 +2275,12 @@ purple_account_get_username(const Purple
return account->username;
}
-#ifndef PURPLE_DISABLE_DEPRECATED
-/* XXX will be replaced by the async code in 3.0 */
-const char *
-purple_account_get_password(PurpleAccount *account)
-{
- g_return_val_if_fail(account != NULL, NULL);
-
- if (account->password == NULL) {
- purple_debug_info("accounts",
- "Reading password for account %s (%s) from sync keyring.\n",
- purple_account_get_username(account),
- purple_account_get_protocol_id(account));
-
- account->password = g_strdup(purple_keyring_get_password_sync(account));
-
- } else {
- purple_debug_info("accounts",
- "Reading password for account %s (%s) from cached.\n",
- purple_account_get_username(account),
- purple_account_get_protocol_id(account));
- }
-
- return account->password;
-}
-#endif
-
void
-purple_account_get_password_async(PurpleAccount * account,
- PurpleKeyringReadCallback cb,
- gpointer data)
+purple_account_get_password(PurpleAccount *account,
+ PurpleKeyringReadCallback cb,
+ gpointer data)
{
- CbInfo * info = g_new0(CbInfo,1);
+ CbInfo *info = g_new0(CbInfo, 1);
info->cb = cb;
info->data = data;
@@ -2331,7 +2291,7 @@ purple_account_get_password_async(Purple
if (account->password != NULL) {
purple_debug_info("accounts",
- "Reading password for account %s (%s) from cached (async).\n",
+ "Reading password for account %s (%s) from cache.\n",
purple_account_get_username(account),
purple_account_get_protocol_id(account));
cb(account, account->password, NULL, data);
@@ -2341,7 +2301,7 @@ purple_account_get_password_async(Purple
"Reading password for account %s (%s) from async keyring.\n",
purple_account_get_username(account),
purple_account_get_protocol_id(account));
- purple_keyring_get_password_async(account,
+ purple_keyring_get_password(account,
purple_account_get_password_async_finish, info);
}
}
@@ -2888,7 +2848,7 @@ purple_account_change_password(PurpleAcc
PurpleConnection *gc = purple_account_get_connection(account);
PurplePlugin *prpl = NULL;
- purple_account_set_password_async(account, g_strdup(new_pw), g_free, NULL, NULL);
+ purple_account_set_password(account, g_strdup(new_pw), g_free, NULL, NULL);
if (gc != NULL)
prpl = purple_connection_get_prpl(gc);
@@ -3112,9 +3072,8 @@ purple_accounts_delete(PurpleAccount *ac
/* this is async because we do not want the
* account overwritten before we are done.
*/
- purple_keyring_set_password_async(account, NULL, NULL,
+ purple_keyring_set_password(account, NULL, NULL,
purple_accounts_delete_finish, NULL);
-
}
static void
============================================================
--- libpurple/account.h fffd074829e5085e0333b0aa1bebd956478f3436
+++ libpurple/account.h 5378226812971a30fba84d45d49fabe42470254c
@@ -346,35 +346,23 @@ void purple_account_set_username(PurpleA
void purple_account_set_username(PurpleAccount *account, const char *username);
/**
- * Sets the account's password.
- *
- * @param account The account.
- * @param password The password.
- *
- * This functions is just a wrapper for the async code anyway.
- */
-void purple_account_set_password(PurpleAccount *account, const char *password);
-
-/**
* Set the account's password, and call the callback
- * This should be renamed purple_account_set_password() when getting
- * to 3.0. This calls the keyring function and syncs the accounts.xml
*
* The password in the keyring might not be immediatly updated, but the cache
* version will be, and it is therefore safe to read the password back before
* the callback has been triggered. One can also set a NULL calback.
*
- * @param account The account for which the password is to be saved.
+ * @param account The account for which the password is to be saved.
* @param password The password to save.
- * @param destroypassword A function called to free the password. Can be NULL.
- * @param cb A callback for once the password is saved.
- * @param data A pointer to be passed to the callback.
+ * @param destroy A function called to free the password. Can be NULL.
+ * @param cb A callback for once the password is saved.
+ * @param data A pointer to be passed to the callback.
*/
-void purple_account_set_password_async(PurpleAccount * account,
- gchar * password,
- GDestroyNotify destroypassword,
- PurpleKeyringSaveCallback cb,
- gpointer data);
+void purple_account_set_password(PurpleAccount *account,
+ gchar *password,
+ GDestroyNotify destroy,
+ PurpleKeyringSaveCallback cb,
+ gpointer data);
/**
* Sets the account's alias.
@@ -681,34 +669,18 @@ const char *purple_account_get_username(
*/
const char *purple_account_get_username(const PurpleAccount *account);
-#ifndef PURPLE_DISABLE_DEPRECATED
/**
- * Returns the account's password.
+ * Reads the password for the account and passes it to the callback
*
* @param account The account.
- *
- * @return The password.
- *
- * @deprecated This might return NULL if the password has not been cached yet,
- * and the keyring doesn't support sync access. It might also hang libpurple
- * while the keyring is prompting for a password. Use purple_account_get_password_async()
- * or purple_connection_get_password() instead (depending on the part of the code you are
- * calling from.
+ * @param cb The callback to give the password.
+ * @param data A pointer passed to the callback.
*/
-const char *purple_account_get_password(PurpleAccount *account);
-#endif
+void purple_account_get_password(PurpleAccount *account,
+ PurpleKeyringReadCallback cb,
+ gpointer data);
/**
- * Reads the password for the account and passes it to the callback
- *
- * @param account The account to read the password for.
- * @param cb The callback to pass the password to.
- * @param data A pointer passed to the callback.
- */
-void purple_account_get_password_async(PurpleAccount * account,
- PurpleKeyringReadCallback cb, gpointer data);
-
-/**
* Returns the account's alias.
*
* @param account The account.
============================================================
--- pidgin/gtkaccount.c 3ab39cb3af94447ff7356041ad18644f2124fb7a
+++ pidgin/gtkaccount.c 1352c88a4dd37a5cb97b2682a7675df71ed2baf7
@@ -1374,7 +1374,7 @@ ok_account_prefs_cb(GtkWidget *w, Accoun
/* Remember Password */
remember = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->remember_pass_check));
if(!remember)
- purple_keyring_set_password_async(account, NULL, NULL, NULL, NULL);
+ purple_keyring_set_password(account, NULL, NULL, NULL, NULL);
purple_account_set_remember_password(account, remember);
@@ -1395,9 +1395,9 @@ ok_account_prefs_cb(GtkWidget *w, Accoun
* don't want to prompt them.
*/
if ((purple_account_get_remember_password(account) || new_acct) && (*value != '\0')) {
- purple_account_set_password(account, value);
+ purple_account_set_password(account, value, NULL, NULL, NULL);
} else {
- purple_account_set_password(account, NULL);
+ purple_account_set_password(account, NULL, NULL, NULL, NULL);
}
purple_account_set_username(account, username);
@@ -1542,7 +1542,7 @@ pidgin_account_dialog_show(PidginAccount
PurpleAccount *account)
{
/* this is to make sure the password will be cached */
- purple_account_get_password_async(account,
+ purple_account_get_password(account,
pidgin_account_dialog_show_continue, (void*)type);
}
============================================================
--- libpurple/protocols/jabber/auth.c ec97ae854591a10e0392b6ff27fa3296647a0198
+++ libpurple/protocols/jabber/auth.c e2f4c1c7c4aea0fb15e5f61c20b2808f7a6901d1
@@ -110,7 +110,7 @@ auth_old_pass_cb(PurpleConnection *gc, P
if (remember)
purple_account_set_remember_password(account, TRUE);
- purple_account_set_password(account, entry);
+ purple_account_set_password(account, entry, NULL, NULL, NULL);
/* Restart our connection */
jabber_auth_start_old(js);
@@ -228,7 +228,7 @@ static void auth_old_result_cb(JabberStr
reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
/* Clear the pasword if it isn't being saved */
if (!purple_account_get_remember_password(account))
- purple_account_set_password(account, NULL);
+ purple_account_set_password(account, NULL, NULL, NULL, NULL);
}
purple_connection_error(js->gc, reason, msg);
============================================================
--- libpurple/protocols/novell/novell.c 4756c5e9d33f0a4b0c486c90a60fef9add24f33d
+++ libpurple/protocols/novell/novell.c 692aab78d595ef7edb6f46f3fcf87adbb86b6686
@@ -132,7 +132,7 @@ _login_resp_cb(NMUser * user, NMERR_T re
* password was invalid.
*/
if (!purple_account_get_remember_password(purple_connection_get_account(gc)))
- purple_account_set_password(purple_connection_get_account(gc), NULL);
+ purple_account_set_password(purple_connection_get_account(gc), NULL, NULL, NULL, NULL);
reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
break;
default:
@@ -2036,7 +2036,7 @@ _evt_user_disconnect(NMUser * user, NMEv
if (gc)
{
if (!purple_account_get_remember_password(account))
- purple_account_set_password(account, NULL);
+ purple_account_set_password(account, NULL, NULL, NULL, NULL);
purple_connection_error(gc,
PURPLE_CONNECTION_ERROR_NAME_IN_USE,
_("You have signed on from another location"));
============================================================
--- libpurple/protocols/silc/silc.c eb51a13adb08cef20d96ffd5ca9117433429d5e2
+++ libpurple/protocols/silc/silc.c 8c294a40f7da18a4b09d98520ad9e0c8c55d5bde
@@ -481,7 +481,7 @@ static void silcpurple_got_password_cb(P
if (remember)
purple_account_set_remember_password(account, TRUE);
- purple_account_set_password(account, password);
+ purple_account_set_password(account, password, NULL, NULL, NULL);
/* Load SILC key pair */
g_snprintf(pkd, sizeof(pkd), "%s" G_DIR_SEPARATOR_S "public_key.pub", silcpurple_silcdir());
============================================================
--- libpurple/protocols/simple/simple.c 63bdc5aa575fcca526458dffc8d0f3e5f46e706c
+++ libpurple/protocols/simple/simple.c ab8137d06fa86ae5baf5d35434f9b352ba2ebb40
@@ -1122,7 +1122,7 @@ gboolean process_register_response(struc
purple_debug_info("simple", "REGISTER retries %d\n", sip->registrar.retries);
if(sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) {
if (!purple_account_get_remember_password(purple_connection_get_account(sip->gc)))
- purple_account_set_password(purple_connection_get_account(sip->gc), NULL);
+ purple_account_set_password(purple_connection_get_account(sip->gc), NULL, NULL, NULL, NULL);
purple_connection_error(sip->gc,
PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED,
_("Incorrect password"));
============================================================
--- libpurple/protocols/oscar/flap_connection.c 8d460706363a6bf9729a85421df39b77fb84dfc4
+++ libpurple/protocols/oscar/flap_connection.c f1b327e0232802d0d462071efd85647cb072ba97
@@ -468,7 +468,7 @@ flap_connection_destroy_cb(gpointer data
reason = PURPLE_CONNECTION_ERROR_NAME_IN_USE;
tmp = g_strdup(_("You have signed on from another location"));
if (!purple_account_get_remember_password(account))
- purple_account_set_password(account, NULL);
+ purple_account_set_password(account, NULL, NULL, NULL, NULL);
} else if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_CLOSED)
tmp = g_strdup(_("Server closed the connection"));
else if (conn->disconnect_reason == OSCAR_DISCONNECT_LOST_CONNECTION)
============================================================
--- finch/gntaccount.c b36428bda430a7567da2c61f3111eb74a65c5ca3
+++ finch/gntaccount.c db31cb6ba490433b56af291e87467c499c8c876f
@@ -199,9 +199,9 @@ save_account_cb(AccountEditDialog *dialo
gnt_check_box_get_checked(GNT_CHECK_BOX(dialog->remember)));
value = gnt_entry_get_text(GNT_ENTRY(dialog->password));
if (value && *value)
- purple_account_set_password_async(account, g_strdup(value), g_free, NULL, NULL);
+ purple_account_set_password(account, g_strdup(value), g_free, NULL, NULL);
else
- purple_account_set_password_async(account, NULL, NULL, NULL, NULL);
+ purple_account_set_password(account, NULL, NULL, NULL, NULL);
/* Mail notification */
purple_account_set_check_mail(account,
@@ -540,7 +540,7 @@ edit_account(PurpleAccount *account)
static void
edit_account(PurpleAccount *account)
{
- purple_account_get_password_async(account, edit_account_continue, account);
+ purple_account_get_password(account, edit_account_continue, account);
}
static void
============================================================
--- libpurple/example/nullclient.c 7ce05184affee34b5e04b9ebd09accef8ae55215
+++ libpurple/example/nullclient.c 2218a88e486f5880b6d35a695425d5941619983d
@@ -305,7 +305,7 @@ int main(int argc, char *argv[])
/* Get the password for the account */
password = getpass("Password: ");
- purple_account_set_password_async(account, g_strdup(password), g_free, NULL, NULL);
+ purple_account_set_password(account, g_strdup(password), g_free, NULL, NULL);
/* It's necessary to enable the account first. */
purple_account_set_enabled(account, UI_ID, TRUE);
============================================================
--- libpurple/protocols/myspace/myspace.c bb3d837c5d5383827e4435d283a8b24f260b6c13
+++ libpurple/protocols/myspace/myspace.c 8f259473fd909c851860799381c49f4304ee9f04
@@ -1836,7 +1836,7 @@ msim_error(MsimSession *session, MsimMes
case MSIM_ERROR_INCORRECT_PASSWORD: /* Incorrect password */
reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
if (!purple_account_get_remember_password(session->account))
- purple_account_set_password(session->account, NULL);
+ purple_account_set_password(session->account, NULL, NULL, NULL, NULL);
#ifdef MSIM_MAX_PASSWORD_LENGTH
if (purple_connection_get_password(session->gc) && (strlen(purple_connection_get_password(session->gc)) > MSIM_MAX_PASSWORD_LENGTH)) {
gchar *suggestion;
@@ -1861,7 +1861,7 @@ msim_error(MsimSession *session, MsimMes
case MSIM_ERROR_LOGGED_IN_ELSEWHERE: /* Logged in elsewhere */
reason = PURPLE_CONNECTION_ERROR_NAME_IN_USE;
if (!purple_account_get_remember_password(session->account))
- purple_account_set_password(session->account, NULL);
+ purple_account_set_password(session->account, NULL, NULL, NULL, NULL);
break;
}
purple_connection_error(session->gc, reason, full_errmsg);
============================================================
--- libpurple/keyring.h c0dc87c27bfe6f83494358c90e0c7493d3b0db7b
+++ libpurple/keyring.h c3a987482396d698dd34dad8461c9940e92abaa9
@@ -142,25 +142,6 @@ typedef void (*PurpleKeyringSave)(Purple
gpointer data);
/**
- * Read a password in an sync way. This is only used for API
- * compatibility, and plugins are not expected to support this.
- * Also, this should be dropped in 3.0.
- * @param account The account.
- * @return The password for the account.
- */
-typedef const char * (*PurpleKeyringReadSync)(const PurpleAccount * account);
-
-/**
- * Read a password in an sync way. This is only used for API
- * compatibility, and plugins are not expected to support this.
- * Also, this should be dropped in 3.0.
- * @param account The account.
- * @param password The password to save.
- */
-typedef void (*PurpleKeyringSaveSync)(PurpleAccount * account,
- const char * password);
-
-/**
* Close the keyring.
* This will be called so the keyring can do any cleanup it wants.
* @param error An error that may occur.
@@ -330,64 +311,31 @@ purple_keyring_export_password(PurpleAcc
/**
* Read a password from the active safe.
- * This should be renamed purple_keyring_get_password() when getting
- * to 3.0, while dropping purple_keyring_get_password_sync().
+ *
* @param account The account for which we want the password.
- * @param cb The callback to be called.
- * @param data A pointer passed to the callback.
+ * @param cb The callback to be called.
+ * @param data A pointer passed to the callback.
*/
void
-purple_keyring_get_password_async(PurpleAccount * account,
- PurpleKeyringReadCallback cb,
- gpointer data);
+purple_keyring_get_password(PurpleAccount *account,
+ PurpleKeyringReadCallback cb,
+ gpointer data);
/**
* Set a password to be remembered.
- * This should be renamed purple_keyring_set_password() when getting
- * to 3.0, while dropping purple_keyring_set_password_sync().keyring
- * @param account The account for which the password is to be saved.
- * @param password The password to save.
- * @param destroypassword A function called to free the password. Can be NULL.
- * @param cb A callback for once the password is saved.
- * @param data A pointer to be passed to the callback.
- */
-void
-purple_keyring_set_password_async(PurpleAccount * account,
- gchar * password,
- GDestroyNotify destroypassword,
- PurpleKeyringSaveCallback cb,
- gpointer data);
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * Read a password in a synchronous way.
*
- * @param account The account for which we want the password.
- *
- * @return A pointer to the the password
- *
- * @deprecated This is here only for compatibility reasons. Keyrings
- * are not expected to support this, and you should use
- * purple_keyring_get_password_async() instead.
- */
-const char *
-purple_keyring_get_password_sync(const PurpleAccount * account);
-#endif
-
-#ifndef PURPLE_DISABLE_DEPRECATED
-/**
- * Save a password in a synchronous way.
- *
- * @param account The account for which we want the password.
+ * @param account The account for which the password is to be saved.
* @param password The password to save.
- *
- * @deprecated This is here only for compatibility reasons. Keyrings are not
- * expected to support this, and you should use
- * purple_keyring_set_password_async() instead.
+ * @param destroy A function called to free the password. Can be NULL.
+ * @param cb A callback for once the password is saved.
+ * @param data A pointer to be passed to the callback.
*/
void
-purple_keyring_set_password_sync(PurpleAccount * account,
- const char *password);
-#endif
+purple_keyring_set_password(PurpleAccount *account,
+ gchar *password,
+ GDestroyNotify destroy,
+ PurpleKeyringSaveCallback cb,
+ gpointer data);
/**
* Close a safe.
@@ -421,8 +369,6 @@ PurpleKeyringSave purple_keyring_get_sav
const char * purple_keyring_get_id(const PurpleKeyring * info);
PurpleKeyringRead purple_keyring_get_read_password(const PurpleKeyring * info);
PurpleKeyringSave purple_keyring_get_save_password(const PurpleKeyring * info);
-PurpleKeyringReadSync purple_keyring_get_read_sync(const PurpleKeyring * info);
-PurpleKeyringSaveSync purple_keyring_get_save_sync(const PurpleKeyring * info);
PurpleKeyringClose purple_keyring_get_close_keyring(const PurpleKeyring * info);
PurpleKeyringChangeMaster purple_keyring_get_change_master(const PurpleKeyring * info);
PurpleKeyringImportPassword purple_keyring_get_import_password(const PurpleKeyring * info);
@@ -430,8 +376,6 @@ void purple_keyring_set_id(PurpleKeyring
void purple_keyring_set_name(PurpleKeyring * info, char * name);
void purple_keyring_set_id(PurpleKeyring * info, char * id);
-void purple_keyring_set_read_sync(PurpleKeyring * info, PurpleKeyringReadSync read);
-void purple_keyring_set_save_sync(PurpleKeyring * info, PurpleKeyringSaveSync save);
void purple_keyring_set_read_password(PurpleKeyring * info, PurpleKeyringRead read);
void purple_keyring_set_save_password(PurpleKeyring * info, PurpleKeyringSave save);
void purple_keyring_set_close_keyring(PurpleKeyring * info, PurpleKeyringClose close);
============================================================
--- libpurple/keyring.c 5e80280cb8a5a9efb2229c91ef44cc9e6147df81
+++ libpurple/keyring.c 4618bf09319f12f67f5a91008c04710daf8db6ba
@@ -61,8 +61,6 @@ struct _PurpleKeyring
PurpleKeyringChangeMaster change_master;
PurpleKeyringImportPassword import_password;
PurpleKeyringExportPassword export_password;
- PurpleKeyringReadSync read_sync;
- PurpleKeyringSaveSync save_sync;
gpointer r1; /* RESERVED */
gpointer r2; /* RESERVED */
gpointer r3; /* RESERVED */
@@ -135,22 +133,6 @@ purple_keyring_get_save_password(const P
return keyring->save_password;
}
-PurpleKeyringReadSync
-purple_keyring_get_read_sync(const PurpleKeyring * keyring)
-{
- g_return_val_if_fail(keyring != NULL, NULL);
-
- return keyring->read_sync;
-}
-
-PurpleKeyringSaveSync
-purple_keyring_get_save_sync(const PurpleKeyring * keyring)
-{
- g_return_val_if_fail(keyring != NULL, NULL);
-
- return keyring->save_sync;
-}
-
PurpleKeyringClose
purple_keyring_get_close_keyring(const PurpleKeyring * keyring)
{
@@ -225,26 +207,6 @@ purple_keyring_set_save_password(PurpleK
return;
}
-void
-purple_keyring_set_read_sync(PurpleKeyring * keyring, PurpleKeyringReadSync read)
-{
- g_return_if_fail(keyring != NULL);
-
- keyring->read_sync = read;
-
- return;
-}
-
-void
-purple_keyring_set_save_sync(PurpleKeyring * keyring, PurpleKeyringSaveSync save)
-{
- g_return_if_fail(keyring != NULL);
-
- keyring->save_sync = save;
-
- return;
-}
-
void
purple_keyring_set_close_keyring(PurpleKeyring * keyring, PurpleKeyringClose close)
{
@@ -505,7 +467,7 @@ purple_keyring_set_inuse_check_error_cb(
* schedule_accounts_save() function, but other such functions
* are not exposed. So these was done for consistency.
*/
- purple_account_set_password_async(NULL, NULL, NULL, NULL, NULL);
+ purple_account_set_password(NULL, NULL, NULL, NULL, NULL);
return;
}
@@ -904,15 +866,10 @@ purple_keyring_export_password(PurpleAcc
return export(account, mode, data, error, destroy);
}
-
-/**
- * This should be renamed purple_keyring_get_password() when getting
- * to 3.0, while dropping purple_keyring_get_password_sync().
- */
void
-purple_keyring_get_password_async(PurpleAccount * account,
- PurpleKeyringReadCallback cb,
- gpointer data)
+purple_keyring_get_password(PurpleAccount *account,
+ PurpleKeyringReadCallback cb,
+ gpointer data)
{
GError * error = NULL;
const PurpleKeyring * inuse;
@@ -960,16 +917,12 @@ purple_keyring_get_password_async(Purple
return;
}
-/**
- * This should be renamed purple_keyring_set_password() when getting
- * to 3.0, while dropping purple_keyring_set_password_sync().
- */
void
-purple_keyring_set_password_async(PurpleAccount * account,
- gchar * password,
- GDestroyNotify destroypassword,
- PurpleKeyringSaveCallback cb,
- gpointer data)
+purple_keyring_set_password(PurpleAccount * account,
+ gchar *password,
+ GDestroyNotify destroy,
+ PurpleKeyringSaveCallback cb,
+ gpointer data)
{
GError * error = NULL;
const PurpleKeyring * inuse;
@@ -999,7 +952,7 @@ purple_keyring_set_password_async(Purple
cbinfo = g_malloc(sizeof(PurpleKeyringCbInfo));
cbinfo->cb = cb;
cbinfo->data = data;
- save(account, password, destroypassword,
+ save(account, password, destroy,
purple_keyring_set_password_async_cb, data);
}
}
@@ -1031,68 +984,6 @@ purple_keyring_set_password_async_cb(Pur
g_free(data);
}
-/**
- * This should be dropped at 3.0 (it's here for compatibility)
- */
-const char *
-purple_keyring_get_password_sync(const PurpleAccount * account)
-{
- PurpleKeyringReadSync read;
- const PurpleKeyring * inuse;
-
- g_return_val_if_fail(account != NULL, NULL);
-
- purple_debug_info("keyring (_sync_)",
- "Reading password for account %s (%s)",
- purple_account_get_username(account),
- purple_account_get_protocol_id(account));
-
- inuse = purple_keyring_get_inuse();
-
- if (inuse == NULL) {
- return NULL;
-
- } else {
- read = purple_keyring_get_read_sync(inuse);
-
- if (read == NULL)
- return NULL;
- else
- return read(account);
- }
-}
-
-/**
- * This should be dropped at 3.0 (it's here for compatibility)
- */
-void
-purple_keyring_set_password_sync(PurpleAccount * account,
- const char *password)
-{
- PurpleKeyringSaveSync save;
- const PurpleKeyring * inuse;
-
- purple_debug_info("keyring (_sync_)",
- "Setting password for account %s (%s)",
- purple_account_get_username(account),
- purple_account_get_protocol_id(account));
-
- g_return_if_fail(account != NULL);
-
- inuse = purple_keyring_get_inuse();
- if (inuse != NULL) {
- save = purple_keyring_get_save_sync(inuse);
-
- if (save != NULL)
- return save(account, password);
- }
-
- /* schedule account save */
- purple_account_set_password(NULL, NULL);
-
- return;
-}
-
void
purple_keyring_close(PurpleKeyring * keyring,
GError ** error)
============================================================
--- libpurple/plugins/keyrings/gnomekeyring.c b12e8e7f5cfa00c9e7b36d074dda7125a51cd6cc
+++ libpurple/plugins/keyrings/gnomekeyring.c 532b8dafd7590a343b59a1ae070fb4272c96c7d2
@@ -82,8 +82,6 @@ static void gkp_save_continue(GnomeKeyr
static void gkp_read_continue(GnomeKeyringResult, const char *, gpointer);
static void gkp_save(PurpleAccount *, gchar *, GDestroyNotify, PurpleKeyringSaveCallback, gpointer);
static void gkp_save_continue(GnomeKeyringResult, gpointer);
-static const char * gkp_read_sync(const PurpleAccount *);
-static void gkp_save_sync(PurpleAccount *, const gchar *);
static void gkp_close(GError **);
static gboolean gkp_import_password(PurpleAccount *, const char *, const char *, GError **);
static gboolean gkp_export_password(PurpleAccount *, const char **, char **, GError **, GDestroyNotify *);
@@ -309,68 +307,7 @@ gkp_save_continue(GnomeKeyringResult res
}
}
-static const char *
-gkp_read_sync(const PurpleAccount * account)
-/**
- * This is tricky, since the calling function will not free the password.
- * Since we free the password on the next request, the last request will leak.
- * But that part of the code shouldn't be used anyway. It might however be an issue
- * if another call is made and the old pointer still used.
- * Elegant solution would include a hashtable or a linked list, but would be
- * complex. Also, this might just be dropped at 1.0 of the plugin
- */
-{
- GnomeKeyringResult result;
- static char * password = NULL;
-
- purple_debug_info("Gnome-Keyring plugin (_sync_)", "password for %s was read.\n",
- purple_account_get_username(account));
-
- gnome_keyring_free_password(password);
-
- result = gnome_keyring_find_password_sync(GNOME_KEYRING_NETWORK_PASSWORD,
- &password,
- "user", purple_account_get_username(account),
- "protocol", purple_account_get_protocol_id(account),
- NULL);
-
- return password;
-}
-
static void
-gkp_save_sync(PurpleAccount * account,
- const char * password)
-{
- const char * name;
-
- if(password != NULL && *password != '\0') {
-
- name =g_strdup_printf("pidgin-%s", purple_account_get_username(account)),
-
- gnome_keyring_store_password_sync(GNOME_KEYRING_NETWORK_PASSWORD,
- NULL, name, password,
- "user", purple_account_get_username(account),
- "protocol", purple_account_get_protocol_id(account),
- NULL);
- purple_debug_info("GnomeKeyring plugin (_sync_)",
- "Updated password for account %s (%s).\n",
- purple_account_get_username(account),
- purple_account_get_protocol_id(account));
-
- } else {
- gnome_keyring_delete_password_sync(GNOME_KEYRING_NETWORK_PASSWORD,
- "user", purple_account_get_username(account),
- "protocol", purple_account_get_protocol_id(account),
- NULL);
- purple_debug_info("GnomeKeyring plugin (_sync_)",
- "Deleted password for account %s (%s).\n",
- purple_account_get_username(account),
- purple_account_get_protocol_id(account));
-
- }
-}
-
-static void
gkp_close(GError ** error)
{
return;
@@ -428,8 +365,6 @@ gkp_init()
purple_keyring_set_name(keyring_handler, GNOMEKEYRING_NAME);
purple_keyring_set_id(keyring_handler, GNOMEKEYRING_ID);
- purple_keyring_set_read_sync(keyring_handler, gkp_read_sync);
- purple_keyring_set_save_sync(keyring_handler, gkp_save_sync);
purple_keyring_set_read_password(keyring_handler, gkp_read);
purple_keyring_set_save_password(keyring_handler, gkp_save);
purple_keyring_set_close_keyring(keyring_handler, gkp_close);
============================================================
--- libpurple/plugins/keyrings/internalkeyring.c 500449bc297a3b9093a4e3c9e1477788970c554e
+++ libpurple/plugins/keyrings/internalkeyring.c a40b49d8f39c60d307739e4b6d2ccd9625062881
@@ -75,8 +75,6 @@ static void internal_keyring_save(Purp
/* a few prototypes : */
static void internal_keyring_read(PurpleAccount *, PurpleKeyringReadCallback, gpointer);
static void internal_keyring_save(PurpleAccount *, gchar *, GDestroyNotify, PurpleKeyringSaveCallback, gpointer);
-static const char * internal_keyring_read_sync(const PurpleAccount *);
-static void internal_keyring_save_sync(PurpleAccount *, const gchar *);
static void internal_keyring_close(GError **);
static void internal_keyring_open(void);
static gboolean internal_keyring_import_password(PurpleAccount *, const char *, const char *, GError **);
@@ -156,46 +154,7 @@ internal_keyring_save(PurpleAccount * ac
}
-static const char *
-internal_keyring_read_sync(const PurpleAccount * account)
-{
- ACTIVATE();
-
- purple_debug_info("Internal Keyring (_sync_)",
- "Password for %s (%s) was read.\n",
- purple_account_get_username(account),
- purple_account_get_protocol_id(account));
-
- return GET_PASSWORD(account);
-}
-
static void
-internal_keyring_save_sync(PurpleAccount * account,
- const char * password)
-{
- gchar * copy;
-
- ACTIVATE();
-
- if (password == NULL || *password == '\0') {
- g_hash_table_remove(internal_keyring_passwords, account);
- purple_debug_info("Internal Keyring (_sync_)",
- "Password for %s (%s) was deleted.\n",
- purple_account_get_username(account),
- purple_account_get_protocol_id(account));
- } else {
- copy = g_strdup(password);
- SET_PASSWORD(account, copy);
- purple_debug_info("Internal Keyring (_sync_)",
- "Password for %s (%s) was set.\n",
- purple_account_get_username(account),
- purple_account_get_protocol_id(account));
- }
-
- return;
-}
-
-static void
internal_keyring_close(GError ** error)
{
internal_keyring_is_active = FALSE;
@@ -279,8 +238,6 @@ internal_keyring_init()
purple_keyring_set_name(keyring_handler, INTERNALKEYRING_NAME);
purple_keyring_set_id(keyring_handler, INTERNALKEYRING_ID);
- purple_keyring_set_read_sync(keyring_handler, internal_keyring_read_sync);
- purple_keyring_set_save_sync(keyring_handler, internal_keyring_save_sync);
purple_keyring_set_read_password(keyring_handler, internal_keyring_read);
purple_keyring_set_save_password(keyring_handler, internal_keyring_save);
purple_keyring_set_close_keyring(keyring_handler, internal_keyring_close);
============================================================
--- libpurple/plugins/keyrings/kwallet.cpp fe36e9f0f166533cfc01dbda24f405d69b404a4c
+++ libpurple/plugins/keyrings/kwallet.cpp 0790b29d9eed817e00c99d66c4b4aaa93d2dcf21
@@ -377,8 +377,6 @@ kwallet_load(PurplePlugin *plugin)
purple_keyring_set_name(keyring_handler, GNOMEKEYRING_NAME);
purple_keyring_set_id(keyring_handler, GNOMEKEYRING_ID);
- purple_keyring_set_read_sync(keyring_handler, gkp_read_sync);
- purple_keyring_set_save_sync(keyring_handler, gkp_save_sync);
purple_keyring_set_read_password(keyring_handler, gkp_read);
purple_keyring_set_save_password(keyring_handler, gkp_save);
purple_keyring_set_close_keyring(keyring_handler, gkp_close);
============================================================
--- libpurple/plugins/one_time_password.c 5a348ad64f54f7a0438ce18b5c863d8c0ac8e937
+++ libpurple/plugins/one_time_password.c 1c1366daa9b160a8ce8897969141cc14eb05726a
@@ -46,7 +46,7 @@ signed_on_cb(PurpleConnection *conn, voi
purple_account_get_username(account),
purple_account_get_protocol_name(account));
- purple_account_set_password(account, NULL);
+ purple_account_set_password(account, NULL, NULL, NULL, NULL);
/* TODO: Do we need to somehow clear conn->password ? */
}
}
============================================================
--- libpurple/protocols/oscar/clientlogin.c d88d9cd7dc6bbc07f337e5a4fb727fb95284a258
+++ libpurple/protocols/oscar/clientlogin.c b09a25144fddd328e8df35800ca30b89638eb37e
@@ -481,7 +481,7 @@ static gboolean parse_client_login_respo
if (status_code == 330 && status_detail_code == 3011) {
PurpleAccount *account = purple_connection_get_account(gc);
if (!purple_account_get_remember_password(account))
- purple_account_set_password(account, NULL);
+ purple_account_set_password(account, NULL, NULL, NULL, NULL);
purple_connection_error(gc,
PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED,
_("Incorrect password"));
============================================================
--- libpurple/protocols/jabber/auth_cyrus.c 78c174f96adac3eca018bfa035a07752d4ebdb90
+++ libpurple/protocols/jabber/auth_cyrus.c cf46c9930b24df660546af79a3152a9ad84f532f
@@ -154,7 +154,7 @@ static void auth_pass_cb(PurpleConnectio
if (remember)
purple_account_set_remember_password(account, TRUE);
- purple_account_set_password(account, entry);
+ purple_account_set_password(account, entry, NULL, NULL, NULL);
/* Rebuild our callbacks as we now have a password to offer */
jabber_sasl_build_callbacks(js);
============================================================
--- libpurple/protocols/mxit/actions.c 476046a57c005057b794d206d51bfa0a899e5174
+++ libpurple/protocols/mxit/actions.c e8540358fff4167d0d67f06c5869913b9487d5bd
@@ -335,7 +335,7 @@ out:
out:
if ( !err ) {
/* update PIN in account */
- purple_account_set_password( session->acc, pin );
+ purple_account_set_password( session->acc, pin, NULL, NULL, NULL );
/* update session object */
g_free( session->encpwd );
============================================================
--- libpurple/protocols/mxit/login.c 666f156b2bb33e3e5164d9b156cd434a37617665
+++ libpurple/protocols/mxit/login.c 9346e1d4d9421bd076179d04f4a34e3a82147bcc
@@ -284,7 +284,7 @@ out:
out:
if ( !err ) {
- purple_account_set_password( session->acc, session->profile->pin );
+ purple_account_set_password( session->acc, session->profile->pin, NULL, NULL, NULL );
mxit_login_connect( session );
}
else {
More information about the Commits
mailing list