if we get a null default, then set "" on the entry. (emae_option_entry):

2005-07-21  Not Zed  <NotZed@Ximian.com>

        * em-account-editor.c (emae_option_entry): if we get a null
        default, then set "" on the entry.
        (emae_option_entry): set the default value on the url if it
        doesn't exist already.

2005-07-20  Not Zed  <NotZed@Ximian.com>

        * mail-send-recv.c (refresh_folders_desc, refresh_folders_get)
        (refresh_folders_got, refresh_folders_free, get_folders)
        (receive_update_got_folderinfo, receive_update_got_store): refresh
        all the folders manually and directly.

        * mail-folder-cache.c (setup_folder): propagate even -1 unread
        counts, they get ignored later.

        * em-composer-utils.c (emu_handle_receipt_message)
        (em_utils_handle_receipt): use getmessagex too, so we can always
        clear any error.

        * em-folder-view.c (emfv_message_selected_timeout)
        (emfv_list_done_message_selected): use getmessagex and do
        something meaninful with the error.

        * mail-ops.c (mail_get_messagex): added new get message which
        returns an exception.

2005-07-19  Not Zed  <NotZed@Ximian.com>

        * mail-tools.c (mail_tool_uri_to_folder): dont get the service
        connected, it will connect if it needs to.

        * mail-ops.c (get_folderinfo_get): * em-folder-utils.c
        (emft_copy_folders__copy)
        (emfu_delete_folders): * em-folder-tree.c
        (emft_get_folder_info__get): Always request subscribed folders, if
        the backend doesn't implement it it will ignore it.

2005-07-13  Not Zed  <NotZed@Ximian.com>

        * mail-send-recv.c (mail_autoreceive_init, auto_online): listen to
        session online events, and if we are online, trigger an
        auto-receive of all auto-check accounts.

2005-07-11  Not Zed  <NotZed@Ximian.com>

        * mail-send-recv.c (auto_account_commit): force an update
        immediately if we're setting up the timeout to start with.

        * em-folder-tree-model.c (em_folder_tree_model_set_unread_count):
        noop if the unread count < 0.
        (em_folder_tree_model_set_folder_info): only set the unread count
        if we actually have one.

        * em-folder-tree.c (emft_tree_row_expanded): get the folder list
        'fast'.

        * mail-ops.c (get_folderinfo_get): get the folder list 'fast'.

svn path=/trunk/; revision=29822

1 files changed, 14 insertions, 2 deletions

diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 0526cc413b..8eb51b198f 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -87,6 +87,7 @@
 #include "em-event.h"
 
 #include <gtkhtml/gtkhtml.h>
+#include <gtkhtml/gtkhtml-stream.h>
 
 #include "mail-mt.h"
 #include "mail-ops.h"
@@ -2166,7 +2167,7 @@ do_mark_seen (gpointer user_data)
 }
 
 static void
-emfv_list_done_message_selected(CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data)
+emfv_list_done_message_selected(CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *ex)
 {
 	EMFolderView *emfv = data;
 	EMEvent *eme;
@@ -2211,6 +2212,17 @@ emfv_list_done_message_selected(CamelFolder *folder, const char *uid, CamelMimeM
 		} else {
 			emfv_set_seen (emfv, uid);
 		}
+	} else if (camel_exception_is_set(ex)) {
+		GtkHTMLStream *hstream = gtk_html_begin(((EMFormatHTML *)emfv->preview)->html);
+
+		/* Display the error inline rather than popping up an annoying box.
+		   We also clear the exception, this stops the box popping up */
+
+		gtk_html_stream_printf(hstream, "<h2>%s</h2><p>%s</p>",
+				       _("Unable to retrieve message"),
+				       ex->desc);
+		gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK);
+		camel_exception_clear(ex);
 	}
 	
 	emfv->priv->nomarkseen = FALSE;
@@ -2231,7 +2243,7 @@ emfv_message_selected_timeout(void *data)
 			g_object_ref (emfv);
 			/* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */
 			e_profile_event_emit("goto.load", emfv->displayed_uid, 0);
-			mail_get_message(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_thread_queued);
+			mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_thread_queued);
 		} else {
 			e_profile_event_emit("goto.empty", "", 0);
 			g_free(emfv->priv->selected_uid);