cvs removed.

2003-09-17  Not Zed  <NotZed@Ximian.com>

         * folder-browser.c, folder-browser.h, folder-browser-ui.c
         folder-browser-ui.h, mail-callbacks.c, mail-callbacks.h
         mail-display.c, mail-display.h, mail-display-stream.c
         mail-display-stream.h, mail-format.c, mail-format.h
         mail-identify.c, mail-search.c, mail-search.h
         message-browser.c, message-browser.h, subscribe-dialog.c
         subscribe-dialog.h, mail-font-prefs.c, mail-font-prefs.h: cvs
         removed.

        * Makefile.am: Removed mail-font-prefs.[ch], hasn't been built for
        ages.

        * em-*.c: killed a bunch of printfs.

        * em-format-html-display.c (efhd_html_button_press_event): update
        for html object api chagnes.

        ** Merge in mail-refactor-2 branch.

svn path=/trunk/; revision=22602

1 files changed, 60 insertions, 13 deletions

diff --git a/mail/message-list.h b/mail/message-list.h
index de2ddc199f..a5c88cf308 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -1,4 +1,26 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2003 Ximian, Inc. (www.ximian.com)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+
 #ifndef _MESSAGE_LIST_H_
 #define _MESSAGE_LIST_H_
 
@@ -9,6 +31,11 @@
 #include <gal/e-table/e-tree-scrolled.h>
 #include "mail-types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
 #define MESSAGE_LIST_TYPE        (message_list_get_type ())
 #define MESSAGE_LIST(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), MESSAGE_LIST_TYPE, MessageList))
 #define MESSAGE_LIST_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), MESSAGE_LIST_TYPE, MessageListClass))
@@ -55,14 +82,17 @@ enum {
 struct _MessageList {
 	ETreeScrolled parent;
 
+	struct _MessageListPrivate *priv;
+
 	/* The table */
 	ETreeModel   *model;
 	ETree        *tree;
 	ETreePath     tree_root;
 	ETableExtras *extras;
 
-	/* The folder */
+	/* The folder & matching uri */
 	CamelFolder  *folder;
+	char *folder_uri;
 
 	GHashTable *uid_nodemap; /* uid (from info) -> tree node mapping */
 	
@@ -99,6 +129,7 @@ struct _MessageList {
 
 	/* list of outstanding regeneration requests */
 	GList *regen;
+	char *pending_select_uid; /* set if we were busy regnerating while we had a select come in */
 
 	/* the current camel folder thread tree, if any */
 	struct _CamelFolderThread *thread_tree;
@@ -126,14 +157,16 @@ typedef enum {
 
 GtkType        message_list_get_type   (void);
 GtkWidget     *message_list_new        (void);
-void           message_list_set_folder (MessageList *message_list,
-					CamelFolder *camel_folder,
-					gboolean outgoing);
+void           message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder, const char *uri, gboolean outgoing);
 
 void           message_list_foreach    (MessageList *message_list,
 					MessageListForeachFunc callback,
 					gpointer user_data);
 
+GPtrArray     *message_list_get_selected(MessageList *ml);
+void	       message_list_free_uids(MessageList *ml, GPtrArray *uids);
+
+/* select next/prev message helpers */
 gboolean       message_list_select     (MessageList *message_list,
 					MessageListSelectDirection direction,
 					guint32 flags,
@@ -143,24 +176,38 @@ gboolean       message_list_select     (MessageList *message_list,
 void           message_list_select_uid (MessageList *message_list,
 					const char *uid);
 
-void           message_list_select_next_thread (MessageList *messageList);
+void           message_list_select_next_thread (MessageList *ml);
+
+/* selection manipulation */
+void           message_list_select_all (MessageList *ml);
+void           message_list_select_thread (MessageList *ml);
+void           message_list_invert_selection (MessageList *ml);
+
+/* clipboard stuff */
+void	       message_list_copy(MessageList *ml, gboolean cut);
+gboolean       message_list_has_primary_selection(MessageList *ml);
+void           message_list_paste (MessageList *ml);
 
 /* info */
-unsigned int   message_list_length(MessageList *ml);
-unsigned int   message_list_hidden(MessageList *ml);
+unsigned int   message_list_length (MessageList *ml);
+unsigned int   message_list_hidden (MessageList *ml);
 
 /* hide specific messages */
-void	       message_list_hide_add(MessageList *ml, const char *expr, unsigned int lower, unsigned int upper);
-void	       message_list_hide_uids(MessageList *ml, GPtrArray *uids);
-void	       message_list_hide_clear(MessageList *ml);
+void	       message_list_hide_add (MessageList *ml, const char *expr, unsigned int lower, unsigned int upper);
+void	       message_list_hide_uids (MessageList *ml, GPtrArray *uids);
+void	       message_list_hide_clear (MessageList *ml);
 
-void	       message_list_set_threaded(MessageList *ml, gboolean threaded);
-void	       message_list_set_hidedeleted(MessageList *ml, gboolean hidedeleted);
-void	       message_list_set_search(MessageList *ml, const char *search);
+void	       message_list_set_threaded (MessageList *ml, gboolean threaded);
+void	       message_list_set_hidedeleted (MessageList *ml, gboolean hidedeleted);
+void	       message_list_set_search (MessageList *ml, const char *search);
 
 void           message_list_save_state (MessageList *ml);
 
 #define MESSAGE_LIST_LOCK(m, l) g_mutex_lock(((MessageList *)m)->l)
 #define MESSAGE_LIST_UNLOCK(m, l) g_mutex_unlock(((MessageList *)m)->l)
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* _MESSAGE_LIST_H_ */