[Commits] [SCM] claws branch, master, updated. 3.9.2-19-g7f27738

[colin at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  7f27738df23b2098214d956e6b41149c1a158404 (commit)
      from  d10b5af20399f8711a8f5ce0172cb33b68c97977 (commit)


- Log -----------------------------------------------------------------
commit 7f27738df23b2098214d956e6b41149c1a158404
Author: Colin Leroy <colin at colino.net>
Date:   Fri Jun 14 10:34:17 2013 +0200

    More win32 fixes

diff --git a/src/matcher.c b/src/matcher.c
index 1b8e4c9..8c1fd11 100644
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -313,7 +313,9 @@ MatcherProp *matcherprop_new(gint criteria, const gchar *header,
 	prop->expr = expr != NULL ? g_strdup(expr) : NULL;
 
 	prop->matchtype = matchtype;
+#ifndef G_OS_WIN32
 	prop->preg = NULL;
+#endif
 	prop->value = value;
 	prop->error = 0;
 
@@ -330,10 +332,12 @@ void matcherprop_free(MatcherProp *prop)
 {
 	g_free(prop->expr);
 	g_free(prop->header);
+#ifndef G_OS_WIN32
 	if (prop->preg != NULL) {
 		regfree(prop->preg);
 		g_free(prop->preg);
 	}
+#endif
 	g_free(prop);
 }
 
@@ -353,7 +357,9 @@ MatcherProp *matcherprop_copy(const MatcherProp *src)
 	prop->expr = src->expr ? g_strdup(src->expr) : NULL;
 	prop->matchtype = src->matchtype;
 	
+#ifndef G_OS_WIN32
 	prop->preg = NULL; /* will be re-evaluated */
+#endif
 	prop->value = src->value;
 	prop->error = src->error;	
 	return prop;		
diff --git a/src/matcher.h b/src/matcher.h
index 9a6c898..62d5352 100644
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -36,7 +36,9 @@ struct _MatcherProp {
 	gchar *header;
 	gchar *expr;
 	int value;
+#ifndef G_OS_WIN32
 	regex_t *preg;
+#endif
 	int error;
 	gboolean result;
 	gboolean done;

-----------------------------------------------------------------------

Summary of changes:
 src/matcher.c |    6 ++++++
 src/matcher.h |    2 ++
 2 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Claws Mail