diff options
| -rw-r--r-- | mail/ChangeLog | 12 | ||||
| -rw-r--r-- | mail/message-list.c | 21 |
2 files changed, 17 insertions, 16 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 130d7f6a8b..b620f89f33 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,15 @@ +2000-10-16 Not Zed <NotZed@HelixCode.com> + + * message-list.c (message_list_setup_etable): Uh, fixed jeff's + wrong fix for setting the speficiation (the function changed to + set_state(), as can be seen in the e_table-scrolled_load_state() + call only 2 lines above). + +2000-10-13 Not Zed <NotZed@HelixCode.com> + + * message-list.c (message_list_setup_etable): oops, chose the + wrong thing to cut out after a merge conflict. + 2000-10-15 Chris Toshok <toshok@helixcode.com> * message-list.c (subtree_unread): ETreePath != GNode now, use diff --git a/mail/message-list.c b/mail/message-list.c index 4c106aada4..e7aeb1e234 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -939,28 +939,17 @@ message_list_setup_etable(MessageList *message_list) char *path; struct stat st; - path = mail_config_folder_to_cachename (message_list->folder, "et-header-"); - if (path && stat (path, &st) == 0 && st.st_size > 0 && S_ISREG (st.st_mode)) { - e_table_scrolled_load_state (E_TABLE_SCROLLED (message_list->etable), path); + path = mail_config_folder_to_cachename(message_list->folder, "et-header-"); + if (path && stat(path, &st) == 0 && st.st_size > 0 && S_ISREG(st.st_mode)) { + e_table_scrolled_load_state(E_TABLE_SCROLLED (message_list->etable), path); } else { /* I wonder if there's a better way to do this ...? */ - name = camel_service_get_name (CAMEL_SERVICE (message_list->folder->parent_store), TRUE); + name = camel_service_get_name(CAMEL_SERVICE(message_list->folder->parent_store), TRUE); printf ("folder name is '%s'\n", name); if (strstr (name, "/Drafts") != NULL || strstr (name, "/Outbox") != NULL || strstr (name, "/Sent") != NULL) { - ETableExtras *extras; - char *spec; - - if (message_list->etable) - gtk_object_destroy (GTK_OBJECT (message_list->etable)); - - spec = message_list_get_layout (message_list); - extras = message_list_create_extras (); - message_list->etable = e_table_scrolled_new (message_list->table_model, - extras, spec, state); - gtk_object_sink (GTK_OBJECT (extras)); - g_free (spec); + e_table_scrolled_set_state(E_TABLE_SCROLLED(message_list->etable), state); } } g_free (path); |