talons

commit b43060a7ba8d7432c498236ce50f9cb4d4039f01
parent 68df3fb6bd8b9ce8f425f14268f8663d53b3cd09
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Mon, 29 Mar 2010 18:22:38 +0000

2010-03-29 [pawel]	3.7.5cvs43

	* src/matcher_parser.h
	* src/matcher_parser_parse.y
	* src/gtk/quicksearch.c
		Disable matcher warnings when populating quicksearch
		completion lists on startup

Diffstat:
M
ChangeLog
 | 
10
++++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/quicksearch.c
 | 
4
++++
M
src/matcher_parser.h
 | 
2
+-
M
src/matcher_parser_parse.y
 | 
11
+++++++++--

6 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-29 [pawel]	3.7.5cvs43
+
+	* src/matcher_parser.h
+	* src/matcher_parser_parse.y
+	* src/gtk/quicksearch.c
+		Disable matcher warnings when populating quicksearch
+		completion lists on startup
+
+		
+
 2010-03-27 [colin]	3.7.5cvs42
 
 	* src/gtk/quicksearch.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3983,3 +3983,4 @@
 ( cvs diff -u -r 1.382.2.548 -r 1.382.2.549 src/compose.c;  cvs diff -u -r 1.50.2.59 -r 1.50.2.60 src/compose.h;  cvs diff -u -r 1.96.2.222 -r 1.96.2.223 src/textview.c;  ) > 3.7.5cvs40.patchset
 ( cvs diff -u -r 1.382.2.549 -r 1.382.2.550 src/compose.c;  ) > 3.7.5cvs41.patchset
 ( cvs diff -u -r 1.1.2.90 -r 1.1.2.91 src/gtk/quicksearch.c;  ) > 3.7.5cvs42.patchset
+( cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/matcher_parser.h;  cvs diff -u -r 1.25.2.34 -r 1.25.2.35 src/matcher_parser_parse.y;  cvs diff -u -r 1.1.2.91 -r 1.1.2.92 src/gtk/quicksearch.c;  ) > 3.7.5cvs43.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=42
+EXTRA_VERSION=43
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
@@ -1359,6 +1359,8 @@ void quicksearch_set_search_strings(QuickSearch *quicksearch)
 
 	if (!strings)
 		return;
+
+	matcher_parser_disable_warnings(TRUE);
 	
 	do {
 		newstr = expand_search_string((gchar *) strings->data);
@@ -1390,6 +1392,8 @@ void quicksearch_set_search_strings(QuickSearch *quicksearch)
 	
 	} while ((strings = g_list_next(strings)) != NULL);
 
+	matcher_parser_disable_warnings(FALSE);	
+
 	quicksearch->normal_search_strings = g_list_reverse(quicksearch->normal_search_strings);
 	quicksearch->extended_search_strings = g_list_reverse(quicksearch->extended_search_strings);
 
diff --git a/src/matcher_parser.h b/src/matcher_parser.h
@@ -26,7 +26,7 @@
 extern FILE *matcher_parserin;
 extern int matcher_parserlineno;
 
-
+void matcher_parser_disable_warnings	(const gboolean disable);
 void matcher_parser_start_parsing	(FILE *f);
 int matcher_parserparse			(void);
 
diff --git a/src/matcher_parser_parse.y b/src/matcher_parser_parse.y
@@ -46,6 +46,7 @@ static MatcherList *cond;
 static GSList *action_list = NULL;
 static FilteringAction *action = NULL;
 static gboolean matcher_is_fast = TRUE;
+static gboolean disable_warnings = FALSE;
 
 static FilteringProp *filtering;
 
@@ -74,6 +75,11 @@ void matcher_parser_delete_buffer(void * b);
 void matcher_parserpop_buffer_state(void);
 int matcher_parserlex(void);
 
+void matcher_parser_disable_warnings(const gboolean disable)
+{
+	disable_warnings = disable;
+}
+
 void matcher_parser_start_parsing(FILE *f)
 {
 	matcher_parserlineno = 1;
@@ -288,8 +294,9 @@ void matcher_parsererror(char *str)
 		matchers_list = NULL;
 	}
 	cond = NULL;
-	g_warning("filtering parsing: %i: %s\n",
-		  matcher_parserlineno, str);
+	if (!disable_warnings)
+		g_warning("filtering parsing: %i: %s\n",
+		  	matcher_parserlineno, str);
 	error = 1;
 }