> * providers/mbox/camel-mbox-search.c

> 	(camel_mbox_folder_search_by_expression): Dont store/remove
> 	current search from the search list.
>
> 	* providers/mbox/camel-mbox-folder.h: Removed searches list,
> 	searches are all sync now.

svn path=/trunk/; revision=2755

4 files changed, 7 insertions, 11 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index cedc8e4b9d..bcafb56e19 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,12 @@
 2000-05-02  NotZed  <NotZed@HelixCode.com>
 
+	* providers/mbox/camel-mbox-search.c
+	(camel_mbox_folder_search_by_expression): Dont store/remove
+	current search from the search list.
+
+	* providers/mbox/camel-mbox-folder.h: Removed searches list,
+	searches are all sync now.
+
 	* gmime-utils.[ch]: What the hell, remove it.  This will break the
 	nntp provider.  The mime parser can be used instead though.
 	Removed from all code including it (but none were using it).
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index e2a6a731f9..fa22cf9dcb 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -472,11 +472,6 @@ set_content_object (CamelMedium *medium, CamelDataWrapper *content)
 }
 
 /**********************************************************************/
-#ifdef WHPT
-#warning : WHPT is already defined !!!!!!
-#endif
-#define WHPT gmime_write_header_pair_to_stream
-
 
 static int
 write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
@@ -491,7 +486,6 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 	/* FIXME: something needs to be done about this ... */
 	/* FIXME: need to count these bytes too */
 #warning content-languages should be stored as a header
-	gmime_write_header_with_glist_to_stream (stream, "Content-Language", mp->content_languages,", ");
 
 	if (mp->headers) {
 		struct _header_raw *h = mp->headers;
diff --git a/camel/providers/mbox/camel-mbox-folder.h b/camel/providers/mbox/camel-mbox-folder.h
index 366aca3e86..24a336f8c9 100644
--- a/camel/providers/mbox/camel-mbox-folder.h
+++ b/camel/providers/mbox/camel-mbox-folder.h
@@ -54,7 +54,6 @@ typedef struct {
 	gchar *index_file_path;	   /* index of body contents */
 
 	ibex *index;		/* index for this folder */
-	GList *searches;	/* current searches */
 
 	CamelMboxSummary *summary;
 } CamelMboxFolder;
diff --git a/camel/providers/mbox/camel-mbox-search.c b/camel/providers/mbox/camel-mbox-search.c
index 107984d75b..412926ea2c 100644
--- a/camel/providers/mbox/camel-mbox-search.c
+++ b/camel/providers/mbox/camel-mbox-search.c
@@ -300,8 +300,6 @@ GList *camel_mbox_folder_search_by_expression(CamelFolder *folder, const char *e
 		g_warning("No folder index, searches will not function fully");
 	}
 
-	((CamelMboxFolder *)folder)->searches = g_list_append(((CamelMboxFolder *)folder)->searches, ctx);
-
 	for(i=0;i<sizeof(symbols)/sizeof(symbols[0]);i++) {
 		if (symbols[i].type == 1) {
 			e_sexp_add_ifunction(f, 0, symbols[i].name, (ESExpIFunc *)symbols[i].func, ctx);
@@ -329,8 +327,6 @@ GList *camel_mbox_folder_search_by_expression(CamelFolder *folder, const char *e
 
 	gtk_object_unref((GtkObject *)f);
 
-	((CamelMboxFolder *)folder)->searches = g_list_remove(((CamelMboxFolder *)folder)->searches, ctx);
-
 	g_free(ctx);
 
 	return matches;