diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/mail-ops.c | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index bfb27689f2..cf04513521 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,9 +1,15 @@ 2000-09-19 Dan Winship <danw@helixcode.com> + * mail-ops.c (do_scan_subfolders): Update for CamelFolder changes + (subfolder_names -> subfolder_info). + +2000-09-19 Dan Winship <danw@helixcode.com> + * mail-callbacks.c (create_msg_composer, compose_msg, send_to_url, mail_reply, forward_msg): * mail-format.c (mail_generate_reply): * mail-ops.c (cleanup_edit_messages): + * mail-view.c (view_forward_msg): Deal with NULL composer. 2000-09-18 Dan Winship <danw@helixcode.com> diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 0109859349..63c75433a0 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -1394,6 +1394,7 @@ do_scan_subfolders (gpointer in_data, gpointer op_data, CamelException *ex) scan_subfolders_op_t *data = (scan_subfolders_op_t *) op_data; scan_subfolders_folderinfo_t *info; GPtrArray *lsub; + CamelFolderInfo *fi; CamelFolder *folder; int i; char *splice; @@ -1409,20 +1410,21 @@ do_scan_subfolders (gpointer in_data, gpointer op_data, CamelException *ex) mail_tool_camel_lock_up (); - lsub = camel_folder_get_subfolder_names (folder); + lsub = camel_folder_get_subfolder_info (folder); mail_tool_camel_lock_down (); for (i = 0; i < lsub->len; i++) { - mail_op_set_message (_("Found subfolder \"%s\""), (char *) lsub->pdata[i]); + fi = lsub->pdata[i]; + mail_op_set_message (_("Found subfolder \"%s\""), fi->name); info = g_new (scan_subfolders_folderinfo_t, 1); - info->path = g_strdup_printf ("/%s", (char *) lsub->pdata[i]); + info->path = g_strdup_printf ("/%s", fi->name); info->uri = g_strdup_printf ("%s%s%s", input->source_uri, splice, - (char *)lsub->pdata[i]); + fi->full_name); g_ptr_array_add (data->new_folders, info); } - camel_folder_free_subfolder_names (folder, lsub); + camel_folder_free_subfolder_info (folder, lsub); /* FIXME: We intentionally lose a reference to the store here * for the benefit of the IMAP provider. Undo this when the |