2005-08-29 [paul] 1.9.13cvs71

	* AUTHORS
	* src/matcher_parser_parse.y
	* src/etpan/imap-thread.c
		fix building on FreeBSD
		Patch by Daniel Gustafson <daniel@hobbit.se>

diff --git a/AUTHORS b/AUTHORS
index b50761d..efb7fab 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -228,3 +228,4 @@ contributors (beside the above; based on Changelog)
        Tim Mann
        M. Benkmann
        Yang Guilong
+       Daniel Gustafson

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 20b6e52..ef234c7 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,11 @@
+2005-08-29 [paul]      1.9.13cvs71
+
+       * AUTHORS
+       * src/matcher_parser_parse.y
+       * src/etpan/imap-thread.c
+               fix building on FreeBSD
+               Patch by Daniel Gustafson <daniel@hobbit.se>
+
 2005-08-29 [paul]      1.9.13cvs70
 
        * src/plugins/pgpinline/pgpinline.c

diff --git a/PATCHSETS b/PATCHSETS
index 5be547d..7c84bfc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -756,3 +756,4 @@
 ( cvs diff -u -r 1.155.2.30 -r 1.155.2.31 src/Makefile.am;  cvs diff -u -r 1.25.2.16 -r 1.25.2.17 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.9 -r 1.18.2.10 src/stock_pixmap.h;  cvs diff -u -r 1.43.2.22 -r 1.43.2.23 src/toolbar.c;  diff -u /dev/null src/pixmaps/trash_btn.xpm;  ) > 1.9.13cvs68.patchset
 ( cvs diff -u -r 1.179.2.63 -r 1.179.2.64 src/imap.c;  cvs diff -u -r 1.18.2.10 -r 1.18.2.11 src/stock_pixmap.h;  cvs diff -u -r 1.36.2.41 -r 1.36.2.42 src/common/utils.c;  cvs diff -u -r 1.20.2.22 -r 1.20.2.23 src/common/utils.h;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/trash_btn.xpm;  ) > 1.9.13cvs69.patchset
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpinline/pgpinline.c;  ) > 1.9.13cvs70.patchset
+( cvs diff -u -r 1.100.2.23 -r 1.100.2.24 AUTHORS;  cvs diff -u -r 1.25.2.9 -r 1.25.2.10 src/matcher_parser_parse.y;  cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/etpan/imap-thread.c;  ) > 1.9.13cvs71.patchset

diff --git a/configure.ac b/configure.ac
index 6bd63ac..a733596 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=70
+EXTRA_VERSION=71
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index f50617e..6fb81a3 100644 (file)
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -8,7 +8,7 @@
 #include <imap.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#if defined (__NetBSD__)
+#if (defined (__NetBSD__) || defined (__FreeBSD__))
 #include <sys/socket.h>
 #endif
 #include <fcntl.h>

diff --git a/src/matcher_parser_parse.y b/src/matcher_parser_parse.y
index 39997d9..449cf9d 100644 (file)
--- a/src/matcher_parser_parse.y
+++ b/src/matcher_parser_parse.y
@@ -383,6 +383,7 @@ MATCHER_RULENAME MATCHER_STRING
 {
        name = g_strdup($2);
 }
+;
 
 filtering:
 filtering_action_list