2006-06-06 [paul] 2.2.1cvs6

	* src/matcher.c
		fix  implicit declaration of
		sylpheed_do_idle()
		Patch by Fabien Vantard

diff --git a/ChangeLog b/ChangeLog
index 8497fce027719891f41f657aa01921d2f0d5d090..e0cf3ad6d7a453e6b45330fd5e1af4b4247ea026 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-06 [paul]      2.2.1cvs6
+
+       * src/matcher.c
+               fix  implicit declaration of
+               sylpheed_do_idle()
+               Patch by Fabien Vantard
+

 2006-06-06 [paul]      2.2.1cvs5
 
        * src/matcher.c
 2006-06-06 [paul]      2.2.1cvs5
 
        * src/matcher.c

diff --git a/PATCHSETS b/PATCHSETS
index 0dda294ae31bed4148c311fbcb2569cfd4ac9ee1..c560bf74c74f4dd7f652cd6797909eead7758453 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1557,3 +1557,4 @@
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/fr/account.xml;  ) > 2.2.1cvs3.patchset
 ( cvs diff -u -r 1.96.2.114 -r 1.96.2.115 src/textview.c;  cvs diff -u -r 1.36.2.63 -r 1.36.2.64 src/common/utils.c;  ) > 2.2.1cvs4.patchset
 ( cvs diff -u -r 1.75.2.24 -r 1.75.2.25 src/matcher.c;  ) > 2.2.1cvs5.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/fr/account.xml;  ) > 2.2.1cvs3.patchset
 ( cvs diff -u -r 1.96.2.114 -r 1.96.2.115 src/textview.c;  cvs diff -u -r 1.36.2.63 -r 1.36.2.64 src/common/utils.c;  ) > 2.2.1cvs4.patchset
 ( cvs diff -u -r 1.75.2.24 -r 1.75.2.25 src/matcher.c;  ) > 2.2.1cvs5.patchset

+( cvs diff -u -r 1.75.2.25 -r 1.75.2.26 src/matcher.c;  ) > 2.2.1cvs6.patchset

diff --git a/configure.ac b/configure.ac
index 0a14a8c0bf542ecb206aec26dd09efcb6b540d1e..413178fadc8e7d9df52d91313038e2677536b918 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=5
+EXTRA_VERSION=6

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/matcher.c b/src/matcher.c
index 5fdfd86f4d751e3eb748618b3f214ef40bfdf9b7..230a9d3d8d307918972a6dbda72f758a17e7a3c0 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -41,6 +41,7 @@
 #include "addr_compl.h"
 #include "codeconv.h"
 #include "quoted-printable.h"
 #include "addr_compl.h"
 #include "codeconv.h"
 #include "quoted-printable.h"

+#include "sylpheed.h"

 #include <ctype.h>
 
 /*!
 #include <ctype.h>
 
 /*!