diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-07-04 20:36:06 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2008-07-04 20:36:06 +0000 |
| commit | 9ffc58e0837a2fb91e8de6dff6552644922c8cf3 (patch) | |
| tree | 18d138096b445284b2094cac42621a1b8a388d18 /mail/balsa/files | |
| parent | Update to 1.3.2 (diff) | |
Update to 2.3.25.
Diffstat (limited to 'mail/balsa/files')
| -rw-r--r-- | mail/balsa/files/patch-libbalsa_mailbox_maildir.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/mail/balsa/files/patch-libbalsa_mailbox_maildir.c b/mail/balsa/files/patch-libbalsa_mailbox_maildir.c index 5d2e19a2417f..9d865279b4c7 100644 --- a/mail/balsa/files/patch-libbalsa_mailbox_maildir.c +++ b/mail/balsa/files/patch-libbalsa_mailbox_maildir.c @@ -1,5 +1,5 @@ ---- libbalsa/mailbox_maildir.c.orig Sun May 6 13:57:53 2007 -+++ libbalsa/mailbox_maildir.c Thu May 31 01:06:37 2007 +--- libbalsa/mailbox_maildir.c.orig 2008-04-13 06:16:40.000000000 -0400 ++++ libbalsa/mailbox_maildir.c 2008-07-04 16:27:21.000000000 -0400 @@ -25,6 +25,8 @@ #define _XOPEN_SOURCE 500 #define _XOPEN_SOURCE_EXTENDED 1 @@ -18,7 +18,7 @@ }; #define REAL_FLAGS(flags) ((flags) & LIBBALSA_MESSAGE_FLAGS_REAL) #define FLAGS_REALLY_DIFFER(orig_flags, flags) \ -@@ -174,7 +176,7 @@ libbalsa_mailbox_maildir_class_init(LibB +@@ -175,7 +177,7 @@ libbalsa_mailbox_maildir_class_init(LibB libbalsa_mailbox_local_class->check_files = lbm_maildir_check_files; libbalsa_mailbox_local_class->set_path = lbm_maildir_set_path; libbalsa_mailbox_local_class->remove_files = lbm_maildir_remove_files; @@ -27,7 +27,7 @@ libbalsa_mailbox_local_class->get_info = lbm_maildir_get_info; } -@@ -389,7 +391,7 @@ static LibBalsaMessageFlag parse_filenam +@@ -390,7 +392,7 @@ static LibBalsaMessageFlag parse_filenam } static void lbm_maildir_parse(LibBalsaMailboxMaildir * mdir, @@ -36,7 +36,7 @@ { gchar *path; GDir *dir; -@@ -442,12 +444,12 @@ static void lbm_maildir_parse(LibBalsaMa +@@ -443,12 +445,12 @@ static void lbm_maildir_parse(LibBalsaMa msg_info->key=key; msg_info->filename=g_strdup(filename); msg_info->local_info.flags = msg_info->orig_flags = flags; @@ -52,7 +52,7 @@ } g_dir_close(dir); } -@@ -455,16 +457,16 @@ static void lbm_maildir_parse(LibBalsaMa +@@ -456,21 +458,21 @@ static void lbm_maildir_parse(LibBalsaMa static void lbm_maildir_parse_subdirs(LibBalsaMailboxMaildir * mdir) { @@ -67,13 +67,18 @@ } - lbm_maildir_parse(mdir, "cur", &fileno); -- lbm_maildir_parse(mdir, "new", &fileno); + lbm_maildir_parse(mdir, "cur", &md_fileno); + /* We parse "new" after "cur", so that any recent messages will have + * higher msgnos than any current messages. That ensures that the + * message tree saved by LibBalsaMailboxLocal is still valid, and + * that the new messages will be inserted correctly into the tree by + * libbalsa_mailbox_local_add_messages. */ +- lbm_maildir_parse(mdir, "new", &fileno); + lbm_maildir_parse(mdir, "new", &md_fileno); } static gboolean -@@ -864,7 +866,7 @@ lbm_maildir_fileno(LibBalsaMailboxLocal +@@ -871,7 +873,7 @@ lbm_maildir_fileno(LibBalsaMailboxLocal msg_info = message_info_from_msgno((LibBalsaMailboxMaildir *) local, msgno); |