# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1225566535 0
# Node ID dcb1960ed69d60e5e59b089fbaaf2af22e7b1e52
# Parent  ca7b726c883162aaa7dd081da629160806f6d4a8# Parent  15d6fd6b08a2376ef9d517cf86ddcc026fab109f
merge of '602d7960555cc685575a2a32397427df3e55a9a7'
     and 'bcd6dbfb605e7969c586fa89f022a3877b9a8c48'

diff -r ca7b726c8831 -r dcb1960ed69d libpurple/plugins/ssl/ssl-nss.c
--- a/libpurple/plugins/ssl/ssl-nss.c	Sat Nov 01 19:07:22 2008 +0000
+++ b/libpurple/plugins/ssl/ssl-nss.c	Sat Nov 01 19:08:55 2008 +0000
@@ -757,7 +757,7 @@
 	crt_dat = X509_NSS_DATA(crt);
 	g_return_val_if_fail(crt_dat, NULL);
 
-	return g_strdup(crt_dat->subjectName);
+	return g_strdup(crt_dat->issuerName);
 }
 
 static gchar *
diff -r ca7b726c8831 -r dcb1960ed69d pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Sat Nov 01 19:07:22 2008 +0000
+++ b/pidgin/gtkaccount.c	Sat Nov 01 19:08:55 2008 +0000
@@ -562,7 +562,8 @@
 
 	/* Set the fields. */
 	if (dialog->account != NULL) {
-		if (purple_account_get_password(dialog->account))
+		if (purple_account_get_password(dialog->account) &&
+		    purple_account_get_remember_password(dialog->account))
 			gtk_entry_set_text(GTK_ENTRY(dialog->password_entry),
 							   purple_account_get_password(dialog->account));
 
diff -r ca7b726c8831 -r dcb1960ed69d pidgin/gtkconn.c
--- a/pidgin/gtkconn.c	Sat Nov 01 19:07:22 2008 +0000
+++ b/pidgin/gtkconn.c	Sat Nov 01 19:08:55 2008 +0000
@@ -208,7 +208,10 @@
 	while (l) {
 		PurpleAccount *a = (PurpleAccount*)l->data;
 		if (!purple_account_is_disconnected(a)) {
+			char *password = g_strdup(purple_account_get_password(a));
 			purple_account_disconnect(a);
+			purple_account_set_password(a, password);
+			g_free(password);
 		}
 		l = l->next;
 	}