From 79154e4ac8759f24656fe55253b25d1c84834337 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Mon, 9 Oct 2000 12:57:36 +0000 Subject: New widget, full search dialogue for mail. 2000-10-06 Not Zed * 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 * 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 --- mail/mail-vfolder.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'mail/mail-vfolder.c') diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 40e3cd7f11..a26c2986fc 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -87,16 +87,11 @@ vfolder_refresh(void) g_free(info->query); info->query = g_strdup(expr->str); - /*uri = g_strdup_printf("vfolder:%s/vfolder/%s?%s", evolution_dir, info->name, info->query);*/ uri = g_strdup_printf("vfolder:%s", info->name); path = g_strdup_printf("/%s", info->name); evolution_storage_removed_folder(vfolder_storage, path); - evolution_storage_new_folder (vfolder_storage, - path, - g_basename (path), - "mail", - uri, - info->name); + evolution_storage_new_folder(vfolder_storage, path, g_basename(path), + "mail", uri, info->name); g_free(uri); g_free(path); } @@ -106,15 +101,10 @@ vfolder_refresh(void) info->query = g_strdup(expr->str); d(printf("Adding new vfolder: %s %s\n", rule->name, expr->str)); - /*uri = g_strdup_printf("vfolder:%s/vfolder/%s?%s", evolution_dir, info->name, info->query);*/ uri = g_strdup_printf("vfolder:%s", info->name); path = g_strdup_printf("/%s", info->name); - evolution_storage_new_folder (vfolder_storage, - path, - g_basename (path), - "mail", - uri, - info->name); + evolution_storage_new_folder(vfolder_storage, path, g_basename(path), + "mail", uri, info->name); g_free(uri); g_free(path); } @@ -167,7 +157,7 @@ vfolder_create_storage(EvolutionShellComponent *shell_component) context = vfolder_context_new(); printf("loading rules %s %s\n", system, user); - if (rule_context_load((RuleContext *)context, system, user, NULL, NULL) != 0) { + if (rule_context_load((RuleContext *)context, system, user) != 0) { g_warning("cannot load vfolders: %s\n", ((RuleContext *)context)->error); } g_free(user); @@ -175,7 +165,6 @@ vfolder_create_storage(EvolutionShellComponent *shell_component) vfolder_refresh(); } -/* THIS IS ANALOGOUS TO mail_tool_uri_to_folder. IT IS NOT ASYNCHRONOUS */ /* maps the shell's uri to the real vfolder uri and open the folder */ CamelFolder * vfolder_uri_to_folder(const char *uri, CamelException *ex) -- cgit v1.2.3