projects / claws.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 1187468)
2007-10-07 [colin] 3.0.2cvs28
authorColin Leroy <colin@colino.net>
Sun, 7 Oct 2007 17:35:32 +0000 (17:35 +0000)
committerColin Leroy <colin@colino.net>
Sun, 7 Oct 2007 17:35:32 +0000 (17:35 +0000)
* src/exporthtml.c
Fix HTML export to make it more compliant
Patch by Frank Dietrich <bits_n_bytes@gmx.de>

ChangeLog patch | blob | history
PATCHSETS patch | blob | history
configure.ac patch | blob | history
src/exporthtml.c patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index c35627b76e107925efd0b37c8645381c91872ec3..06937e3180359008171d048ad7ab5abc14a5ce90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-07 [colin]     3.0.2cvs28
+
+       * src/exporthtml.c
+               Fix HTML export to make it more compliant
+               Patch by Frank Dietrich <bits_n_bytes@gmx.de>
+
 2007-10-07 [colin]     3.0.2cvs27
 
        * src/prefs_toolbar.c
 2007-10-07 [colin]     3.0.2cvs27
 
        * src/prefs_toolbar.c
diff --git a/PATCHSETS b/PATCHSETS
index f09909e8ee84d2303744bcea54417f85098deed9..5fb57f10a3b92660f48077e8ac78c73bdc125f93 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2940,3 +2940,4 @@
 ( cvs diff -u -r 1.43.2.87 -r 1.43.2.88 src/toolbar.c;  ) > 3.0.2cvs25.patchset
 ( cvs diff -u -r 1.30.2.40 -r 1.30.2.41 src/prefs_toolbar.c;  ) > 3.0.2cvs26.patchset
 ( cvs diff -u -r 1.30.2.41 -r 1.30.2.42 src/prefs_toolbar.c;  ) > 3.0.2cvs27.patchset
 ( cvs diff -u -r 1.43.2.87 -r 1.43.2.88 src/toolbar.c;  ) > 3.0.2cvs25.patchset
 ( cvs diff -u -r 1.30.2.40 -r 1.30.2.41 src/prefs_toolbar.c;  ) > 3.0.2cvs26.patchset
 ( cvs diff -u -r 1.30.2.41 -r 1.30.2.42 src/prefs_toolbar.c;  ) > 3.0.2cvs27.patchset
+( cvs diff -u -r 1.5.2.24 -r 1.5.2.25 src/exporthtml.c;  ) > 3.0.2cvs28.patchset
diff --git a/configure.ac b/configure.ac
index e1c10ce512f20aaff531c673cf2978baf72c45b3..ffbe0f48aa1925801448cf0dba283cedaee7b268 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=27
+EXTRA_VERSION=28
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/exporthtml.c b/src/exporthtml.c
index 1e1f4aa99ecb6bce1b8e011ed532d2adf1353b4c..fe733ac32e4b98fae9b9b7b0198d98e02e9293f3 100644 (file)
--- a/src/exporthtml.c
+++ b/src/exporthtml.c
@@ -55,7 +55,7 @@
 #define BORDER_SIZE         2
 #define CELL_PADDING        2
 #define CELL_SPACING        2
 #define BORDER_SIZE         2
 #define CELL_PADDING        2
 #define CELL_SPACING        2
-#define CHAR_ENCODING       "ISO-8859-1"
+#define CHAR_ENCODING       "UTF-8"
 
 /* Stylesheet names */
 #define FILENAME_NONE       ""
 
 /* Stylesheet names */
 #define FILENAME_NONE       ""
@@ -121,7 +121,7 @@ ExportHtmlCtl *exporthtml_create( void ) {
        ctl->path = NULL;
        ctl->dirOutput = NULL;
        ctl->fileHtml = NULL;
        ctl->path = NULL;
        ctl->dirOutput = NULL;
        ctl->fileHtml = NULL;
-       ctl->encoding = NULL;
+       ctl->encoding = g_strconcat(CHAR_ENCODING, NULL);
        ctl->stylesheet = EXPORT_HTML_ID_NONE;
        ctl->nameFormat = EXPORT_HTML_FIRST_LAST;
        ctl->banding = FALSE;
        ctl->stylesheet = EXPORT_HTML_ID_NONE;
        ctl->nameFormat = EXPORT_HTML_FIRST_LAST;
        ctl->banding = FALSE;
@@ -914,7 +914,9 @@ static void exporthtml_fmt_header(
        entry = exporthtml_find_stylesheet( ctl );
 
        fprintf( stream,
        entry = exporthtml_find_stylesheet( ctl );
 
        fprintf( stream,
-               "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\">\n" );
+               "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\n" );
+       fprintf( stream,
+                "\"http://www.w3.org/TR/html4/loose.dtd\">\n" );
        fprintf( stream, "<html>\n" );
        fprintf( stream, "<head>\n" );
 
        fprintf( stream, "<html>\n" );
        fprintf( stream, "<head>\n" );
 
@@ -935,7 +937,6 @@ static void exporthtml_fmt_header(
                        fprintf( stream, "href=\"%s\" >\n", entry->fileName );
                }
        }
                        fprintf( stream, "href=\"%s\" >\n", entry->fileName );
                }
        }
-       fprintf( stream, "<body>\n" );
        fprintf( stream, "</head>\n" );
 }
 
        fprintf( stream, "</head>\n" );
 }
 
@@ -987,7 +988,7 @@ void exporthtml_process(
 #else
        fprintf( htmlFile, "<p>%s</p>\n", ctime_r( &tt, buf ) );
 #endif
 #else
        fprintf( htmlFile, "<p>%s</p>\n", ctime_r( &tt, buf ) );
 #endif
-       fprintf( htmlFile, "<hr width=\"100%%\"></hr>\n" );
+       fprintf( htmlFile, "<hr width=\"100%%\">\n" );
 
        fprintf( htmlFile, "</body>\n" );
        fprintf( htmlFile, "</html>\n" );
 
        fprintf( htmlFile, "</body>\n" );
        fprintf( htmlFile, "</html>\n" );
Claws Mail