2007-10-06 [paul] 3.0.2cvs16

	* AUTHORS
	* src/exporthtml.c
	* src/mbox.c
	* src/gtk/authors.h
		fix build on solaris where ctime_r takes
		3 arguments rather than 2.
		Patch by Nicolas Doualot <slubman.lists@slubman.info>

diff --git a/AUTHORS b/AUTHORS
index 0507fc914c69b059fd8834746805dd3e0e42c1fa..82bd14a2725d3de783fed67be5dcd5d46cce804e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -248,3 +248,4 @@ contributors (in addition to the above; based on Changelog)
        Michael Rasmussen
        Jérôme Lelong
        Guillaume Chazarain
+       Nicolas Doualot
\ No newline at end of file

diff --git a/ChangeLog b/ChangeLog
index 8b2bb41ad3c965ab79a0ebda8fc558661d2572ec..4b5e0d375c8cf76b1b43a96bc0b6486c208a9736 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-10-06 [paul]      3.0.2cvs16
+
+       * AUTHORS
+       * src/exporthtml.c
+       * src/mbox.c
+       * src/gtk/authors.h
+               fix build on solaris where ctime_r takes
+               3 arguments rather than 2.
+               Patch by Nicolas Doualot <slubman.lists@slubman.info>
+
 2007-10-05 [colin]     3.0.2cvs15
 
        * src/etpan/imap-thread.c

diff --git a/PATCHSETS b/PATCHSETS
index 6be3c280d4de0e66d5103ae0c1517db97787d37e..49af262c7cea84b8c2923fa68edc4cef11635f59 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2928,3 +2928,4 @@
 ( cvs diff -u -r 1.60.2.51 -r 1.60.2.52 src/prefs_actions.c;  cvs diff -u -r 1.59.2.58 -r 1.59.2.59 src/prefs_filtering.c;  cvs diff -u -r 1.12.2.48 -r 1.12.2.49 src/prefs_template.c;  ) > 3.0.2cvs13.patchset
 ( cvs diff -u -r 1.60.2.37 -r 1.60.2.38 src/filtering.c;  ) > 3.0.2cvs14.patchset
 ( cvs diff -u -r 1.1.4.86 -r 1.1.4.87 src/etpan/imap-thread.c;  ) > 3.0.2cvs15.patchset
+( cvs diff -u -r 1.100.2.53 -r 1.100.2.54 AUTHORS;  cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/exporthtml.c;  cvs diff -u -r 1.28.2.39 -r 1.28.2.40 src/mbox.c;  cvs diff -u -r 1.1.2.40 -r 1.1.2.41 src/gtk/authors.h;  ) > 3.0.2cvs16.patchset

diff --git a/configure.ac b/configure.ac
index ea7ca9c51f37f0608f42da89573df6dc935db3e0..a60a9c1ccf0a080712163d8baea1f1ebc399297c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=15
+EXTRA_VERSION=16
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/exporthtml.c b/src/exporthtml.c
index 4e2bf74f46bc0fa7212e91902d6cb257c9c21796..1e1f4aa99ecb6bce1b8e011ed532d2adf1353b4c 100644 (file)
--- a/src/exporthtml.c
+++ b/src/exporthtml.c
@@ -982,7 +982,11 @@ void exporthtml_process(
        exporthtml_fmt_folder( ctl, htmlFile, rootFolder );
 
        tt = time( NULL );
+#ifdef SOLARIS
+       fprintf(htmlFile, "<p>%s</p>\n", ctime_r(&tt, buf, sizeof(buf)));
+#else
        fprintf( htmlFile, "<p>%s</p>\n", ctime_r( &tt, buf ) );
+#endif
        fprintf( htmlFile, "<hr width=\"100%%\"></hr>\n" );
 
        fprintf( htmlFile, "</body>\n" );

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index be6e28fa9fd851126aa6e41eccd678b4ed06137d..26c34069c7f5829027a2b20e6af8c2f165b9cfe3 100644 (file)
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -102,6 +102,7 @@ static char *CONTRIBS_LIST[] = {
 "George Danchev",
 "Matthieu Dazy",
 "Pierric Descamps",
+"Nicolas Doualot",
 "Felix Eckhofer",
 "Charles A. Edwards",
 "Stefaan Eeckels",

diff --git a/src/mbox.c b/src/mbox.c
index 0e695a6ce8d5ddef91225752c05538c20abe3e26..5f3d0fb06105d58c5587c82117c8a6609de0585a 100644 (file)
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -576,8 +576,13 @@ gint export_list_to_mbox(GSList *mlist, const gchar *mbox)
                         sizeof(buf));
                extract_address(buf);
 
+#ifdef SOLARIS
+               if (fprintf(mbox_fp, "From %s %s",
+                       buf, ctime_r(&msginfo->date_t, buft, sizeof(buft))) < 0) {
+#else
                if (fprintf(mbox_fp, "From %s %s",
                        buf, ctime_r(&msginfo->date_t, buft)) < 0) {
+#endif
                        err = -1;
 #ifdef HAVE_FGETS_UNLOCKED
                        funlockfile(msg_fp);