aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@novell.com>2010-04-17 02:52:32 +0800
committerFederico Mena Quintero <federico@novell.com>2010-04-18 05:46:43 +0800
commit1adc67f9fdf7b19170c4acef7728aa3f70cdf948 (patch)
treef2b3e6259433d105024097a594ae2d2e47212a7e /calendar/gui
parent98ea99d234fdc116fac7e0aad98e4bba167cf14b (diff)
downloadgsoc2013-evolution-1adc67f9fdf7b19170c4acef7728aa3f70cdf948.tar
gsoc2013-evolution-1adc67f9fdf7b19170c4acef7728aa3f70cdf948.tar.gz
gsoc2013-evolution-1adc67f9fdf7b19170c4acef7728aa3f70cdf948.tar.bz2
gsoc2013-evolution-1adc67f9fdf7b19170c4acef7728aa3f70cdf948.tar.lz
gsoc2013-evolution-1adc67f9fdf7b19170c4acef7728aa3f70cdf948.tar.xz
gsoc2013-evolution-1adc67f9fdf7b19170c4acef7728aa3f70cdf948.tar.zst
gsoc2013-evolution-1adc67f9fdf7b19170c4acef7728aa3f70cdf948.zip
Hook up the calendar's preferences in a sensible place
The code evolved so that the toplevel preferences were inserted at a random point in the "make the preferences" function; we now move them to a standalone section for clarity. Signed-off-by: Federico Mena Quintero <federico@novell.com>
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/dialogs/cal-prefs-dialog.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 7596133f78..f8ea87a4ff 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -776,10 +776,6 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs,
e_mutual_binding_new (
shell_settings, "cal-free-busy-template",
widget, "text");
- target = e_cal_config_target_new_prefs (ec, prefs->gconf);
- e_config_set_target ((EConfig *)ec, (EConfigTarget *) target);
- toplevel = e_config_create_widget ((EConfig *)ec);
- gtk_container_add (GTK_CONTAINER (prefs), toplevel);
/* date/time format */
table = e_builder_get_widget (prefs->builder, "datetime_format_table");
@@ -789,6 +785,13 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs,
/* Hide senseless preferences when running in Express mode */
e_shell_hide_widgets_for_express_mode (shell, prefs->builder, "/apps/evolution/calendar/express_preferences_hidden");
+ /* Hook up and add the toplevel widget */
+
+ target = e_cal_config_target_new_prefs (ec, prefs->gconf);
+ e_config_set_target ((EConfig *)ec, (EConfigTarget *) target);
+ toplevel = e_config_create_widget ((EConfig *)ec);
+ gtk_container_add (GTK_CONTAINER (prefs), toplevel);
+
show_config (prefs);
/* FIXME: weakref? */
setup_changes (prefs);