aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--my-evolution/ChangeLog8
-rw-r--r--my-evolution/e-summary-preferences.c13
2 files changed, 13 insertions, 8 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index ad4044ab6f..d6c5b9c125 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-27 Not Zed <NotZed@Ximian.com>
+
+ ** see bug #40141
+
+ * e-summary-preferences.c (config_control_destroy_cb): Dont save
+ prefs here, but restore the last saved.
+ (config_control_apply_cb): save preferences here.
+
2003-03-26 Ettore Perazzoli <ettore@ximian.com>
* e-summary-mail.c: New member physical_uri in struct
diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c
index bc37c3326f..c99069c0d2 100644
--- a/my-evolution/e-summary-preferences.c
+++ b/my-evolution/e-summary-preferences.c
@@ -1214,19 +1214,16 @@ config_control_apply_cb (EvolutionConfigControl *control,
}
global_preferences->display_folders = get_folders_from_view(pd->mail->storage_set_view);
+ e_summary_preferences_save (global_preferences);
+
e_summary_reconfigure_all ();
}
static void
-config_control_destroy_cb (EvolutionConfigControl *config_control,
- void *data)
+config_control_destroy_cb (EvolutionConfigControl *config_control, void *data)
{
- PropertyData *pd;
-
- pd = (PropertyData *) data;
-
- e_summary_preferences_save (global_preferences);
- free_property_dialog (pd);
+ e_summary_preferences_restore(global_preferences);
+ free_property_dialog ((PropertyData *)data);
}
BonoboObject *