/cpw/tomkiewicz/masterpassword: 488d3280e151: Replace g_free wit...

[Tomasz Wasilczyk]

Changeset: 488d3280e151fdf874370dfa8f0efc5669b0108b
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2013-04-28 15:24 +0200
Branch:	 soc.2008.masterpassword
URL: https://hg.pidgin.im/cpw/tomkiewicz/masterpassword/rev/488d3280e151

Description:

Replace g_free with purple_str_wipe, correct line breaking

diffstat:

 libpurple/keyring.c            |  4 ++--
 libpurple/protocols/irc/msgs.c |  3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (34 lines):

diff --git a/libpurple/keyring.c b/libpurple/keyring.c
--- a/libpurple/keyring.c
+++ b/libpurple/keyring.c
@@ -105,7 +105,7 @@ purple_keyring_failed_import_free(Purple
 
 	g_free(import->keyring_id);
 	g_free(import->mode);
-	g_free(import->data);
+	purple_str_wipe(import->data);
 	g_free(import);
 }
 
@@ -730,7 +730,7 @@ purple_keyring_export_password(PurpleAcc
 			*keyring_id = import->keyring_id;
 			*mode = import->mode;
 			*data = g_strdup(import->data);
-			*destroy = g_free;
+			*destroy = purple_str_wipe;
 			return TRUE;
 		}
 	}
diff --git a/libpurple/protocols/irc/msgs.c b/libpurple/protocols/irc/msgs.c
--- a/libpurple/protocols/irc/msgs.c
+++ b/libpurple/protocols/irc/msgs.c
@@ -1471,7 +1471,8 @@ irc_sasl_cb_secret(sasl_conn_t *conn, vo
 	const char *pw;
 	size_t len;
 
-	pw = purple_connection_get_password(purple_account_get_connection(irc->account));
+	pw = purple_connection_get_password(purple_account_get_connection(
+		irc->account));
 
 	if (!conn || !secret || id != SASL_CB_PASS)
 		return SASL_BADPARAM;