fix Bug 556 Organisation-header is sent even if empty

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 48ca118..6ed5bac 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-07-26 [paul]      0.9.12cvs33.22
+
+       * src/compose.c
+               fix Bug 556 'Organisation-header is sent even if empty'
+
 2004-07-24 [colin]     0.9.12cvs33.21
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 922c7da..83065b2 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -75,3 +75,4 @@
 ( cvs diff -u -r 1.2.4.2 -r 1.2.4.3 src/browseldap.c; cvs diff -u -r 1.2.2.1 -r 1.2.2.2 src/ldapctrl.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/ldapctrl.h; cvs diff -u -r 1.2.2.1 -r 1.2.2.2 src/ldapserver.h; ) > 0.9.12cvs33.19.patchset
 ( cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/gtk/gtkaspell.c; ) > 0.9.12cvs33.20.patchset
 ( cvs diff -u -r 1.382.2.33 -r 1.382.2.34 src/compose.c; cvs diff -u -r 1.9.2.6 -r 1.9.2.7 src/gtk/gtkaspell.c; cvs diff -u -r 1.5.2.1 -r 1.5.2.2 src/gtk/gtkaspell.h; ) > 0.9.12cvs33.21.patchset
+( cvs diff -u -r 1.382.2.34 -r 1.382.2.35 src/compose.c; ) > 0.9.12cvs33.22.patchset

diff --git a/configure.ac b/configure.ac
index f577d34..b34ad0c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=33
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.21
+EXTRA_GTK2_VERSION=.22
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}