2007-08-13 [paul] 2.10.0cvs117

	* src/common/utils.c
		fix bug 1287, 'Compile time problem on Solaris
		(nexenta gnu/Solaris) utils.c'
		Thanks to Piotr Chrzczonowicz

diff --git a/ChangeLog b/ChangeLog
index f429297ee78ef8db36becc2c6ea68e18d4807f6f..da4801f16be877eaa208d8224049852e3611466b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-13 [paul]      2.10.0cvs117
+
+       * src/common/utils.c
+               fix bug 1287, 'Compile time problem on Solaris
+               (nexenta gnu/Solaris) utils.c'
+               Thanks to Piotr Chrzczonowicz
+
 2007-08-12 [wwp]       2.10.0cvs116
 
        * src/plugins/pgpcore/prefs_gpg.c

diff --git a/PATCHSETS b/PATCHSETS
index 2856bdf2c50da392782d7c2f03438520ca776dce..fed57fb4e5b8816aac31179a7a91e380c99c1983 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2771,3 +2771,4 @@
 ( cvs diff -u -r 1.52.2.47 -r 1.52.2.48 src/prefs_folder_item.c;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/combobox.c;  ) > 2.10.0cvs114.patchset
 ( cvs diff -u -r 1.10.2.14 -r 1.10.2.15 src/privacy.h;  ) > 2.10.0cvs115.patchset
 ( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/plugins/pgpcore/prefs_gpg.c;  ) > 2.10.0cvs116.patchset
+( cvs diff -u -r 1.36.2.107 -r 1.36.2.108 src/common/utils.c;  ) > 2.10.0cvs117.patchset

diff --git a/configure.ac b/configure.ac
index 7df2c7a35ce12c3be5feaa9f0d371bda93559fc2..ec18a538109acf3831af110c077dc5ee24892574 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=116
+EXTRA_VERSION=117
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.c b/src/common/utils.c
index dd1c2e01fae8a3b45f94c72b360c5200b67f9da4..3724dca1ed1cf633c75135a668ae78e0e96df702 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -3736,8 +3736,13 @@ void get_rfc822_date(gchar *buf, gint len)
        t = time(NULL);
        lt = localtime_r(&t, &buf1);
 
+#ifdef SOLARIS
+       sscanf(asctime_r(lt, buf2, sizeof(buf2)), "%3s %3s %d %d:%d:%d %d\n",
+              day, mon, &dd, &hh, &mm, &ss, &yyyy);
+#else
        sscanf(asctime_r(lt, buf2), "%3s %3s %d %d:%d:%d %d\n",
               day, mon, &dd, &hh, &mm, &ss, &yyyy);
+#endif
        g_snprintf(buf, len, "%s, %d %s %d %02d:%02d:%02d %s",
                   day, dd, mon, yyyy, hh, mm, ss, tzoffset(&t));
 }