aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog8
-rw-r--r--mail/mail-ops.c4
-rw-r--r--mail/message-list.c7
3 files changed, 13 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 7da0ca383d..cd88321f10 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-01 Jeffrey Stedfast <fejj@helixcode.com>
+
+ * message-list.c (get_message_info):
+ (select_msg): Updated to reflect camel-folder changes.
+
+ * mail-ops.c (real_fetch_mail): Modified to reflect camel-folder
+ changes.
+
2000-06-30 Dan Winship <danw@helixcode.com>
* mail-ops.c (print_msg): Use gnome-print to do a print preview.
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 27ad27a51c..efc41e5907 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -229,7 +229,7 @@ real_fetch_mail (gpointer user_data )
CamelMimeMessage *msg;
printf("copying message %d to dest\n", i + 1);
- msg = camel_folder_get_message_by_uid (sourcefolder, uids->pdata[i], ex);
+ msg = camel_folder_get_message (sourcefolder, uids->pdata[i], ex);
if (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) {
async_mail_exception_dialog ("Unable to read message", ex, fb);
gtk_object_unref (GTK_OBJECT (msg));
@@ -245,7 +245,7 @@ real_fetch_mail (gpointer user_data )
goto cleanup;
}
- camel_folder_delete_message_by_uid (sourcefolder, uids->pdata[i], ex);
+ camel_folder_delete_message (sourcefolder, uids->pdata[i], ex);
gtk_object_unref(GTK_OBJECT (msg));
}
camel_folder_free_uids (sourcefolder, uids);
diff --git a/mail/message-list.c b/mail/message-list.c
index 7ca6140b8f..eac111e285 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -71,7 +71,7 @@ get_message_info(MessageList *message_list, gint row)
char *uid = g_list_nth_data(message_list->matches, row);
if (uid) {
info = message_list->summary_search_cache->pdata[row] =
- (CamelMessageInfo *) camel_folder_summary_get_by_uid(message_list->folder, uid);
+ (CamelMessageInfo *) camel_folder_get_message_info (message_list->folder, uid);
if (!info)
g_warning ("get_message_info: unknown uid %s", uid);
} else
@@ -152,9 +152,8 @@ select_msg (MessageList *message_list, gint row)
msg_info = get_message_info(message_list, row);
if (msg_info) {
- message = camel_folder_get_message_by_uid (message_list->folder,
- msg_info->uid,
- &ex);
+ message = camel_folder_get_message (message_list->folder,
+ msg_info->uid, &ex);
if (camel_exception_get_id (&ex)) {
printf ("Unable to get message: %s\n",
ex.desc?ex.desc:"unknown_reason");