2005-01-06 [colin] 0.9.13cvs28.1

	* src/prefs_matcher.c
		Sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index b1fb1a839dadf8f35dfb7ba2cef45be87838a31d..dcb7b083a46c25b51f723a1bace8aa54f50e95cf 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-01-06 [colin]     0.9.13cvs28.1
+
+       * src/prefs_matcher.c
+               Sync with HEAD
+
 2005-01-06 [colin]     0.9.13cvs27.4
 
        * src/prefs_matcher.c

diff --git a/PATCHSETS b/PATCHSETS
index ec3364c029304d58ed8f691a1c8f43e9fafdbef0..08c54cd35805c8d2c681c4640db8898ae50b92b4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -313,3 +313,4 @@
 ( cvs diff -u -r 1.61.2.19 -r 1.61.2.20 src/account.c; cvs diff -u -r 1.27.2.7 -r 1.27.2.8 src/addr_compl.c; cvs diff -u -r 1.26.2.8 -r 1.26.2.9 src/foldersel.c; cvs diff -u -r 1.25.2.8 -r 1.25.2.9 src/stock_pixmap.c; cvs diff -u -r 1.18.2.5 -r 1.18.2.6 src/stock_pixmap.h; ) > 0.9.13cvs27.2.patchset
 ( cvs diff -u -r 1.43.2.11 -r 1.43.2.12 src/prefs_matcher.c; ) > 0.9.13cvs27.3.patchset
 ( cvs diff -u -r 1.43.2.12 -r 1.43.2.13 src/prefs_matcher.c; ) > 0.9.13cvs27.4.patchset
+( cvs diff -u -r 1.43.2.13 -r 1.43.2.14 src/prefs_matcher.c; ) > 0.9.13cvs28.1.patchset

diff --git a/configure.ac b/configure.ac
index 7699f64dd5ad8f2fa21a6f6493cda025bb9b0261..834f8362c37c55462e084c55e3a7540c52889694 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=27
+EXTRA_VERSION=28
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.4
+EXTRA_GTK2_VERSION=.1
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 32fab7287f8e7a61993e5c8a50cff710a882c219..6e12a9b3784484ee88236d503f94e9699b4a635f 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -1582,7 +1582,7 @@ static void prefs_matcher_ok(void)
                matcherprop = prefs_matcher_dialog_to_matcher();
                if (matcherprop != NULL) {
                        str = matcherprop_to_string(matcherprop);
-                       matcherprop_free(matcherprop); /* XXX: was a leak */
+                       matcherprop_free(matcherprop);
                        if (strcmp(str, "all") != 0) {
                                model = gtk_tree_view_get_model(GTK_TREE_VIEW
                                                (matcher.cond_list_view));