From 8e0194ad603d03b057eb640c74517b838ca70ddd Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Thu, 25 Jan 2007 17:18:14 +0000 Subject: [PATCH] 2007-01-25 [colin] 2.7.1cvs59 * src/matcher.c Fix 2nd-run loss of matcherrc on new configurations. --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/matcher.c | 8 +++++--- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 727737c0a..ecf3c721a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-25 [colin] 2.7.1cvs59 + + * src/matcher.c + Fix 2nd-run loss of matcherrc on new + configurations. + 2007-01-25 [wwp] 2.7.1cvs58 * src/mimeview.c diff --git a/PATCHSETS b/PATCHSETS index 9cfa67c87..7b59ba5b9 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2316,3 +2316,4 @@ ( cvs diff -u -r 1.2.4.4 -r 1.2.4.5 src/plugins/dillo_viewer/dillo_prefs.h; ) > 2.7.1cvs56.patchset ( cvs diff -u -r 1.2.2.31 -r 1.2.2.32 src/gtk/filesel.c; ) > 2.7.1cvs57.patchset ( cvs diff -u -r 1.83.2.100 -r 1.83.2.101 src/mimeview.c; ) > 2.7.1cvs58.patchset +( cvs diff -u -r 1.75.2.35 -r 1.75.2.36 src/matcher.c; ) > 2.7.1cvs59.patchset diff --git a/configure.ac b/configure.ac index bd42d277a..baa534c09 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=58 +EXTRA_VERSION=59 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/matcher.c b/src/matcher.c index 344f49e9d..0bab1b08b 100644 --- a/src/matcher.c +++ b/src/matcher.c @@ -1805,9 +1805,11 @@ static void matcher_add_rulenames(const gchar *rcpath) while (fgets (buf, sizeof(buf), src) != NULL) { if (strlen(buf) > 2 && buf[0] != '[' - && strncmp(buf, "rulename \"", 10)) { - fwrite("rulename \"\" ", - strlen("rulename \"\" "), 1, dst); + && strncmp(buf, "rulename \"", 10) + && strncmp(buf, "enabled rulename \"", 18) + && strncmp(buf, "disabled rulename \"", 18)) { + fwrite("enabled rulename \"\" ", + strlen("enabled rulename \"\" "), 1, dst); } fwrite(buf, strlen(buf), 1, dst); } -- 2.25.1