From: Tristan Chabredier <wwp@claws-mail.org>
Date: Sun, 3 Jun 2007 19:52:31 +0000 (+0000)
Subject: 2007-06-03 [wwp]	2.9.2cvs30
X-Git-Tag: rel_2_10_0~52
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=6c11937a8f0dc8360109b85a684f80d3d1153966

2007-06-03 [wwp]	2.9.2cvs30

	* src/prefs_gtk.c
		Don't decode leading ENV_ and ~ in P_PASSWORD
		values.
---

diff --git a/ChangeLog b/ChangeLog
index 62eca8db3..e2d3f2cab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-06-03 [wwp]	2.9.2cvs30
+
+	* src/prefs_gtk.c
+		Don't decode leading ENV_ and ~ in P_PASSWORD
+		values.
+
+2007-06-03 [wwp]	2.9.2cvs29
+
+	* src/prefs_gtk.c
+		Don't decode leading ENV_ and ~ in P_PASSWORD
+		values.
+
 2007-06-03 [wwp]	2.9.2cvs28
 
 	* src/prefs_account.c
diff --git a/PATCHSETS b/PATCHSETS
index 2513d7441..03fe2e60f 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2604,3 +2604,5 @@
 ( cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/prefs_compose_writing.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/prefs_quote.c;  ) > 2.9.2cvs26.patchset
 ( cvs diff -u -r 1.60.2.89 -r 1.60.2.90 src/addressbook.c;  cvs diff -u -r 1.17.2.33 -r 1.17.2.34 src/alertpanel.c;  cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/alertpanel.h;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/ldapupdate.c;  ) > 2.9.2cvs27.patchset
 ( cvs diff -u -r 1.105.2.96 -r 1.105.2.97 src/prefs_account.c;  cvs diff -u -r 1.12.2.33 -r 1.12.2.34 src/gtk/prefswindow.c;  cvs diff -u -r 1.7.2.8 -r 1.7.2.9 src/gtk/prefswindow.h;  ) > 2.9.2cvs28.patchset
+( cvs diff -u -r 1.10.2.31 -r 1.10.2.32 src/prefs_gtk.c;  ) > 2.9.2cvs29.patchset
+( cvs diff -u -r 1.10.2.31 -r 1.10.2.32 src/prefs_gtk.c;  ) > 2.9.2cvs30.patchset
diff --git a/configure.ac b/configure.ac
index 1880e6ac7..9444cb175 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=30
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index d268fac73..e02263d9c 100644
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -425,7 +425,6 @@ void prefs_set_default(PrefParam *param)
 
 		switch (param[i].type) {
 		case P_STRING:
-		case P_PASSWORD:
 			g_free(*((gchar **)param[i].data));
 			if (param[i].defval != NULL) {
 				if (!strncasecmp(param[i].defval, "ENV_", 4)) {
@@ -456,6 +455,17 @@ void prefs_set_default(PrefParam *param)
 			} else
 				*((gchar **)param[i].data) = NULL;
 			break;
+		case P_PASSWORD:
+			g_free(*((gchar **)param[i].data));
+			if (param[i].defval != NULL) {
+				if (param[i].defval[0] != '\0')
+					*((gchar **)param[i].data) =
+						g_strdup(param[i].defval);
+				else
+					*((gchar **)param[i].data) = NULL;
+			} else
+				*((gchar **)param[i].data) = NULL;
+			break;
 		case P_INT:
 			if (param[i].defval != NULL)
 				*((gint *)param[i].data) =
@@ -633,7 +643,6 @@ void prefs_set_dialog_to_default(PrefParam *param)
 
 		switch (tmpparam.type) {
 		case P_STRING:
-		case P_PASSWORD:
 			if (tmpparam.defval) {
 				if (!g_ascii_strncasecmp(tmpparam.defval, "ENV_", 4)) {
 					str_data = g_strdup(g_getenv(param[i].defval + 4));
@@ -650,6 +659,9 @@ void prefs_set_dialog_to_default(PrefParam *param)
 			}
 			tmpparam.data = &tmpparam.defval;
 			break;
+		case P_PASSWORD:
+			tmpparam.data = &tmpparam.defval;
+			break;
 		case P_INT:
 			if (tmpparam.defval)
 				int_data = atoi(tmpparam.defval);