2005-12-12 [colin] 1.9.100cvs85

	* src/matcher.c
		Fix a leak

diff --git a/ChangeLog b/ChangeLog
index 6a58e632205483c5f69a1ac5a6949226bee41501..45256554708e5509d5194ca4979c722705bf20e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-12 [colin]     1.9.100cvs85
+
+       * src/matcher.c
+               Fix a leak
+
 2005-12-12 [wwp]       1.9.100cvs84
 
        * src/gtk/icon_legend.c

diff --git a/PATCHSETS b/PATCHSETS
index f44ee8501292d66b85dee1bcb1e69ba9faab9c28..313645ef40aab41b381b4a23e746265a90aa454d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1068,3 +1068,4 @@
 ( cvs diff -u -r 1.2.2.17 -r 1.2.2.18 src/gtk/filesel.c;  ) > 1.9.100cvs82.patchset
 ( cvs diff -u -r 1.2.4.10 -r 1.2.4.11 src/browseldap.c;  cvs diff -u -r 1.26.2.21 -r 1.26.2.22 src/foldersel.c;  cvs diff -u -r 1.60.2.26 -r 1.60.2.27 src/prefs_actions.c;  cvs diff -u -r 1.59.2.27 -r 1.59.2.28 src/prefs_filtering.c;  cvs diff -u -r 1.43.2.29 -r 1.43.2.30 src/prefs_matcher.c;  cvs diff -u -r -1.2 -r -1.3 src/prefs_spelling.glade;  cvs diff -u -r 1.12.2.18 -r 1.12.2.19 src/prefs_template.c;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/gtk/foldersort.glade;  cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/gtk/pluginwindow.c;  cvs diff -u -r -1.1 -r -1.2 src/gtk/pluginwindow.glade;  cvs diff -u -r -1.2.2.1 -r -1.2.2.2 src/plugins/spamassassin/spamassassin_gtk.glade;  ) > 1.9.100cvs83.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/icon_legend.c;  ) > 1.9.100cvs84.patchset
+( cvs diff -u -r 1.75.2.14 -r 1.75.2.15 src/matcher.c;  ) > 1.9.100cvs85.patchset

diff --git a/configure.ac b/configure.ac
index d812671ff1d03c1f272c45c6a774f6d09038d1c9..9ceddd99af1d586b18561e37a227549456667098 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=84
+EXTRA_VERSION=85
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/matcher.c b/src/matcher.c
index 3c71b93703a0ace145e740dfc4bd2bfa9d1ef8c3..c353e006906f7ad171dc339b3865e0d8aa04c0d1 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -1575,6 +1575,9 @@ void prefs_matcher_read_config(void)
                /* now hack the file in order to have it to the new format */
                matcher_add_rulenames(rcpath);
        }
+       
+       g_free(rc_old_format);
+
        f = g_fopen(rcpath, "rb");
        g_free(rcpath);