New widget, full search dialogue for mail.

2000-10-06  Not Zed  <NotZed@HelixCode.com>

        * mail-search-dialogue.c: New widget, full search dialogue for
        mail.

        * folder-browser.c (search_set): If we click on custom search, run
        the full search dialogue.
        (folder_browser_gui_init): Add a button to perform a full search.
        (search_full): Bring up the mail search dialogue asynchronously.
        (search_full_clicked): Handle search options.
        (folder_browser_destroy): Free the saved rule if there is one
        there.
        (search_options[]): Added a custom option option - brings up the
        full search dialogue.
        (search_set): Disable the search entry if we are doing a full
        search.

        * mail-vfolder.c (vfolder_create_storage): Yay, finally
        depeterised this stuff.
        (vfolder_uri_to_folder): Removed an irrelevant comment.

        * mail-callbacks.c (filter_edit): And here.

        * mail-ops.c (do_fetch_mail): And here too.

        * mail-autofilter.c (filter_gui_add_from_message): Fixed call to
        context_load.
        (filter_gui_add_for_mailing_list): And here too.

        * folder-browser-factory.c (create_ondemand_hooks): Remove that
        ondemand callback snot.

2000-10-05  Not Zed  <NotZed@HelixCode.com>

        * message-list.c (message_list_init_etable): Build the etable once
        we know what folder we are going to use.
        (save_header_state): Save the header spec to a cache file.
        (message_list_destroy): Save the header spec.
        (message_list_setup_etable): Setup the etable spec for this
        folder, from a saved version if one exists, or to suit the folder
        type (sent/received).
        (message_list_set_folder): Setup the etable here once we have a folder.

svn path=/trunk/; revision=5798

1 files changed, 7 insertions, 8 deletions

diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 7f590465ea..1bc493b381 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -32,10 +32,8 @@
 static GList *control_list = NULL;
 
 static void
-register_ondemand (RuleContext *f, FilterRule *rule, gpointer data)
+register_ondemand (RuleContext *f, FilterRule *rule, FolderBrowser *fb, BonoboUIComponent *uic)
 {
-	FolderBrowser *fb = FOLDER_BROWSER (data);
-	BonoboUIComponent *uic = gtk_object_get_data (GTK_OBJECT (fb), "uih");
 	BonoboUIHandler *uih;
 	gchar *text;
 	struct fb_ondemand_closure *oc;
@@ -67,14 +65,15 @@ static void
 create_ondemand_hooks (FolderBrowser *fb, BonoboUIComponent *uic)
 {
 	gchar *system, *user;
-	
+	FilterRule *rule = NULL;
+
 	user = g_strdup_printf ("%s/filters.xml", evolution_dir);
 	system = EVOLUTION_DATADIR "/evolution/filtertypes.xml";
 	fb->filter_context = filter_context_new();
-	gtk_object_set_data (GTK_OBJECT (fb), "uih", uic);
-	rule_context_load ((RuleContext *) fb->filter_context, system, user,
-			   register_ondemand, fb);
-	gtk_object_remove_data (GTK_OBJECT (fb), "uih");
+	rule_context_load ((RuleContext *) fb->filter_context, system, user);
+	while ( (rule = rule_context_next_rule((RuleContext *)fb->filter_context, rule)) != NULL ) {
+		register_ondemand((RuleContext *)fb->filter_context, rule, fb, uic);
+	}
 	g_free (user);
 }