talons

commit 34d66ef27d2d7d1180fd23a4ebf9b91a965a56b4
parent d4933e43f709edaa0aa5b1e7b95ad70532d96e99
Author: Colin Leroy <colin@colino.net>
Date:   Mon, 28 Sep 2009 07:04:15 +0000

2009-09-28 [colin]	3.7.2cvs40

	* src/prefs_summaries.c
	* src/gtk/sslcertwindow.c
		Fix bug 2006, 'Non-utf8 strftime(3) date strings
		shows up garbled in GUI'. Patch by Pawel Pekala

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/sslcertwindow.c
 | 
2
+-
M
src/prefs_summaries.c
 | 
9
+--------

5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-28 [colin]	3.7.2cvs40
+
+	* src/prefs_summaries.c
+	* src/gtk/sslcertwindow.c
+		Fix bug 2006, 'Non-utf8 strftime(3) date strings 
+		shows up garbled in GUI'. Patch by Pawel Pekala
+
 2009-09-24 [iwkse]	3.7.2cvs39
 
 	* configure.ac
diff --git a/PATCHSETS b/PATCHSETS
@@ -3864,3 +3864,4 @@
 ( cvs diff -u -r 1.654.2.3930 -r 1.654.2.3931 configure.ac;  ) > 3.7.2cvs37.patchset
 ( cvs diff -u -r 1.654.2.3931 -r 1.654.2.3932 configure.ac;  ) > 3.7.2cvs38.patchset
 ( cvs diff -u -r 1.654.2.3932 -r 1.654.2.3933 configure.ac;  ) > 3.7.2cvs39.patchset
+( cvs diff -u -r 1.1.2.60 -r 1.1.2.61 src/prefs_summaries.c;  cvs diff -u -r 1.9.2.28 -r 1.9.2.29 src/gtk/sslcertwindow.c;  ) > 3.7.2cvs40.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/sslcertwindow.c b/src/gtk/sslcertwindow.c
@@ -136,7 +136,7 @@ static GtkWidget *cert_presenter(SSLCertificate *cert)
 
 	memset(buf, 0, sizeof(buf));
 	if (exp_time_t > 0) {
-		strftime(buf, sizeof(buf)-1, prefs_common.date_format, localtime_r(&exp_time_t, &lt));
+		fast_strftime(buf, sizeof(buf)-1, prefs_common.date_format, localtime_r(&exp_time_t, &lt));
 		exp_date = (*buf) ? g_strdup(buf):g_strdup("?");
 	} else
 		exp_date = g_strdup("");
diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
@@ -767,15 +767,8 @@ static void date_format_entry_on_change(GtkEditable *editable,
 	text = gtk_editable_get_chars(editable, 0, -1);
 	if (text)
 		fast_strftime(buffer, sizeof buffer, text, cal_time); 
-	g_free(text);
-
-	text = conv_codeset_strdup(buffer,
-				   conv_get_locale_charset_str(),
-				   CS_UTF_8);
-	if (!text)
-		text = g_strdup(buffer);
 
-	gtk_label_set_text(example, text);
+	gtk_label_set_text(example, buffer);
 
 	g_free(text);
 }