2007-10-06 [paul] 3.0.2cvs16
authorPaul Mangan <paul@claws-mail.org>
Sat, 6 Oct 2007 07:31:15 +0000 (07:31 +0000)
committerPaul Mangan <paul@claws-mail.org>
Sat, 6 Oct 2007 07:31:15 +0000 (07:31 +0000)
* 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>

AUTHORS
ChangeLog
PATCHSETS
configure.ac
src/exporthtml.c
src/gtk/authors.h
src/mbox.c

diff --git a/AUTHORS b/AUTHORS
index 0507fc9..82bd14a 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
index 8b2bb41..4b5e0d3 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
index 6be3c28..49af262 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index ea7ca9c..a60a9c1 100644 (file)
@@ -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=
 
index 4e2bf74..1e1f4aa 100644 (file)
@@ -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" );
index be6e28f..26c3406 100644 (file)
@@ -102,6 +102,7 @@ static char *CONTRIBS_LIST[] = {
 "George Danchev",
 "Matthieu Dazy",
 "Pierric Descamps",
+"Nicolas Doualot",
 "Felix Eckhofer",
 "Charles A. Edwards",
 "Stefaan Eeckels",
index 0e695a6..5f3d0fb 100644 (file)
@@ -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);