2008-11-13 [colin] 3.6.1cvs25

	* src/account.c
	* src/filtering.c
		Fix redefinition of PREFSBUFSIZE

diff --git a/ChangeLog b/ChangeLog
index 4444cbfba43b7faaa8d88db1799e0f1dfb1c31f1..57e112cf81329cb5b07f404531cd0059f33cddeb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-13 [colin]     3.6.1cvs25
+
+       * src/account.c
+       * src/filtering.c
+               Fix redefinition of PREFSBUFSIZE
+
 2008-11-13 [wwp]       3.6.1cvs24
 
        * tools/popfile-link.sh

diff --git a/PATCHSETS b/PATCHSETS
index beb72e0c1d05302d7fd5b857fd40b9cb40a3f6ab..4aa343893ff658e2e871e86613d077d05c68fec6 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3606,3 +3606,4 @@
 ( cvs diff -u -r 1.395.2.398 -r 1.395.2.399 src/summaryview.c;  ) > 3.6.1cvs22.patchset
 ( cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/prefs_gtk.h;  ) > 3.6.1cvs23.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/popfile-link.sh;  ) > 3.6.1cvs24.patchset
+( cvs diff -u -r 1.61.2.90 -r 1.61.2.91 src/account.c;  cvs diff -u -r 1.60.2.47 -r 1.60.2.48 src/filtering.c;  ) > 3.6.1cvs25.patchset

diff --git a/configure.ac b/configure.ac
index 6a14a4069d6e5bf768e4e3a450f538f6fb4e1832..705019917ca03e7ff52058b5ddf3770afaef25b6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=24
+EXTRA_VERSION=25
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/account.c b/src/account.c
index 4675a51f6310bed92ba91c22d71655f0a8169925..3ef838a7446041b1e0e51a6b97871a29da165567 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -74,8 +74,6 @@ typedef enum
 
 # define N_EDIT_ACCOUNT_COLS   5
 
-#define PREFSBUFSIZE           1024
-
 PrefsAccount *cur_account;
 
 static GList *account_list = NULL;

diff --git a/src/filtering.c b/src/filtering.c
index 46ac609348762ecd64395c8bf16e61337e76a38d..ab1b585eeed49fa640cc99ff42f905786e891f51 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -39,8 +39,6 @@
 #include "tags.h"
 #include "log.h"
 
-#define PREFSBUFSIZE           1024
-
 GSList * pre_global_processing = NULL;
 GSList * post_global_processing = NULL;
 GSList * filtering_rules = NULL;