soc.2008.masterpassword: 07f36cf3: Cleaned up comments.
scrouaf at soc.pidgin.im
scrouaf at soc.pidgin.im
Wed Aug 27 06:05:49 EDT 2008
-----------------------------------------------------------------
Revision: 07f36cf3129d0994cc6af8789efe06805f3ff344
Ancestor: 6b263e8bb75fe25fb7cee16fabf09c7cbd187d0e
Author: scrouaf at soc.pidgin.im
Date: 2008-08-27T09:47:09
Branch: im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/07f36cf3129d0994cc6af8789efe06805f3ff344
Modified files:
libpurple/connection.c libpurple/keyring.c
libpurple/plugin.c
libpurple/plugins/keyrings/internalkeyring.c
ChangeLog:
Cleaned up comments.
-------------- next part --------------
============================================================
--- libpurple/connection.c 35b742592c0c80b40501ee6c1373f35bcc9ab821
+++ libpurple/connection.c 0c1ac740f4775b62c38ba986c4ec052ee91c24df
@@ -493,24 +493,10 @@ purple_connection_disconnect_cb(gpointer
purple_connection_disconnect_cb(gpointer data)
{
PurpleAccount *account = data;
-// purple_account_get_password_async(account, purple_connection_disconnect_got_pw_cb, NULL);
purple_account_disconnect(account);
return FALSE;
}
-#if 0
-static void
-purple_connection_disconnect_got_pw_cb(PurpleAccount * account,
- gchar * password,
- GError * error,
- gpointer data)
-{
- /* FIXME : needs to be async */
- purple_account_disconnect(account);
- purple_account_set_password(account, password);
-}
-#endif
-
void
purple_connection_error(PurpleConnection *gc, const char *text)
{
============================================================
--- libpurple/keyring.c ff60ee9a8363c4289d22bf6b490fd09342b39261
+++ libpurple/keyring.c b0b76fba211730665e51ab52b45fc8d7f3799564
@@ -53,8 +53,8 @@ struct _PurpleKeyring
struct _PurpleKeyring
{
- char * name; // a user friendly name
- char * id; // same as plugin id
+ char * name; /* a user friendly name */
+ char * id; /* same as plugin id */
PurpleKeyringRead read_password;
PurpleKeyringSave save_password;
PurpleKeyringClose close_keyring;
============================================================
--- libpurple/plugin.c cf2ee324978db141392e5b749edadd703404cc0d
+++ libpurple/plugin.c 8c93ce69cb457b7494f30374d6cc95a340db7569
@@ -492,7 +492,7 @@ purple_plugin_probe(const char *filename
if (plugin->info->flags & PURPLE_PLUGIN_FLAG_AUTOLOAD) {
purple_debug_info("plugins", "Loading autoload plugin %s\n",
plugin->path);
- purple_plugin_load(plugin); //
+ purple_plugin_load(plugin);
}
return plugin;
============================================================
--- libpurple/plugins/keyrings/internalkeyring.c c9c9d27e5b6608a09d11f40795b01e12eed314f2
+++ libpurple/plugins/keyrings/internalkeyring.c 500449bc297a3b9093a4e3c9e1477788970c554e
@@ -257,13 +257,6 @@ internal_keyring_export_password(PurpleA
purple_debug_info("Internal keyring",
"Exporting password");
- /* we're using this rather than GET_PASSWORD(),
- * because on account creation, the account might be
- * exported before the password is known. This would
- * lead to exporting uninitialised data, which
- * we obviously don't want.
- */
- //password = purple_account_get_password(account);
password = GET_PASSWORD(account);
if (password == NULL) {
More information about the Commits
mailing list