talons

commit fdbd5efda763343c43048ed2e06de3a1ca1f8fd7
parent 315a839750c45604226cfc0c6695f5a0e421d881
Author: Tristan Chabredier <wwp@claws-mail.org>
Date:   Fri,  6 Jul 2012 09:19:45 +0000

2012-07-06 [wwp]	3.8.1cvs6

	* src/main.c
	* src/gtk/about.c
		Session statistics: format date following global prefs,
		and fix stats output a little bit.

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/about.c
 | 
15
+++++++++++++--
M
src/main.c
 | 
16
++++++++++++++--

5 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-06 [wwp]	3.8.1cvs6
+
+	* src/main.c
+	* src/gtk/about.c
+		Session statistics: format date following global prefs,
+		and fix stats output a little bit.
+
 2012-07-03 [mir]	3.8.1cvs5
 
 	* src/procmime.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4380,3 +4380,4 @@
 ( cvs diff -u -r 1.49.2.143 -r 1.49.2.144 src/procmime.c;  cvs diff -u -r 1.9.2.54 -r 1.9.2.55 src/common/defs.h;  ) > 3.8.1cvs3.patchset
 ( cvs diff -u -r 1.49.2.143 -r 1.49.2.144 src/procmime.c;  cvs diff -u -r 1.9.2.54 -r 1.9.2.55 src/common/defs.h;  ) > 3.8.1cvs4.patchset
 ( cvs diff -u -r 1.49.2.144 -r 1.49.2.145 src/procmime.c;  ) > 3.8.1cvs5.patchset
+( cvs diff -u -r 1.115.2.250 -r 1.115.2.251 src/main.c;  cvs diff -u -r 1.4.2.84 -r 1.4.2.85 src/gtk/about.c;  ) > 3.8.1cvs6.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/about.c b/src/gtk/about.c
@@ -693,11 +693,22 @@ static void about_update_stats(void)
 				(_("Session statistics\n")), -1,
 				"underlined-list-title", NULL);
 
-		g_snprintf(buf, sizeof(buf), _("Started: %s\n"),
-					ctime(&session_stats.time_started));
+		if (prefs_common.date_format) {
+			struct tm *lt;
+			gint len = 100;
+			gchar date[len];
+
+			lt = localtime(&session_stats.time_started);
+			fast_strftime(date, len, prefs_common.date_format, lt);
+			g_snprintf(buf, sizeof(buf), _("Started: %s\n"),
+						lt ? date : ctime(&session_stats.time_started));
+		} else
+			g_snprintf(buf, sizeof(buf), _("Started: %s\n"),
+						ctime(&session_stats.time_started));
 		gtk_text_buffer_insert_with_tags_by_name(stats_text_buffer, &iter, buf, -1,
 				"indented-list-item", NULL);
 
+		gtk_text_buffer_insert(stats_text_buffer, &iter, "\n", 1);
 		gtk_text_buffer_insert_with_tags_by_name(stats_text_buffer, &iter,
 				(_("Incoming traffic\n")), -1,
 				"underlined-list-title", NULL);
diff --git a/src/main.c b/src/main.c
@@ -2573,10 +2573,22 @@ static void lock_socket_input_cb(gpointer data,
 		g_snprintf(tmp, sizeof(tmp), _("Session statistics\n"));
  		fd_write_all(sock, tmp, strlen(tmp));
 
-		g_snprintf(tmp, sizeof(tmp), _("Started: %s\n"),
-				ctime(&session_stats.time_started));
+		if (prefs_common.date_format) {
+			struct tm *lt;
+			gint len = 100;
+			gchar date[len];
+
+			lt = localtime(&session_stats.time_started);
+			fast_strftime(date, len, prefs_common.date_format, lt);
+			g_snprintf(tmp, sizeof(tmp), _("Started: %s\n"),
+					lt ? date : ctime(&session_stats.time_started));
+		} else
+			g_snprintf(tmp, sizeof(tmp), _("Started: %s\n"),
+					ctime(&session_stats.time_started));
  		fd_write_all(sock, tmp, strlen(tmp));
 
+ 		fd_write_all(sock, "\n", 1);
+
 		g_snprintf(tmp, sizeof(tmp), _("Incoming traffic\n"));
  		fd_write_all(sock, tmp, strlen(tmp));