2005-03-29 [paul] 1.9.6cvs10

	* AUTHORS
	* ChangeLog.claws
	* src/compose.c
	* src/gtk/gtkaspell.c
		sync with HEAD (don't pass NULL pointers)

diff --git a/AUTHORS b/AUTHORS
index 6b99c6642655e8e01a08a3d248fed15f7c0f034f..60c674cbfc53b49677bd47b6b5aa6b8b084db3ec 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -221,3 +221,4 @@ contributors (beside the above; based on Changelog)
        Felix Eckhofer
        Rich Coe
        Ivan Rayner
        Felix Eckhofer
        Rich Coe
        Ivan Rayner

+       Markus Schwarzenberg

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 519bb28786b964e05a43751d49f90534a7b09be2..a31607219e6ea302b7d5676f0400c0dfc1bdf920 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,11 @@
+2005-03-29 [paul]      1.9.6cvs10
+
+       * AUTHORS
+       * ChangeLog.claws
+       * src/compose.c
+       * src/gtk/gtkaspell.c
+               sync with HEAD (don't pass NULL pointers) 
+

 2005-03-24 [paul]
 
        * tools/Makefile.am
 2005-03-24 [paul]
 
        * tools/Makefile.am

diff --git a/ChangeLog.claws b/ChangeLog.claws
index bdf08d594c68e7a895c76904aead1d1d1f51721b..576008a442537c75884ac39e6a52c9e166b2ef6f 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,33 @@
+2005-03-29 [paul]      1.0.4cvs1
+
+       * src/compose.c
+               fix bug 697 'Segmentation Fault due to
+               NULL string (%s) pointers in fprintf'
+               draft privacy information only when
+               privacy system available
+               patch by by Markus Schwarzenberg
+               (schwarzb<AT>ipms_fraunhofer_de)
+       * src/gtk/gtkaspell.c
+               don't pass NULL to *printf() and the likes
+               spotted by Alex Moore, patch by Alfons 
+
+2005-03-24 [paul]      1.0.4
+
+       * 1.0.4 released
+
+2005-03-24 [paul]      1.0.3cvs8
+
+       * ChangeLog
+       * ChangeLog.jp
+       * src/codeconv.c
+       * src/textview.c
+       * src/unmime.c
+       * src/unmime.h
+       * src/common/smtp.c
+               sync with main 1.0.4
+               see ChangeLog 2005-03-18 and 2005-03-24
+               fixes buffer overflow
+

 2005-03-25 [paul]
 
        * tools/Makefile.am
 2005-03-25 [paul]
 
        * tools/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 948b28cfd99d5c93e875bda0c3b168611d6da953..d15df0123ec9241cbde367bc8ba280306f0c6332 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -426,3 +426,4 @@
 ( cvs diff -u -r 1.18.2.6 -r 1.18.2.7 src/plugins/spamassassin/spamassassin.c; ) > 1.9.6cvs7.patchset
 ( cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/gtk/about.c; ) > 1.9.6cvs8.patchset
 ( cvs diff -u -r 1.654.2.461 -r 1.654.2.462 configure.ac; cvs diff -u -r 1.53.2.9 -r 1.53.2.10 po/POTFILES.in; cvs diff -u -r 1.155.2.18 -r 1.155.2.19 src/Makefile.am; cvs diff -u -r 1.23.2.8 -r 1.23.2.9 src/crash.c; cvs diff -u -r 0 -r 1 src/image_viewer.c; cvs diff -u -r 0 -r 1 src/image_viewer.h; cvs diff -u -r 1.115.2.29 -r 1.115.2.30 src/main.c; cvs diff -u -r 1.204.2.32 -r 1.204.2.33 src/prefs_common.c; cvs diff -u -r 1.103.2.12 -r 1.103.2.13 src/prefs_common.h; cvs diff -u -r 0 -r 1 src/prefs_image_viewer.c; cvs diff -u -r 0 -r 1 src/prefs_image_viewer.h; cvs diff -u -r 1.96.2.49 -r 1.96.2.50 src/textview.c; cvs diff -u -r 1.4.2.9 -r 1.4.2.10 src/gtk/about.c; cvs diff -u -r 1.1.14.1 -r 1.1.14.2 src/pixmaps/sylpheed_logo.xpm; cvs diff -u -r 1.8.2.1 -r 1.8.2.2 src/plugins/Makefile.am; cvs diff -u -r -1.1 -r -1.2 src/plugins/image_viewer/.cvsignore; cvs diff -u -r -1.4.2.2 -r -1.4.2.3 src/plugins/image_viewer/Makefile.am; cvs diff -u -r -1.8.2.3 -r -1.8.2.4 src/plugins/image_viewer/plugin.c; cvs diff -u -r -1.7.2.10 -r -1.7.2.11 src/plugins/image_viewer/viewer.c; cvs diff -u -r -1.1 -r -1.2 src/plugins/image_viewer/viewer.glade; cvs diff -u -r -1.4 -r -1.5 src/plugins/image_viewer/viewer.h; cvs diff -u -r -1.5.2.5 -r -1.5.2.6 src/plugins/image_viewer/viewerprefs.c; cvs diff -u -r -1.1.4.1 -r -1.1.4.2 src/plugins/image_viewer/viewerprefs.glade; cvs diff -u -r -1.3 -r -1.4 src/plugins/image_viewer/viewerprefs.h; ) > 1.9.6cvs9.patchset
 ( cvs diff -u -r 1.18.2.6 -r 1.18.2.7 src/plugins/spamassassin/spamassassin.c; ) > 1.9.6cvs7.patchset
 ( cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/gtk/about.c; ) > 1.9.6cvs8.patchset
 ( cvs diff -u -r 1.654.2.461 -r 1.654.2.462 configure.ac; cvs diff -u -r 1.53.2.9 -r 1.53.2.10 po/POTFILES.in; cvs diff -u -r 1.155.2.18 -r 1.155.2.19 src/Makefile.am; cvs diff -u -r 1.23.2.8 -r 1.23.2.9 src/crash.c; cvs diff -u -r 0 -r 1 src/image_viewer.c; cvs diff -u -r 0 -r 1 src/image_viewer.h; cvs diff -u -r 1.115.2.29 -r 1.115.2.30 src/main.c; cvs diff -u -r 1.204.2.32 -r 1.204.2.33 src/prefs_common.c; cvs diff -u -r 1.103.2.12 -r 1.103.2.13 src/prefs_common.h; cvs diff -u -r 0 -r 1 src/prefs_image_viewer.c; cvs diff -u -r 0 -r 1 src/prefs_image_viewer.h; cvs diff -u -r 1.96.2.49 -r 1.96.2.50 src/textview.c; cvs diff -u -r 1.4.2.9 -r 1.4.2.10 src/gtk/about.c; cvs diff -u -r 1.1.14.1 -r 1.1.14.2 src/pixmaps/sylpheed_logo.xpm; cvs diff -u -r 1.8.2.1 -r 1.8.2.2 src/plugins/Makefile.am; cvs diff -u -r -1.1 -r -1.2 src/plugins/image_viewer/.cvsignore; cvs diff -u -r -1.4.2.2 -r -1.4.2.3 src/plugins/image_viewer/Makefile.am; cvs diff -u -r -1.8.2.3 -r -1.8.2.4 src/plugins/image_viewer/plugin.c; cvs diff -u -r -1.7.2.10 -r -1.7.2.11 src/plugins/image_viewer/viewer.c; cvs diff -u -r -1.1 -r -1.2 src/plugins/image_viewer/viewer.glade; cvs diff -u -r -1.4 -r -1.5 src/plugins/image_viewer/viewer.h; cvs diff -u -r -1.5.2.5 -r -1.5.2.6 src/plugins/image_viewer/viewerprefs.c; cvs diff -u -r -1.1.4.1 -r -1.1.4.2 src/plugins/image_viewer/viewerprefs.glade; cvs diff -u -r -1.3 -r -1.4 src/plugins/image_viewer/viewerprefs.h; ) > 1.9.6cvs9.patchset

+( cvs diff -u -r 1.100.2.14 -r 1.100.2.15 AUTHORS; cvs diff -u -r 1.2504.2.55 -r 1.2504.2.56 ChangeLog.claws; cvs diff -u -r 1.382.2.113 -r 1.382.2.114 src/compose.c; cvs diff -u -r 1.9.2.10 -r 1.9.2.11 src/gtk/gtkaspell.c; ) > 1.9.6cvs10.patchset

diff --git a/configure.ac b/configure.ac
index 8f951d0bb6461005db0ba595e163a1c886de1ef3..ae56c5249c771d3347409634a88d57f0d1cdbd09 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=9
+EXTRA_VERSION=10

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 7424c73cf12cba473d7a159a41708623085e4b89..e048b3163abc2c00143b5b9e3c4c152c5ce6c86f 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -6195,9 +6195,11 @@ static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
                fprintf(fp, "SCF:%s\n", savefolderid);
                g_free(savefolderid);
        }
                fprintf(fp, "SCF:%s\n", savefolderid);
                g_free(savefolderid);
        }

