Updated to call em_folder_tree_model_set_folder_info().

2003-12-01  Jeffrey Stedfast  <fejj@ximian.com>

	* em-folder-tree.c (em_folder_tree_get_folder_info__got): Updated
	to call em_folder_tree_model_set_folder_info().
	(folder_subscribed_cb): Removed.
	(folder_unsubscribed_cb): Removed.
	(folder_created_cb): Removed.
	(folder_deleted_cb): Removed.
	(folder_renamed_cb): Removed.

	* em-folder-tree-model.c (em_folder_tree_store_set_folder_info):
	New function to replace tree_store_set_folder_info() which had
	been in em-folder-tree.c
	(em_folder_tree_model_remove_uri): Made private.
	(em_folder_tree_model_remove_store_info): Made private.
	(em_folder_tree_model_remove_folders): New function to replace
	remove_folders() from em-folder-tree.c
	(em_folder_tree_model_new): No longer takes any args.

	* em-folder-tree.c (em_folder_tree_new): Updated.

	* mail-component.c (add_store): Add the store to the model rather
	than the treeview.
	(impl_createControls): create a new treeview based on the
	already-instantiated model.
	(mail_component_init): Create a new tree model.
	(mail_component_remove_store): Remove the store from the model
	directly.
	(mail_component_get_tree_model): Updated.

	* em-folder-tree.c (folder_unsubscribed_cb): Call
	em_folder_tree_model_remove_folders() rather than the deprecated
	internal remove_folders() function.
	(folder_renamed_cb): Same.
	(em_folder_tree_remove_store): Removed.
	(em_folder_tree_add_store): Removed.
	(remove_folders): Removed.

svn path=/trunk/; revision=23545

1 files changed, 25 insertions, 3 deletions

diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h
index f120c0dc62..e8755f0578 100644
--- a/mail/em-folder-tree-model.h
+++ b/mail/em-folder-tree-model.h
@@ -45,6 +45,22 @@ typedef struct _EMFolderTreeModel EMFolderTreeModel;
 typedef struct _EMFolderTreeModelClass EMFolderTreeModelClass;
 typedef struct _EMFolderTreeModelStoreInfo EMFolderTreeModelStoreInfo;
 
+enum {
+	COL_STRING_DISPLAY_NAME,  /* string that appears in the tree */
+	COL_POINTER_CAMEL_STORE,  /* CamelStore object */
+	COL_STRING_FOLDER_PATH,   /* if node is a folder, the full path of the folder */
+	COL_STRING_URI,           /* the uri to get the store or
+				   * folder object */
+	COL_UINT_UNREAD,          /* unread count */
+	
+	COL_BOOL_IS_STORE,        /* toplevel store node? */
+	COL_BOOL_LOAD_SUBDIRS,    /* %TRUE only if the store/folder
+				   * has subfolders which have not yet
+				   * been added to the tree */
+	NUM_COLUMNS
+};
+
+
 struct _EMFolderTreeModelStoreInfo {
 	CamelStore *store;
 	GtkTreeRowReference *row;
@@ -91,11 +107,17 @@ struct _EMFolderTreeModelClass {
 GType em_folder_tree_model_get_type (void);
 
 
-EMFolderTreeModel *em_folder_tree_model_new (int n_columns, GType *types);
+EMFolderTreeModel *em_folder_tree_model_new (void);
+
 
+void em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *iter,
+					   struct _EMFolderTreeModelStoreInfo *si,
+					   CamelFolderInfo *fi);
 
-void em_folder_tree_model_remove_uri (EMFolderTreeModel *model, const char *uri);
-void em_folder_tree_model_remove_store_info (EMFolderTreeModel *model, CamelStore *store);
+void em_folder_tree_model_add_store (EMFolderTreeModel *model, CamelStore *store, const char *display_name);
+void em_folder_tree_model_remove_store (EMFolderTreeModel *model, CamelStore *store);
+void em_folder_tree_model_remove_folders (EMFolderTreeModel *model, struct _EMFolderTreeModelStoreInfo *si,
+					  GtkTreeIter *toplevel);
 
 #ifdef __cplusplus
 }