soc.2008.masterpassword: b0c94c5f: Make all the prpls build.

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: b0c94c5f3a7a8acb7cbce842049c72b9555e2a5d
Ancestor: d4d9d04801b2c552f44998e1e3fcc5f0297a1f14
Author: darkrain42 at pidgin.im
Date: 2009-08-29T01:11:36
Branch: im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/b0c94c5f3a7a8acb7cbce842049c72b9555e2a5d

Modified files:
        libpurple/account.c libpurple/protocols/gg/gg.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/silc/silc.c

ChangeLog: 

Make all the prpls build.

-------------- next part --------------
============================================================
--- libpurple/account.c	574e7a56aa0b5fe4b120833522f0091a52a6c3f3
+++ libpurple/account.c	7475229ff246ca8e4241af535d6b9a62fa2643e7
@@ -1274,7 +1274,7 @@ purple_account_connect(PurpleAccount *ac
 purple_account_connect(PurpleAccount *account)
 {
 	PurplePlugin *prpl;
-	const char *password, *username;
+	const char *username;
 	PurplePluginProtocolInfo *prpl_info;
 
 	g_return_if_fail(account != NULL);
============================================================
--- libpurple/protocols/gg/gg.c	cb4b050fc724745554f12aae5674ba86dde9e9c8
+++ libpurple/protocols/gg/gg.c	acd08c3900455bff4176697f92af8ea23b2e842d
@@ -653,7 +653,7 @@ static void ggp_callback_change_passwd_o
 		goto exit_err;
 	}
 
-	if (g_utf8_collate(cur, purple_account_get_password(account)) != 0) {
+	if (g_utf8_collate(cur, purple_connection_get_password(gc)) != 0) {
 		purple_notify_error(account, NULL,
 			_("Your current password is different from the one that you specified."),
 			NULL);
@@ -664,7 +664,7 @@ static void ggp_callback_change_passwd_o
 
 	/* XXX: this email should be a pref... */
 	h = gg_change_passwd4(ggp_get_uin(account),
-			      "user at example.net", purple_account_get_password(account),
+			      "user at example.net", purple_connection_get_password(gc),
 			      p1, info->token->id, t, 0);
 
 	if (h == NULL) {
@@ -1924,7 +1924,7 @@ static void ggp_login(PurpleAccount *acc
 	gc->proto_data = info;
 
 	glp->uin = ggp_get_uin(account);
-	glp->password = (char *)purple_account_get_password(account);
+	glp->password = (char *)purple_connection_get_password(gc);
 	glp->image_size = 255;
 
 	presence = purple_account_get_presence(account);
============================================================
--- libpurple/protocols/jabber/auth.c	61b2ff9dacd9b550e6a7f89f2193c788876c3155
+++ libpurple/protocols/jabber/auth.c	1c173d2db277dfabaf945c939123aba46bf8b575
@@ -168,7 +168,7 @@ static int jabber_sasl_cb_secret(sasl_co
 static int jabber_sasl_cb_secret(sasl_conn_t *conn, void *ctx, int id, sasl_secret_t **secret)
 {
 	JabberStream *js = (JabberStream *)ctx;
-	const char *pw = purple_account_get_password(js->gc->account);
+	const char *pw = purple_connection_get_password(js->gc);
 	size_t len;
 	static sasl_secret_t *x = NULL;
 
@@ -320,7 +320,7 @@ static void jabber_auth_start_cyrus(Jabb
 				 * to get one
 				 */
 
-				if (!purple_account_get_password(js->gc->account)) {
+				if (!purple_connection_get_password(js->gc)) {
 					purple_account_request_password(js->gc->account, G_CALLBACK(auth_pass_cb), G_CALLBACK(auth_no_pass_cb), js->gc);
 					return;
 
@@ -457,7 +457,7 @@ jabber_sasl_build_callbacks(JabberStream
 	js->sasl_cb[id].context = (void *)js;
 	id++;
 
-	if (purple_account_get_password(js->gc->account) != NULL ) {
+	if (purple_connection_get_password(js->gc) != NULL ) {
 		js->sasl_cb[id].id = SASL_CB_PASS;
 		js->sasl_cb[id].proc = jabber_sasl_cb_secret;
 		js->sasl_cb[id].context = (void *)js;
@@ -710,7 +710,7 @@ void jabber_auth_start_old(JabberStream 
 	 * password prompting here
 	 */
 
-	if (!purple_account_get_password(js->gc->account)) {
+	if (!purple_connection_get_password(js->gc)) {
 		purple_account_request_password(js->gc->account, G_CALLBACK(auth_old_pass_cb), G_CALLBACK(auth_no_pass_cb), js->gc);
 		return;
 	}
============================================================
--- libpurple/protocols/sametime/sametime.c	4951653f013dc91cbf7c5c757e2aa443c52a8612
+++ libpurple/protocols/sametime/sametime.c	991629be8e54d4f3067e872ce7839c2a8a42179e
@@ -3764,7 +3764,7 @@ static void mw_prpl_login(PurpleAccount 
     return;
   }
 
-  pass = g_strdup(purple_account_get_password(account));
+  pass = g_strdup(purple_connection_get_password(gc));
   port = purple_account_get_int(account, MW_KEY_PORT, MW_PLUGIN_DEFAULT_PORT);
 
   DEBUG_INFO("user: '%s'\n", user);
============================================================
--- libpurple/protocols/silc/silc.c	e3cf2c2a73dda7a0f719883e805da6a454d3e2dc
+++ libpurple/protocols/silc/silc.c	60dd65b358af95ad15ceba46d8d8f19285a38cd4
@@ -529,7 +529,7 @@ static void silcpurple_running(SilcClien
 				(char *)purple_account_get_string(account, "private-key", prd),
 				(gc->password == NULL) ? "" : gc->password,
 				&sg->public_key, &sg->private_key)) {
-		if (!purple_account_get_password(account)) {
+		if (!purple_connection_get_password(gc)) {
 			purple_account_request_password(account, G_CALLBACK(silcpurple_got_password_cb),
 											G_CALLBACK(silcpurple_no_password_cb), gc);
 			return;