-       fprintf(fp, "X-Sylpheed-Sign:%d\n", compose->use_signing);
-       fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
-       fprintf(fp, "X-Sylpheed-Privacy-System:%s\n", compose->privacy_system);
+       if (compose->privacy_system) {
+               fprintf(fp, "X-Sylpheed-Sign:%d\n", compose->use_signing);
+               fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
+               fprintf(fp, "X-Sylpheed-Privacy-System:%s\n", compose->privacy_system);
+       }

        fprintf(fp, "\n");
 
        if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_STORE) < 0) {
        fprintf(fp, "\n");
 
        if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_STORE) < 0) {

diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index 63ff9174344a3003bc2c390f8b1ec670f5c28aef..c35ebbe0f1cca9d93581dd71603fab0fc288b332 100644 (file)
--- a/src/gtk/gtkaspell.c
+++ b/src/gtk/gtkaspell.c
@@ -754,7 +754,8 @@ static gboolean set_dictionary(AspellConfig *config, Dictionary *dict)
                jargon = NULL;
 
        debug_print("Aspell: language: %s, jargon: %s, size: %s\n",
                jargon = NULL;
 
        debug_print("Aspell: language: %s, jargon: %s, size: %s\n",

-                   language, jargon, size);
+                   language, jargon ? jargon : "",
+                    size ? size : "");

        
        if (language)
                CONFIG_REPLACE_RETURN_FALSE_IF_FAIL("lang", language);
        
        if (language)
                CONFIG_REPLACE_RETURN_FALSE_IF_FAIL("lang", language);