** See bug #57720.

2004-05-05  Not Zed  <NotZed@Ximian.com>

        ** See bug #57720.

        * em-folder-browser.c (emfb_create_view_menus): removed some stuff
        done in create_view_instance in the superclass.

        * em-folder-view.c (emfv_create_view_instance): moved here from
        em-folder-browser, setup the view instance for the folder.
        (emfv_set_folder): if the folder is set, create the view instance.

        * em-folder-browser.c: moved the galview instance and menu
        pointers to EMFolderView, since they're basically meta-data on the
        messagelist @ to fix issues.

        * em-folder-view.c (em_folder_view_open_selected): copy over the
        threaded list value when the message browser is brought up.

        ** some clean up

        * evolution-mail.schemas.in.in: removed xmailer_mask stuff.

        * em-migrate.c (mail_display_map[]): Removed xmailer_mask stuff.

        * em-folder-view.c (emfv_setting_notify): removed xmailer_mask stuff.

        * em-format-html.c (em_format_html_set_xmailer_mask): removed.
        This isn't used anymore.

        ** Fixes the double-draw on separate mail view.

        * message-list.c (on_cursor_activated_cmd): noop if the cursor and
        uid match for all cases (clearing uid).
        (on_selection_changed_cmd): noop if the cursor and new selection
        hasn't changed & fix a memleak.

svn path=/trunk/; revision=25806

1 files changed, 0 insertions, 7 deletions

diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index 17248a92d5..bbd0132017 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -91,11 +91,6 @@ struct _EMFormatHTMLPObject {
 #define EM_FORMAT_HTML_HEADER_HTML (EM_FORMAT_HEADER_LAST<<1) /* header already in html format */
 #define EM_FORMAT_HTML_HEADER_LAST (EM_FORMAT_HEADER_LAST<<8)
 
-/* xmailer_mask bits */
-#define EM_FORMAT_HTML_XMAILER_EVOLUTION (1<<0)
-#define EM_FORMAT_HTML_XMAILER_OTHER     (1<<1)
-#define EM_FORMAT_HTML_XMAILER_RUPERT    (1<<2)
-
 #define EM_FORMAT_HTML_VPAD "<table cellspacing=0 cellpadding=3><tr><td><a name=\"padding\"></a></td></tr></table>\n"
 
 struct _EMFormatHTML {
@@ -115,7 +110,6 @@ struct _EMFormatHTML {
 	guint32 frame_colour;
 	guint32 content_colour;
 	guint32 citation_colour;
-	unsigned int xmailer_mask:4;
 	unsigned int load_http:2;
 	unsigned int load_http_now:1;
 	unsigned int mark_citations:1;
@@ -135,7 +129,6 @@ void em_format_html_load_http(EMFormatHTML *emf);
 
 void em_format_html_set_load_http(EMFormatHTML *emf, int style);
 void em_format_html_set_mark_citations(EMFormatHTML *emf, int state, guint32 citation_colour);
-void em_format_html_set_xmailer_mask(EMFormatHTML *emf, unsigned int xmailer_mask);
 
 /* retrieves a pseudo-part icon wrapper for a file */
 struct _CamelMimePart *em_format_html_file_part(EMFormatHTML *efh, const char *mime_type, const char *filename);