diff options
| author | Not Zed <NotZed@Ximian.com> | 2002-04-16 04:11:26 +0000 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2002-04-16 04:11:26 +0000 |
| commit | fb9b8e5e6d2a44b7946ea2892ef008ecd7d14cdb (patch) | |
| tree | 0709e9bd925d2061e8845b59b81c679019c7391f | |
| parent | ae234294a00ea978f85daedc26bb0db034bf7aa4 (diff) | |
| download | evolution-data-server-fb9b8e5e6d2a44b7946ea2892ef008ecd7d14cdb.tar.gz | |
Backport from head. If the last message(s) were deleted, and we had anyEVOLUTION_1_0_4
2002-04-16 Not Zed <NotZed@Ximian.com>
* providers/local/camel-spool-summary.c (spool_summary_sync_full):
Backport from head. If the last message(s) were deleted, and we
had any messages output, account for the lost \n of the following
From line by adding an extra \n. fix for #8214.
(camel_spool_summary_build_from): Backport from head. The day
number has to be 2 chars wide, space filled to work properly with
pine, etc.
| -rw-r--r-- | camel/ChangeLog | 10 | ||||
| -rw-r--r-- | camel/providers/local/camel-spool-summary.c | 9 |
2 files changed, 18 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 5955d3f0d..1ffcbf38d 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,13 @@ +2002-04-16 Not Zed <NotZed@Ximian.com> + + * providers/local/camel-spool-summary.c (spool_summary_sync_full): + Backport from head. If the last message(s) were deleted, and we + had any messages output, account for the lost \n of the following + From line by adding an extra \n. fix for #8214. + (camel_spool_summary_build_from): Backport from head. The day + number has to be 2 chars wide, space filled to work properly with + pine, etc. + 2002-04-09 Jeffrey Stedfast <fejj@ximian.com> * camel-store.c (camel_store_init): Make the folder_lock diff --git a/camel/providers/local/camel-spool-summary.c b/camel/providers/local/camel-spool-summary.c index f4b03b6af..109b4f230 100644 --- a/camel/providers/local/camel-spool-summary.c +++ b/camel/providers/local/camel-spool-summary.c @@ -611,7 +611,7 @@ camel_spool_summary_build_from(struct _header_raw *header) /*memcpy(&tm, gmtime(&thetime), sizeof(tm));*/ gmtime_r(&thetime, &tm); - g_string_sprintfa(out, " %s %s %d %02d:%02d:%02d %4d\n", + g_string_sprintfa(out, " %s %s %2d %02d:%02d:%02d %4d\n", tz_days[tm.tm_wday], tz_months[tm.tm_mon], tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_year + 1900); @@ -781,6 +781,13 @@ spool_summary_sync_full(CamelSpoolSummary *cls, gboolean expunge, CamelFolderCha } } + /* if the last message was deleted, and we had any messages left, + make sure we close out with a closing \n - since we removed the + one part of the From line following it */ + if (lastdel && count > 0) { + write(fdout, "\n", 1); + } + /* sync out content */ if (fsync(fdout) == -1) { g_warning("Cannot sync temporary folder: %s", strerror(errno)); |