From: Christoph Hohmann <reboot@gmx.ch>
Date: Fri, 17 May 2002 15:23:56 +0000 (+0000)
Subject: * src/matcher.c
X-Git-Tag: rel_0_7_6~3
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=fc88df7eeb15ccde99961e9781e701565cd14074

* src/matcher.c
	fix execute matcher rule
	(text string was not correctly created)
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 25704357f..7808577d1 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-05-17 [christoph]	0.7.5claws32
+
+	* src/matcher.c
+		fix execute matcher rule
+		(text string was not correctly created)
+
 2002-05-17 [paul]	0.7.5claws31
 
 	* src/compose.c
diff --git a/configure.in b/configure.in
index 8d4681a49..5d73c388f 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws31
+EXTRA_VERSION=claws32
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/matcher.c b/src/matcher.c
index 3c88091eb..f4765782b 100644
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -294,6 +294,7 @@ gboolean matcherprop_match_execute(MatcherProp * prop, MsgInfo * info)
 {
 	gchar * file;
 	gchar * cmd;
+	gint retval;
 
 	file = procmsg_get_message_file(info);
 	if (file == NULL)
@@ -303,7 +304,10 @@ gboolean matcherprop_match_execute(MatcherProp * prop, MsgInfo * info)
 	if (cmd == NULL)
 		return FALSE;
 
-	return (system(cmd) == 0);
+	retval = system(cmd);
+	debug_print(_("Command exit code: %i\n"), retval);
+
+	return (retval == 0);
 }
 
 /* match a message and his headers, hlist can be NULL if you don't
@@ -846,6 +850,9 @@ gchar * matcherprop_to_string(MatcherProp * matcher)
 	case MATCHCRITERIA_FORWARDED:
 	case MATCHCRITERIA_NOT_FORWARDED:
 		return g_strdup(criteria_str);
+	case MATCHCRITERIA_EXECUTE:
+	case MATCHCRITERIA_NOT_EXECUTE:
+		return g_strdup_printf("%s \"%s\"", criteria_str, matcher->expr);
 	}
 
 	matchtype_str = NULL;