diff options
Diffstat (limited to 'my-evolution/e-summary-preferences.c')
| -rw-r--r-- | my-evolution/e-summary-preferences.c | 11 |
1 files changed, 5 insertions, 6 deletions
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 (); } |