#include <camel/camel-file-utils.h>

* message-list.c: #include <camel/camel-file-utils.h>

	* mail-ops.c (get_folderinfo_get):
	* subscribe-dialog.c (build_tree): Update for
	camel_store_get_folder_info prototype change.

	* mail-format.c (handle_text_plain_flowed): Improve more on the
	fix from the other day: the first level of indentation adds blank
	lines, but further levels don't...

svn path=/trunk/; revision=9660
This commit is contained in:
Dan Winship
2001-05-03 20:54:07 +00:00
parent 7c553e6e5b
commit 08e6ede22a
5 changed files with 25 additions and 8 deletions

View File

@ -1,3 +1,15 @@
2001-05-03 Dan Winship <danw@ximian.com>
* message-list.c: #include <camel/camel-file-utils.h>
* mail-ops.c (get_folderinfo_get):
* subscribe-dialog.c (build_tree): Update for
camel_store_get_folder_info prototype change.
* mail-format.c (handle_text_plain_flowed): Improve more on the
fix from the other day: the first level of indentation adds blank
lines, but further levels don't...
2001-04-30 Dan Winship <danw@ximian.com>
* folder-browser.c (folder_browser_destroy): Unhook event handlers

View File

@ -978,14 +978,14 @@ handle_text_plain_flowed (char *buf, MailDisplay *md)
mail_html_write (md->html, md->stream,
"<font color=\"#%06x\">",
citation_color);
if (br_pending)
br_pending--;
}
while (quoting > prevquoting) {
mail_html_write (md->html, md->stream,
"<blockquote>");
prevquoting++;
}
if (br_pending)
br_pending--;
while (quoting < prevquoting) {
mail_html_write (md->html, md->stream,
"</blockquote>");
@ -994,6 +994,8 @@ handle_text_plain_flowed (char *buf, MailDisplay *md)
if (quoting == 0) {
mail_html_write (md->html, md->stream,
"</font>\n");
if (br_pending)
br_pending--;
}
}

View File

@ -1039,11 +1039,13 @@ add_vtrash_info (CamelFolderInfo *info)
static void get_folderinfo_get(struct _mail_msg *mm)
{
struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm;
guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE;
if (camel_store_supports_subscriptions (m->store))
flags |= CAMEL_STORE_FOLDER_INFO_SUBSCRIBED;
camel_operation_register(mm->cancel);
m->info = camel_store_get_folder_info (m->store, NULL, FALSE, TRUE,
camel_store_supports_subscriptions (m->store),
&mm->ex);
m->info = camel_store_get_folder_info (m->store, NULL, flags, &mm->ex);
if (m->info && m->info->url)
add_vtrash_info (m->info);
camel_operation_unregister(mm->cancel);

View File

@ -30,10 +30,11 @@
#include <gal/e-table/e-tree-memory-callbacks.h>
#include <camel/camel-exception.h>
#include <camel/camel-file-utils.h>
#include <camel/camel-folder.h>
#include <e-util/ename/e-name-western.h>
#include <camel/camel-folder-thread.h>
#include <camel/camel-vtrash-folder.h>
#include <e-util/ename/e-name-western.h>
#include <e-util/e-memory.h>
#include "mail-config.h"

View File

@ -750,7 +750,7 @@ build_tree (SubscribeDialog *sc, CamelStore *store)
sc->store = store;
sc->storage = mail_lookup_storage (sc->store);
sc->folder_info = camel_store_get_folder_info (sc->store, sc->search_top, TRUE, TRUE, FALSE, ex);
sc->folder_info = camel_store_get_folder_info (sc->store, sc->search_top, CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST, ex);
if (camel_exception_is_set (ex)) {
printf ("camel_store_get_folder_info failed\n");