Remove the never-once-used BonoboObject stuff and make MessageList be a

	* message-list.c: Remove the never-once-used BonoboObject stuff
	and make MessageList be a GtkWidget instead. Also, keep track of
	the ETable directly rather than repeatedly calling
	e_table_scrolled_get_table.

	* folder-browser.c (folder_browser_destroy): Use gtk methods
	rather than bonobo methods to destroy the message list.
	(on_right_click, on_double_click): These are being attached to the
	ETable directly now, so fix the first argument (which isn't being
	used anyway, but...)
	(folder_browser_gui_init): simplify now that MessageList itself is
	a widget. Also use message_list->table rather than
	e_table_scrolled_get_table.

	* mail-local.c (mail_local_reconfigure_folder): Add "mail_" to
	the beginning of this function name to match its prototype and the
	other vague namespace conventions in the mailer.

	* mail-callbacks.c (select_all, invert_selection): Use ml->table.
	(configure_folder): s/local_reconfigure_folder/mail_&/

svn path=/trunk/; revision=6908

1 files changed, 19 insertions, 21 deletions

diff --git a/mail/message-list.h b/mail/message-list.h
index 400da181c7..d377384732 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -4,9 +4,6 @@
 
 #include <gnome.h>
 #include "mail-types.h"
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-ui-component.h>
 #include <gal/e-table/e-table-scrolled.h>
 #include <gal/e-table/e-table-simple.h>
 #include <gal/e-table/e-tree-simple.h>
@@ -21,8 +18,6 @@
 #define IS_MESSAGE_LIST(o)       (GTK_CHECK_TYPE ((o), MESSAGE_LIST_TYPE))
 #define IS_MESSAGE_LIST_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), MESSAGE_LIST_TYPE))
 
-typedef struct _Renderer Renderer;
-
 enum {
 	COL_MESSAGE_STATUS,
 	COL_FLAGGED,
@@ -44,35 +39,39 @@ enum {
 };
 
 struct _MessageList {
-	BonoboObject parent;
-	
+	ETableScrolled parent;
+
+	/* The table */
 	ETableModel  *table_model;
-	
+	ETable       *table;
 	ETreePath    *tree_root;
-	
-	GtkWidget    *etable;
 
+	/* The folder */
 	CamelFolder  *folder;
 
-	GHashTable	*uid_rowmap; /* key is the uid, value is the row number.
-					Note: The key string is owned by table_model (in uid_pool) */
-	struct _EMemPool *uid_pool; /* mempool to hold uid strings */
+	/* UID to model row hash table. Keys owned by the mempool. */
+	GHashTable       *uid_rowmap;
+	struct _EMemPool *uid_pool;
+
+	/* Current search string, or %NULL */
+	char *search;
 
-	char *search;		/* current search string */
+	/* Are we displaying threaded view? */
+	gboolean threaded;
 
-	gboolean threaded;	/* are we displaying threaded view? */
+	/* Where the ETable cursor is. */
 	int cursor_row;
 	const char *cursor_uid;
-	
-	/* row-selection and seen-marking timers */
+
+	/* Row-selection and seen-marking timers */
 	guint idle_id, seen_id;
 };
 
 typedef struct {
-	BonoboObjectClass parent_class;
+	ETableScrolledClass parent_class;
 
 	/* signals - select a message */
-	void (*message_selected)(MessageList *ml, const char *uid);
+	void (*message_selected) (MessageList *ml, const char *uid);
 } MessageListClass;
 
 typedef void (*MessageListForeachFunc) (MessageList *message_list,
@@ -85,10 +84,9 @@ typedef enum {
 } MessageListSelectDirection;
 
 GtkType        message_list_get_type   (void);
-BonoboObject   *message_list_new        (void);
+GtkWidget     *message_list_new        (void);
 void           message_list_set_folder (MessageList *message_list,
 					CamelFolder *camel_folder);
-GtkWidget     *message_list_get_widget (MessageList *message_list);
 
 void           message_list_foreach    (MessageList *message_list,
 					MessageListForeachFunc callback,