Update for CamelFolder API changes. (Certain functions no longer take a

	* message-list.c (mark_msg_seen, ml_tree_set_value_at,
	message_list_regenerate): Update for CamelFolder API changes.
	(Certain functions no longer take a CamelException.)

	* mail-ops.c (real_fetch_mail, real_send_mail, real_delete_msg):
	ditto

	* component-factory.c (real_create_imap_storage,
	real_create_news_storage): ditto

svn path=/trunk/; revision=4305

4 files changed, 25 insertions, 17 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index e5a62f30a9..e71e6262bd 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,17 @@
 2000-07-24  Dan Winship  <danw@helixcode.com>
 
+	* message-list.c (mark_msg_seen, ml_tree_set_value_at,
+	message_list_regenerate): Update for CamelFolder API changes.
+	(Certain functions no longer take a CamelException.)
+
+	* mail-ops.c (real_fetch_mail, real_send_mail, real_delete_msg):
+	ditto
+
+	* component-factory.c (real_create_imap_storage,
+	real_create_news_storage): ditto
+
+2000-07-24  Dan Winship  <danw@helixcode.com>
+
 	* component-factory.c, folder-browser-factory.c, test-mail.c:
 	Remove GOAD support.
 
diff --git a/mail/component-factory.c b/mail/component-factory.c
index bd3e13eb23..19296e650e 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -369,7 +369,7 @@ real_create_imap_storage (gpointer user_data)
 	}
 
 	/* we need a way to set the namespace */
-	lsub = camel_folder_get_subfolder_names (folder, ex);
+	lsub = camel_folder_get_subfolder_names (folder);
 
 	p = g_strdup_printf ("%s/INBOX", source);
 	evolution_storage_new_folder (storage, "/INBOX", "mail", p, "description");
@@ -504,7 +504,7 @@ real_create_news_storage( gpointer user_data )
 	}
 
 	/* we need a way to set the namespace */
-	lsub = camel_folder_get_subfolder_names (folder, ex);
+	lsub = camel_folder_get_subfolder_names (folder);
 
 	max = lsub->len;
 	for (i = 0; i < max; i++) {
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index c28564aad8..5fa1f0953b 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -240,7 +240,7 @@ real_fetch_mail (gpointer user_data)
 				goto cleanup;
 			}
 			
-			uids = camel_folder_get_uids (sourcefolder, ex);
+			uids = camel_folder_get_uids (sourcefolder);
 			printf("got %d messages in source\n", uids->len);
 			for (i = 0; i < uids->len; i++) {
 				CamelMimeMessage *msg;
@@ -265,7 +265,7 @@ real_fetch_mail (gpointer user_data)
 					goto cleanup;
  				}
 
-				camel_folder_delete_message (sourcefolder, uids->pdata[i], ex);
+				camel_folder_delete_message (sourcefolder, uids->pdata[i]);
  				gtk_object_unref (GTK_OBJECT (msg));
 			}
 			camel_folder_free_uids (sourcefolder, uids);
@@ -278,7 +278,7 @@ real_fetch_mail (gpointer user_data)
 		}
 	}
 
-	if (camel_folder_get_message_count (folder, ex) == 0) {
+	if (camel_folder_get_message_count (folder) == 0) {
 		gnome_ok_dialog ("No new messages.");
 		goto cleanup;
 	} else if (camel_exception_is_set (ex)) {
@@ -460,8 +460,7 @@ real_send_mail (gpointer user_data)
 	} else {
 		if (psd) {
 			camel_folder_set_message_flags (psd->folder, psd->uid,
-							psd->flags, psd->flags,
-							ex);
+							psd->flags, psd->flags);
 		}
 		info->ok = TRUE;
 
@@ -808,10 +807,9 @@ real_delete_msg (MessageList *ml, const char *uid, gpointer user_data)
 		return;
 
 	/* Toggle the deleted flag without touching other flags. */
-	flags = camel_folder_get_message_flags (ml->folder, uid, ex);
+	flags = camel_folder_get_message_flags (ml->folder, uid);
 	camel_folder_set_message_flags (ml->folder, uid,
-					CAMEL_MESSAGE_DELETED,
-					~flags, ex);
+					CAMEL_MESSAGE_DELETED, ~flags);
 }
 
 void
diff --git a/mail/message-list.c b/mail/message-list.c
index 0bac0259e0..92cdd429c6 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -152,11 +152,10 @@ mark_msg_seen (gpointer data)
 	if (!ml->cursor_uid)
 		return FALSE;
 
-	flags = camel_folder_get_message_flags (ml->folder, ml->cursor_uid,
-						NULL);
+	flags = camel_folder_get_message_flags (ml->folder, ml->cursor_uid);
 	camel_folder_set_message_flags (ml->folder, ml->cursor_uid,
-					CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN,
-					NULL);
+					CAMEL_MESSAGE_SEEN,
+					CAMEL_MESSAGE_SEEN);
 	return FALSE;
 }
 
@@ -320,8 +319,7 @@ ml_tree_set_value_at (ETreeModel *etm, ETreePath *path, int col,
 		return;
 
 	camel_folder_set_message_flags (message_list->folder, msg_info->uid,
-					CAMEL_MESSAGE_SEEN,
-					~(msg_info->flags), NULL);
+					CAMEL_MESSAGE_SEEN, ~msg_info->flags);
 	if (message_list->seen_id) {
 		gtk_timeout_remove (message_list->seen_id);
 		message_list->seen_id = 0;
@@ -826,7 +824,7 @@ message_list_regenerate (MessageList *message_list, const char *search)
 		} else
 			message_list->search = g_strdup (search);
 	} else
-		uids = camel_folder_get_uids (message_list->folder, NULL);
+		uids = camel_folder_get_uids (message_list->folder);
 	
 	/* FIXME: free the old tree data */