aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--filter/ChangeLog4
-rw-r--r--filter/filter-driver.c13
2 files changed, 5 insertions, 12 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog
index 5839019a2a..0b46e59899 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-01 NotZed <NotZed@HelixCode.com>
+
+ * filter-driver.c (main): Fix for api.
+
2000-04-30 Dan Winship <danw@helixcode.com>
* filter-driver.c (start): Remove no-longer-necessary call to
diff --git a/filter/filter-driver.c b/filter/filter-driver.c
index 153bccfd5f..ff8b0a6fda 100644
--- a/filter/filter-driver.c
+++ b/filter/filter-driver.c
@@ -311,13 +311,6 @@ start(void)
return x;
}
-static void
-search_cb(CamelFolder *f, int id, gboolean complete, GList *matches, struct exec_context *x)
-{
- printf("appending matches ...\n");
- x->matches = g_list_concat(x->matches, g_list_copy(matches));
-}
-
int main(int argc, char **argv)
{
ESExp *f;
@@ -361,12 +354,8 @@ int main(int argc, char **argv)
expand_filter_option(s, a, fo);
printf("searching expression %s\n", s->str);
- x->matches= NULL;
- id = camel_folder_search_by_expression (x->folder, s->str, search_cb, x, x->ex);
+ x->matches = camel_folder_search_by_expression (x->folder, s->str, x->ex);
- /* wait for it to finish */
- camel_folder_search_complete(x->folder, id, TRUE, x->ex);
-
/* remove uid's for which processing is complete ... */
m = x->matches;
while (m) {