From 2a3599cb5230737336371fcf50dc214a4b78fe81 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Fri, 10 Jan 2003 03:15:01 +0000 Subject: glist->gslist for display_folders list (mail_change_notify): " 2003-01-10 Not Zed * e-summary-mail.c (new_folder_cb): glist->gslist for display_folders list (mail_change_notify): " (e_summary_mail_reconfigure): ", and also traverse the list forwards, since we can't go backwards since its now an slist. * e-summary-preferences.c (e_summary_preferences_restore): append new folder entries to the folders list. (config_control_apply_cb): display_folders is a list of folders, not a list of strings, treat accordingly. svn path=/trunk/; revision=19389 --- my-evolution/ChangeLog | 13 +++++++++++++ my-evolution/e-summary-mail.c | 9 +++++---- my-evolution/e-summary-preferences.c | 11 +++++------ 3 files changed, 23 insertions(+), 10 deletions(-) (limited to 'my-evolution') diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog index 6661fb673e..81f4e8c99c 100644 --- a/my-evolution/ChangeLog +++ b/my-evolution/ChangeLog @@ -1,3 +1,16 @@ +2003-01-10 Not Zed + + * e-summary-mail.c (new_folder_cb): glist->gslist for + display_folders list + (mail_change_notify): " + (e_summary_mail_reconfigure): ", and also traverse the list + forwards, since we can't go backwards since its now an slist. + + * e-summary-preferences.c (e_summary_preferences_restore): append + new folder entries to the folders list. + (config_control_apply_cb): display_folders is a list of folders, + not a list of strings, treat accordingly. + 2003-01-09 Chris Toshok * e-summary-preferences.c (e_summary_preferences_create_control): diff --git a/my-evolution/e-summary-mail.c b/my-evolution/e-summary-mail.c index 8be64a05c8..20684dbb0f 100644 --- a/my-evolution/e-summary-mail.c +++ b/my-evolution/e-summary-mail.c @@ -226,7 +226,7 @@ new_folder_cb (EvolutionStorageListener *listener, { ESummaryPrefs *global_preferences; ESummaryMailFolder *mail_folder; - GList *p; + GSList *p; if (strcmp (folder->type, "mail") != 0) return; @@ -322,7 +322,7 @@ mail_change_notify (BonoboListener *listener, GNOME_Evolution_FolderInfo_MessageCount *count; ESummaryMailFolder *folder; ESummaryPrefs *global_preferences; - GList *p; + GSList *p; count = arg->_value; folder = g_hash_table_lookup (folder_store->physical_uri_to_folder, count->path); @@ -517,13 +517,14 @@ void e_summary_mail_reconfigure (void) { ESummaryPrefs *preferences; - GList *old, *p; + GList *old; + GSList *p; old = folder_store->shown; folder_store->shown = NULL; preferences = e_summary_preferences_get_global (); - for (p = g_list_last (preferences->display_folders); p; p = p->prev) { + for (p = preferences->display_folders; p; p = p->next) { ESummaryMailFolder *folder; ESummaryPrefsFolder *f = p->data; char *uri; diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c index 7f740e6aa3..b26d8fea9a 100644 --- a/my-evolution/e-summary-preferences.c +++ b/my-evolution/e-summary-preferences.c @@ -82,6 +82,7 @@ e_summary_preferences_restore (ESummaryPrefs *prefs) folder = g_new (ESummaryPrefsFolder, 1); folder->evolution_uri = p->data; folder->physical_uri = q->data; + prefs->display_folders = g_slist_append(prefs->display_folders, folder); } g_slist_free (path_list); @@ -289,6 +290,8 @@ e_summary_preferences_init (void) ESummaryPrefs * e_summary_preferences_get_global (void) { + g_assert(global_preferences); + return global_preferences; } @@ -1201,16 +1204,12 @@ config_control_apply_cb (EvolutionConfigControl *control, g_slist_free (pd->mail->tmp_list); pd->mail->tmp_list = NULL; } -#if 0 - g_hash_table_foreach (pd->mail->model, maybe_add_to_shown, &pd->mail->tmp_list); -#endif - pd->mail->tmp_list = get_folders_from_view (pd->mail->storage_set_view); if (global_preferences->display_folders) { - free_str_list (global_preferences->display_folders); + free_folder_list (global_preferences->display_folders); g_slist_free (global_preferences->display_folders); } - global_preferences->display_folders = copy_str_list (pd->mail->tmp_list); + global_preferences->display_folders = get_folders_from_view(pd->mail->storage_set_view); e_summary_reconfigure_all (); } -- cgit v1.2.3