diff options
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/message-list.c | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 4eb07d0555..d81cf094b3 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2004-08-16 Not Zed <NotZed@Ximian.com> + + ** See bug #62963. + + * message-list.c (build_tree, build_flat): define selected in + declaration block, not inline. Spotted by Vincent Noel + <vnoel@cox.net> + 2004-08-13 Not Zed <NotZed@Ximian.com> * em-utils.c (em_utils_message_to_html): don't include the diff --git a/mail/message-list.c b/mail/message-list.c index ab48b5e816..a321b3290c 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -2181,7 +2181,9 @@ build_tree (MessageList *ml, CamelFolderThread *thread, CamelFolderChangeInfo *c ETreeModel *etm = ml->model; ETreePath *top; char *saveuid = NULL; - +#ifdef BROKEN_ETREE + GPtrArray *selected; +#endif #ifdef TIMEIT struct timeval start, end; unsigned long diff; @@ -2208,7 +2210,7 @@ build_tree (MessageList *ml, CamelFolderThread *thread, CamelFolderChangeInfo *c #ifndef BROKEN_ETREE if (top == NULL || changes == NULL) { #else - GPtrArray *selected = message_list_get_selected(ml); + selected = message_list_get_selected(ml); #endif e_tree_memory_freeze(E_TREE_MEMORY(etm)); clear_tree (ml); @@ -2507,7 +2509,9 @@ build_flat (MessageList *ml, GPtrArray *summary, CamelFolderChangeInfo *changes) ETreePath node; char *saveuid = NULL; int i; - +#ifdef BROKEN_ETREE + GPtrArray *selected; +#endif #ifdef TIMEIT struct timeval start, end; unsigned long diff; @@ -2524,7 +2528,7 @@ build_flat (MessageList *ml, GPtrArray *summary, CamelFolderChangeInfo *changes) build_flat_diff(ml, changes); } else { #else - GPtrArray *selected = message_list_get_selected(ml); + selected = message_list_get_selected(ml); #endif e_tree_memory_freeze(E_TREE_MEMORY(etm)); clear_tree (ml); |