2006-04-09 [colin] 2.1.0cvs24

	* src/prefs_common.c
		gettext() returns statically allocated stuff. We have
		to strdup it in order to be able to free it.

diff --git a/ChangeLog b/ChangeLog
index 0f8d13d39d658d4fee345871551dedc9b96c244e..6d129d75c5a4b5805f61207ad50441673e233c02 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-09 [colin]     2.1.0cvs24
+
+       * src/prefs_common.c
+               gettext() returns statically allocated stuff. We have
+               to strdup it in order to be able to free it.
+
 2006-04-09 [colin]     2.1.0cvs23
 
        * AUTHORS

diff --git a/PATCHSETS b/PATCHSETS
index fc8b8ab13f7d8baa456e600e603467f957253341..dbb8baa2558161202a78f9f1dee7fcccbdae51a2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1395,3 +1395,4 @@
 ( cvs diff -u -r 1.105.2.50 -r 1.105.2.51 src/prefs_account.c;  cvs diff -u -r 1.16.2.18 -r 1.16.2.19 src/prefs_customheader.c;  ) > 2.1.0cvs21.patchset
 ( cvs diff -u -r 1.274.2.105 -r 1.274.2.106 src/mainwindow.c;  cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/gtk/quicksearch.c;  ) > 2.1.0cvs22.patchset
 ( cvs diff -u -r 1.100.2.37 -r 1.100.2.38 AUTHORS;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/gtk/authors.h;  ) > 2.1.0cvs23.patchset
+( cvs diff -u -r 1.204.2.81 -r 1.204.2.82 src/prefs_common.c;  ) > 2.1.0cvs24.patchset

diff --git a/configure.ac b/configure.ac
index cb3056f20a4d06f606922f6037c7af0d773ba0e0..18ebeadd29596954378d3a6582e6d6a727349b83 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=23
+EXTRA_VERSION=24
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 5fa19a95aee64c6fcdca8a71d03eee21d4e17dfd..297fcb2382e2e92c31ceacf3981e7a7205fc8c5b 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -790,6 +790,7 @@ GList *prefs_common_read_history(const gchar *history)
 void prefs_common_read_config(void)
 {
        gchar *rcpath;
+       gchar *tmp;
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);
        prefs_read_config(param, "Common", rcpath, NULL);
@@ -799,9 +800,17 @@ void prefs_common_read_config(void)
 
        g_free(rcpath);
 
-       prefs_common.quotefmt = gettext(prefs_common.quotefmt);
-       prefs_common.fw_quotefmt = gettext(prefs_common.fw_quotefmt);
-       prefs_common.date_format = gettext(prefs_common.date_format);
+       tmp = g_strdup(gettext(prefs_common.quotefmt));
+       g_free(prefs_common.quotefmt);
+       prefs_common.quotefmt = tmp;
+
+       tmp = g_strdup(gettext(prefs_common.fw_quotefmt));
+       g_free(prefs_common.fw_quotefmt);
+       prefs_common.fw_quotefmt = tmp;
+       
+       tmp = g_strdup(gettext(prefs_common.date_format));
+       g_free(prefs_common.date_format);
+       prefs_common.date_format = tmp;
 
        prefs_common.mime_open_cmd_history =
                prefs_common_read_history(COMMAND_HISTORY);