2012-12-05 [mones] 3.9.0cvs42

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

diff --git a/ChangeLog b/ChangeLog
index 597634e76f939285290a3a1423c3ad3080410f2e..87a9217522da381689ef418ee046534ba5dfd42a 100644 (file)
--- 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
index 6b77119b73b5f4e477a9b3430121b30f21815117..ae2c6fad2909136024bd51c02bbf07bb937c8a66 100644 (file)
--- 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
index 344844145cccca118b3ab01c207d5431f7233fe9..61a4c3dfba5e01489ef558459241bdcfd9d52a11 100644 (file)
--- 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
index ba1eb541219fdbc9abbd4fc1941c79d61ec477c6..5045926801d0b92c746b13f3ebf5774c3727b9ae 100644 (file)
--- 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;