Kill. Folders are now always open, and handle "closing" sorts of

	* camel-folder.c: (camel_folder_open, camel_folder_is_open,
	camel_folder_get_mode): Kill. Folders are now always open, and
	handle "closing" sorts of operations at sync or finalize time.
	(camel_folder_sync): renamed from camel_folder_close. Syncs state
	to the store but doesn't necessarily close/disconnect.

	* providers/*/camel-*-folder.c: Merge "open" methods into "init"
	methods. Rename close to sync and update appropriately.

	* providers/imap/camel-imap-store.c: Remove camel_imap_store_open
	and camel_imap_store_close, which should not have been copied from
	the POP provider (where the exist to work around limitations of
	the POP protocol).

svn path=/trunk/; revision=3581

1 files changed, 2 insertions, 35 deletions

diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index b35edc3aa9..2412f8da2c 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -41,24 +41,10 @@ extern "C" {
 #define CAMEL_FOLDER_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_FOLDER_TYPE, CamelFolderClass))
 #define CAMEL_IS_FOLDER(o)    (GTK_CHECK_TYPE((o), CAMEL_FOLDER_TYPE))
 
-typedef enum {
-	FOLDER_OPEN,
-	FOLDER_CLOSE
-} CamelFolderState;
-
-typedef enum {
-	FOLDER_OPEN_UNKNOWN = 0,   /* folder open mode is unknown */
-	FOLDER_OPEN_READ    = 1,   /* folder is read only         */ 
-	FOLDER_OPEN_WRITE   = 2,   /* folder is write only        */ 
-	FOLDER_OPEN_RW      = 3    /* folder is read/write        */ 
-} CamelFolderOpenMode;
-
 struct _CamelFolder
 {
 	CamelObject parent_object;
 	
-	CamelFolderOpenMode open_mode;
-	CamelFolderState open_state;
 	gchar *name;
 	gchar *full_name;
 	gchar *separator;
@@ -86,13 +72,8 @@ typedef struct {
 			gchar *separator, gboolean path_begins_with_sep,
 			CamelException *ex);
 
-	void   (*open) (CamelFolder *folder, 
-			CamelFolderOpenMode mode, 
+	void   (*sync) (CamelFolder *folder, gboolean expunge, 
 			CamelException *ex);
-	
-	void   (*close) (CamelFolder *folder, 
-			 gboolean expunge, 
-			 CamelException *ex);
 
 	const gchar *  (*get_name)  (CamelFolder *folder);
 
@@ -102,8 +83,6 @@ typedef struct {
 
 	gboolean   (*can_hold_messages)  (CamelFolder *folder);
 
-	gboolean   (*is_open) (CamelFolder *folder);
-
 	CamelFolder *  (*get_subfolder)  (CamelFolder *folder, 
 					  const gchar *folder_name, 
 					  gboolean create,
@@ -115,9 +94,6 @@ typedef struct {
 	CamelStore *  (*get_parent_store) (CamelFolder *folder, 
 					   CamelException *ex);
 
-	CamelFolderOpenMode (*get_mode)   (CamelFolder *folder, 
-					   CamelException *ex);
-
 	void (*expunge)  (CamelFolder *folder, 
 			  CamelException *ex);
 
@@ -180,12 +156,7 @@ CamelFolder *      camel_folder_get_subfolder          (CamelFolder *folder,
 							gboolean create,
 							CamelException *ex);
 
-void               camel_folder_open                   (CamelFolder *folder, 
-							CamelFolderOpenMode mode, 
-							CamelException *ex);
-
-
-void               camel_folder_close                  (CamelFolder *folder, 
+void               camel_folder_sync                   (CamelFolder *folder, 
 							gboolean expunge, 
 							CamelException *ex);
 
@@ -211,10 +182,6 @@ const gchar *      camel_folder_get_full_name          (CamelFolder *folder);
 guint32		   camel_folder_get_permanent_flags    (CamelFolder *folder,
 							CamelException *ex);
 
-CamelFolderOpenMode camel_folder_get_mode              (CamelFolder *folder, 
-							CamelException *ex);
-gboolean           camel_folder_is_open                (CamelFolder *folder);
-
 
 
 /* message manipulation */