aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/camel-folder-pt-proxy.c45
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/message-list.c2
3 files changed, 29 insertions, 23 deletions
diff --git a/camel/camel-folder-pt-proxy.c b/camel/camel-folder-pt-proxy.c
index e2e25c9149..a181ba8582 100644
--- a/camel/camel-folder-pt-proxy.c
+++ b/camel/camel-folder-pt-proxy.c
@@ -53,9 +53,9 @@ enum CamelFolderFunc {
static CamelFuncDef _camel_func_def [CAMEL_FOLDER__LAST_FUNC];
-static void _init_with_store (CamelFolder *folder,
- CamelStore *parent_store,
- CamelException *ex);
+static void _init (CamelFolder *folder, CamelStore *parent_store,
+ CamelFolder *parent_folder, const gchar *name,
+ gchar separator, CamelException *ex);
static void _open_async (CamelFolder *folder,
CamelFolderOpenMode mode,
CamelFolderAsyncCallback callback,
@@ -78,10 +78,10 @@ static void _set_name (CamelFolder *folder,
static const gchar *_get_name (CamelFolder *folder, CamelException *ex);
static const gchar *_get_full_name (CamelFolder *folder, CamelException *ex);
-static gboolean _can_hold_folders (CamelFolder *folder, CamelException *ex);
-static gboolean _can_hold_messages(CamelFolder *folder, CamelException *ex);
+static gboolean _can_hold_folders (CamelFolder *folder);
+static gboolean _can_hold_messages(CamelFolder *folder);
static gboolean _exists (CamelFolder *folder, CamelException *ex);
-static gboolean _is_open (CamelFolder *folder, CamelException *ex);
+static gboolean _is_open (CamelFolder *folder);
static CamelFolder *_get_subfolder (CamelFolder *folder, const gchar *folder_name, CamelException *ex);
static gboolean _create (CamelFolder *folder, CamelException *ex);
static gboolean _delete (CamelFolder *folder, gboolean recurse, CamelException *ex);
@@ -114,7 +114,7 @@ camel_folder_pt_proxy_class_init (CamelFolderPtProxyClass *camel_folder_pt_proxy
parent_class = gtk_type_class (camel_folder_get_type ());
/* virtual method definition */
- camel_folder_class->init_with_store = _init_with_store;
+ camel_folder_class->init = _init;
camel_folder_class->open = _open;
camel_folder_class->close = _close;
#ifdef FOLDER_ASYNC_TEST
@@ -273,20 +273,21 @@ _proxy_cb_user_data (_ProxyCbUserData *pud,
/* ******** */
-/* thread->init_with_store implementation */
-static void
-_init_with_store (CamelFolder *folder,
- CamelStore *parent_store,
- CamelException *ex)
+/* thread->init implementation */
+static void
+_init (CamelFolder *folder, CamelStore *parent_store,
+ CamelFolder *parent_folder, const gchar *name,
+ gchar separator, CamelException *ex)
{
- parent_class->init_with_store (folder, parent_store, ex);
+ parent_class->init (folder, parent_store, parent_folder,
+ name, separator, ex);
if (ex->id != CAMEL_EXCEPTION_NONE)
return;
#warning use proxy store here
- CF_CLASS (folder)->init_with_store (CAMEL_FOLDER_PT_PROXY (folder)->real_folder,
- parent_store,
- ex);
+ CF_CLASS (folder)->init (CAMEL_FOLDER_PT_PROXY (folder)->real_folder,
+ parent_store, parent_folder, name,
+ separator, ex);
}
@@ -518,26 +519,26 @@ _get_full_name (CamelFolder *folder, CamelException *ex)
static gboolean
-_can_hold_folders (CamelFolder *folder, CamelException *ex)
+_can_hold_folders (CamelFolder *folder)
{
CamelFolderPtProxy *proxy_folder;
proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);
return CF_CLASS (proxy_folder->real_folder)->
- can_hold_folders (proxy_folder->real_folder, ex);
+ can_hold_folders (proxy_folder->real_folder);
}
static gboolean
-_can_hold_messages (CamelFolder *folder, CamelException *ex)
+_can_hold_messages (CamelFolder *folder)
{
CamelFolderPtProxy *proxy_folder;
proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);
return CF_CLASS (proxy_folder->real_folder)->
- can_hold_messages (proxy_folder->real_folder, ex);
+ can_hold_messages (proxy_folder->real_folder);
}
@@ -556,13 +557,13 @@ _exists (CamelFolder *folder, CamelException *ex)
static gboolean
-_is_open (CamelFolder *folder, CamelException *ex)
+_is_open (CamelFolder *folder)
{
CamelFolderPtProxy *proxy_folder;
proxy_folder = CAMEL_FOLDER_PT_PROXY (folder);
return CF_CLASS (proxy_folder->real_folder)->
- is_open (proxy_folder->real_folder, ex);
+ is_open (proxy_folder->real_folder);
}
diff --git a/mail/ChangeLog b/mail/ChangeLog
index e4a04f13b4..0bb5479443 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-24 Dan Winship <danw@helixcode.com>
+
+ * message-list.c (message_list_set_folder): update for CamelFolder
+ changes
+
2000-02-24 Christopher James Lahey <clahey@helixcode.com>
* message-list.c: Changed this to not use the "x" and "y"
diff --git a/mail/message-list.c b/mail/message-list.c
index 3f4202d5d4..d3621ad6d5 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -467,7 +467,7 @@ message_list_set_folder (MessageList *message_list, CamelFolder *camel_folder)
g_return_if_fail (camel_folder != NULL);
g_return_if_fail (IS_MESSAGE_LIST (message_list));
g_return_if_fail (CAMEL_IS_FOLDER (camel_folder));
- g_return_if_fail (camel_folder_has_summary_capability (camel_folder, &ex));
+ g_return_if_fail (camel_folder_has_summary_capability (camel_folder));
camel_exception_init (&ex);