From 5674966eeb7eecfa109ad419f1c997dba69ff0af Mon Sep 17 00:00:00 2001 From: Not Zed Date: Sun, 24 Dec 2000 00:58:02 +0000 Subject: Merge from camel-mt-branch. 2000-12-24 Not Zed * Merge from camel-mt-branch. svn path=/trunk/; revision=7152 --- filter/ChangeLog | 4 ++++ filter/filter-driver.c | 2 -- filter/filter-message-search.c | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'filter') diff --git a/filter/ChangeLog b/filter/ChangeLog index 6db104a5d6..57e19636ee 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,7 @@ +2000-12-24 Not Zed + + * Merge from camel-mt-branch. + 2000-12-21 Not Zed * filter-message-search.c (filter_message_search): And here too. diff --git a/filter/filter-driver.c b/filter/filter-driver.c index 0e4fbe682c..deeb075d11 100644 --- a/filter/filter-driver.c +++ b/filter/filter-driver.c @@ -205,8 +205,6 @@ filter_driver_finalise (GtkObject *obj) g_hash_table_foreach (p->globals, free_hash_strings, driver); g_hash_table_destroy (p->globals); - /* anal warning hunters, just leave this, its only temporary, touch and die */ -#define e_sexp_unref(x) (gtk_object_unref((GtkObject *)(x))) e_sexp_unref(p->eval); if (p->defaultfolder) diff --git a/filter/filter-message-search.c b/filter/filter-message-search.c index ff599a2007..59fe4e78f8 100644 --- a/filter/filter-message-search.c +++ b/filter/filter-message-search.c @@ -794,8 +794,6 @@ filter_message_search (CamelMimeMessage *message, CamelMessageInfo *info, else retval = FALSE; - /* anal warning hunters, just leave this, its only temporary, touch and die */ -#define e_sexp_unref(x) (gtk_object_unref(x)) e_sexp_unref(sexp); e_sexp_result_free (result); -- cgit v1.2.3