Remove bits of filter-on-demand and toolbar bug workaround cruft that

	* folder-browser.c: Remove bits of filter-on-demand and toolbar
	bug workaround cruft that don't do anything useful any more.

	* mail-ops.c (cleanup_load_folder): unref the ref we added in
	setup_load_folder.

svn path=/trunk/; revision=6812

4 files changed, 9 insertions, 29 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8e309f3f87..5121d6daf8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-06  Dan Winship  <danw@helixcode.com>
+
+	* folder-browser.c: Remove bits of filter-on-demand and toolbar
+	bug workaround cruft that don't do anything useful any more.
+
+	* mail-ops.c (cleanup_load_folder): unref the ref we added in
+	setup_load_folder.
+
 2000-12-05  Jeffrey Stedfast  <fejj@helixcode.com>
 
 	* mail-display.c (write_data_to_file): Use a charset filter to
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 7707c87874..3a56ee030e 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -46,14 +46,6 @@ static void fb_resize_cb (GtkWidget *w, GtkAllocation *a);
 
 static GtkObjectClass *folder_browser_parent_class;
 
-static void oc_destroy (gpointer obj, gpointer user)
-{
-	struct fb_ondemand_closure *oc = (struct fb_ondemand_closure *) obj;
-
-	g_free (oc->path);
-	g_free (oc);
-}
-
 static void
 folder_browser_destroy (GtkObject *object)
 {
@@ -83,14 +75,6 @@ folder_browser_destroy (GtkObject *object)
 	if (folder_browser->mail_display)
 		gtk_widget_destroy (GTK_WIDGET (folder_browser->mail_display));
 	
-	if (folder_browser->filter_context)
-		gtk_object_unref (GTK_OBJECT (folder_browser->filter_context));
-	
-	if (folder_browser->filter_menu_paths) {
-		g_slist_foreach (folder_browser->filter_menu_paths, oc_destroy, NULL);
-		g_slist_free (folder_browser->filter_menu_paths);
-	}
-	
 	CORBA_exception_free (&ev);
 	
 	folder_browser_parent_class->destroy (object);
@@ -749,16 +733,12 @@ my_folder_browser_init (GtkObject *object)
 	gtk_signal_connect (GTK_OBJECT(fb->message_list), "message_selected",
 			    on_message_selected, fb);
 
-	fb->filter_menu_paths = NULL;
-	fb->filter_context = NULL;
-
 	folder_browser_gui_init (fb);
 }
 
 GtkWidget *
 folder_browser_new (const GNOME_Evolution_Shell shell)
 {
-	static int serial = 0;
 	CORBA_Environment ev;
 	FolderBrowser *folder_browser;
 
@@ -768,7 +748,6 @@ folder_browser_new (const GNOME_Evolution_Shell shell)
 
 	my_folder_browser_init (GTK_OBJECT (folder_browser));
 	folder_browser->uri = NULL;
-	folder_browser->serial = serial++;
 
 	folder_browser->shell = CORBA_Object_duplicate (shell, &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
diff --git a/mail/folder-browser.h b/mail/folder-browser.h
index a7c06dca80..d2b6c8b317 100644
--- a/mail/folder-browser.h
+++ b/mail/folder-browser.h
@@ -29,9 +29,6 @@ struct  _FolderBrowser {
 	
 	GNOME_Evolution_Shell shell;
 	
-	/* This is a kludge for the toolbar problem. */
-	int serial;
-	
 	/*
 	 * The current URI being displayed by the FolderBrowser
 	 */
@@ -47,10 +44,6 @@ struct  _FolderBrowser {
 	FilterRule  *search_full; /* if we have a full search active */
 
 	gboolean     preview_shown;
-
-	/* Stuff to allow on-demand filtering */
-	GSList        *filter_menu_paths;
-	FilterContext *filter_context;
 };
 
 
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 77d3aa564e..cb6c0ee671 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1773,7 +1773,7 @@ cleanup_load_folder (gpointer in_data, gpointer op_data, CamelException *ex)
 		message_list_set_folder (input->fb->message_list, input->fb->folder);
 	}
 
-	/*g_free (input->url); = fb->uri now */
+	gtk_object_unref (GTK_OBJECT (input->fb));
 }
 
 static const mail_operation_spec op_load_folder = {