talons

commit f29185278aff4fcb63b3bf44bc45478f4dd682c7
parent f851947030285dd8e3fcfb73725f2d2b1f51f76b
Author: Ricardo Mones <mones@claws-mail.org>
Date:   Thu,  6 Dec 2012 00:00:29 +0000

2012-12-05 [mones]	3.9.0cvs42

	* src/prefs_gtk.c
		Do not set to NULL string preferences which have "" as
		default value

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/prefs_gtk.c
 | 
4
+---

4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-05 [mones]	3.9.0cvs42
+
+	* src/prefs_gtk.c
+		Do not set to NULL string preferences which have "" as
+		default value
+
 2012-12-05 [colin]	3.9.0cvs41
 
 	* src/common/ssl.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4539,3 +4539,4 @@
 ( cvs diff -u -r 1.43.2.135 -r 1.43.2.136 src/toolbar.c;  ) > 3.9.0cvs39.patchset
 ( cvs diff -u -r 1.395.2.460 -r 1.395.2.461 src/summaryview.c;  cvs diff -u -r 1.274.2.362 -r 1.274.2.363 src/mainwindow.c;  ) > 3.9.0cvs40.patchset
 ( cvs diff -u -r 1.9.2.59 -r 1.9.2.60 src/common/ssl.c;  ) > 3.9.0cvs41.patchset
+( cvs diff -u -r 1.10.2.44 -r 1.10.2.45 src/prefs_gtk.c;  ) > 3.9.0cvs42.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=41
+EXTRA_VERSION=42
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
@@ -452,11 +452,9 @@ void prefs_set_default(PrefParam *param)
 						g_strconcat(get_home_dir(),
 							    param[i].defval + 1,
 							    NULL);
-				else if (param[i].defval[0] != '\0')
+				else 
 					*((gchar **)param[i].data) =
 						g_strdup(param[i].defval);
-				else
-					*((gchar **)param[i].data) = NULL;
 			} else
 				*((gchar **)param[i].data) = NULL;
 			break;