diff options
author | Jeffrey Stedfast <fejj@ximian.com> | 2004-05-01 00:00:51 +0800 |
---|---|---|
committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2004-05-01 00:00:51 +0800 |
commit | 4d8e3ff19c73def8f4a74f94470fc18de88aece3 (patch) | |
tree | 1b0ff1af75910a882c7c1e437ed4aad66f41b6ff | |
parent | 1f39b9fae647f27777f15c2e40d4305b90489706 (diff) | |
download | gsoc2013-evolution-4d8e3ff19c73def8f4a74f94470fc18de88aece3.tar.gz gsoc2013-evolution-4d8e3ff19c73def8f4a74f94470fc18de88aece3.tar.zst gsoc2013-evolution-4d8e3ff19c73def8f4a74f94470fc18de88aece3.zip |
Properly initialise the strikeout column for both types of folders (trash
2004-04-30 Jeffrey Stedfast <fejj@ximian.com>
* message-list.c (message_list_set_folder): Properly initialise
the strikeout column for both types of folders (trash and not
trash). Completes the fix for bug #57304.
svn path=/trunk/; revision=25714
-rw-r--r-- | mail/ChangeLog | 6 | ||||
-rw-r--r-- | mail/message-list.c | 32 |
2 files changed, 20 insertions, 18 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index fb69665630..85acb2d3d5 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2004-04-30 Jeffrey Stedfast <fejj@ximian.com> + + * message-list.c (message_list_set_folder): Properly initialise + the strikeout column for both types of folders (trash and not + trash). Completes the fix for bug #57304. + 2004-04-30 Not Zed <NotZed@Ximian.com> * em-utils.c (emu_can_save): fix the overwrite? question. #57822. diff --git a/mail/message-list.c b/mail/message-list.c index 5e2a4e28ef..c2d9531999 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -2565,28 +2565,24 @@ message_list_set_folder (MessageList *message_list, CamelFolder *folder, const c } if (folder) { + int strikeout_col = -1; + ECell *cell; + camel_object_ref (folder); message_list->folder = folder; /* Setup the strikeout effect for non-trash folders */ - if (!(folder->folder_flags & CAMEL_FOLDER_IS_TRASH)) { - ECell *cell; - - cell = e_table_extras_get_cell (message_list->extras, "render_date"); - g_object_set (cell, - "strikeout_column", COL_DELETED, - NULL); - - cell = e_table_extras_get_cell (message_list->extras, "render_text"); - g_object_set (cell, - "strikeout_column", COL_DELETED, - NULL); - - cell = e_table_extras_get_cell (message_list->extras, "render_size"); - g_object_set (cell, - "strikeout_column", COL_DELETED, - NULL); - } + if (!(folder->folder_flags & CAMEL_FOLDER_IS_TRASH)) + strikeout_col = COL_DELETED; + + cell = e_table_extras_get_cell (message_list->extras, "render_date"); + g_object_set (cell, "strikeout_column", strikeout_col, NULL); + + cell = e_table_extras_get_cell (message_list->extras, "render_text"); + g_object_set (cell, "strikeout_column", strikeout_col, NULL); + + cell = e_table_extras_get_cell (message_list->extras, "render_size"); + g_object_set (cell, "strikeout_column", strikeout_col, NULL); /* Build the etree suitable for this folder */ message_list_setup_etree (message_list, outgoing); |