2006-10-09 [paul] 2.5.3cvs25

	* src/prefs_summaries.c
		replace strftime() with fast_strftime() and in
		the consequence fix the bug in the display of
		AM/PM in the 'Example' string

diff --git a/ChangeLog b/ChangeLog
index 728f40d3e784cfa0fabc00e0b2b2e806486b906f..6a082e16c088e4eecdbf0ca7bc3363e40f0652a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-09 [paul]      2.5.3cvs25
+
+       * src/prefs_summaries.c
+               replace strftime() with fast_strftime() and in
+               the consequence fix the bug in the display of
+               AM/PM in the 'Example' string
+
 2006-10-09 [ticho]     2.5.3cvs24
 
        * po/sk.po

diff --git a/PATCHSETS b/PATCHSETS
index 89d460fd71863a4f54513b6510151d8684cb238c..dfbbc35766ddf658e6c34f22d4ca4920a5b6253e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1979,3 +1979,4 @@
 ( cvs diff -u -r 1.10.2.22 -r 1.10.2.23 src/prefs_gtk.c;  ) > 2.5.3cvs22.patchset
 ( cvs diff -u -r 1.52.2.27 -r 1.52.2.28 src/prefs_folder_item.c;  ) > 2.5.3cvs23.patchset
 ( cvs diff -u -r 1.2.2.21 -r 1.2.2.22 po/sk.po;  ) > 2.5.3cvs24.patchset
+( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/prefs_summaries.c;  ) > 2.5.3cvs25.patchset

diff --git a/configure.ac b/configure.ac
index 05358accf480f5cbe6e78e78e7a9517beb2d0643..9c84ee96a6efef8231c68a4b10231042bf59747a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=24
+EXTRA_VERSION=25
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index 4444c81acc38dc05958c5d71558cf275cc4545ba..924b19ab8c95956daaea2dca53b6355fef681a05 100644 (file)
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -1156,7 +1156,7 @@ static void date_format_entry_on_change(GtkEditable *editable,
        buffer[0] = 0;
        text = gtk_editable_get_chars(editable, 0, -1);
        if (text)
-               strftime(buffer, sizeof buffer, text, cal_time); 
+               fast_strftime(buffer, sizeof buffer, text, cal_time); 
        g_free(text);
 
        text = conv_codeset_strdup(buffer,