Simplify binding EShellSettings properties to GConf keys.

2 files changed, 31 insertions, 168 deletions

diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 4e6f871d67..a688c27d0e 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -626,7 +626,7 @@ cal_shell_content_constructed (GObject *object)
 
 	e_binding_new (
 		G_OBJECT (shell_settings), "cal-use-24-hour-format",
-		G_OBJECT (calendar_view), "use-24-hour-format");
+		G_OBJECT (calendar_model), "use-24-hour-format");
 
 	g_object_unref (memo_model);
 	g_object_unref (task_model);
diff --git a/modules/calendar/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c
index 0379a659b4..39581a5181 100644
--- a/modules/calendar/e-cal-shell-settings.c
+++ b/modules/calendar/e-cal-shell-settings.c
@@ -30,200 +30,63 @@ e_cal_shell_backend_init_settings (EShell *shell)
 
 	shell_settings = e_shell_get_shell_settings (shell);
 
-	/* XXX Default values should match the GConf schema.
-	 *     Yes it's redundant, but we're stuck with GConf. */
-
-	e_shell_settings_install_property (
-		g_param_spec_boolean (
-			"cal-compress-weekend",
-			NULL,
-			NULL,
-			FALSE,
-			G_PARAM_READWRITE));
-
-	e_shell_settings_bind_to_gconf (
-		shell_settings, "cal-compress-weekend",
+	e_shell_settings_install_property_for_key (
+		"cal-compress-weekend",
 		"/apps/evolution/calendar/display/compress_weekend");
 
-	e_shell_settings_install_property (
-		g_param_spec_string (
-			"cal-marcus-bains-day-view-color",
-			NULL,
-			NULL,
-			NULL,
-			G_PARAM_READWRITE));
-
-	e_shell_settings_bind_to_gconf (
-		shell_settings, "cal-marcus-bains-day-view-color",
+	e_shell_settings_install_property_for_key (
+		"cal-marcus-bains-day-view-color",
 		"/apps/evolution/calendar/display/marcus_bains_color_dayview");
 
-	e_shell_settings_install_property (
-		g_param_spec_string (
-			"cal-marcus-bains-time-bar-color",
-			NULL,
-			NULL,
-			NULL,
-			G_PARAM_READWRITE));
-
-	e_shell_settings_bind_to_gconf (
-		shell_settings, "cal-marcus-bains-time-bar-color",
+	e_shell_settings_install_property_for_key (
+		"cal-marcus-bains-time-bar-color",
 		"/apps/evolution/calendar/display/marcus_bains_color_timebar");
 
-	e_shell_settings_install_property (
-		g_param_spec_boolean (
-			"cal-marcus-bains-show-line",
-			NULL,
-			NULL,
-			TRUE,
-			G_PARAM_READWRITE));
-
-	e_shell_settings_bind_to_gconf (
-		shell_settings, "cal-marcus-bains-show-line",
+	e_shell_settings_install_property_for_key (
+		"cal-marcus-bains-show-line",
 		"/apps/evolution/calendar/display/marcus_bains_line");
 
-	e_shell_settings_install_property (
-		g_param_spec_string (
-			"cal-primary-calendar",
-			NULL,
-			NULL,
-			NULL,
-			G_PARAM_READWRITE));
-
-	e_shell_settings_bind_to_gconf (
-		shell_settings, "cal-primary-calendar",
+	e_shell_settings_install_property_for_key (
+		"cal-primary-calendar",
 		"/apps/evolution/calendar/display/primary_calendar");
 
-	e_shell_settings_install_property (
-		g_param_spec_boolean (
-			"cal-show-event-end-times",
-			NULL,
-			NULL,
-			FALSE,
-			G_PARAM_READWRITE));
-
-	e_shell_settings_bind_to_gconf (
-		shell_settings, "cal-show-event-end-times",
+	e_shell_settings_install_property_for_key (
+		"cal-show-event-end-times",
 		"/apps/evolution/calendar/display/show_event_end");
 
-	e_shell_settings_install_property (
-		g_param_spec_int (
-			"cal-time-divisions",
-			NULL,
-			NULL,
-			5,
-			60,
-			30,
-			G_PARAM_READWRITE));
-
-	e_shell_settings_bind_to_gconf (
-		shell_settings, "cal-time-divisions",
+	e_shell_settings_install_property_for_key (
+		"cal-time-divisions",
 		"/apps/evolution/calendar/display/time_divisions");
 
-	e_shell_settings_install_property (
-		g_param_spec_boolean (
-			"cal-use-24-hour-format",
-			NULL,
-			NULL,
-			TRUE,
-			G_PARAM_READWRITE));
-
-	e_shell_settings_bind_to_gconf (
-		shell_settings, "cal-use-24-hour-format",
+	e_shell_settings_install_property_for_key (
+		"cal-use-24-hour-format",
 		"/apps/evolution/calendar/display/use_24hour_format");
 
-	e_shell_settings_install_property (
-		g_param_spec_boolean (
-			"cal-use-system-timezone",
-			NULL,
-			NULL,
-			TRUE,
-			G_PARAM_READWRITE));
-
-	e_shell_settings_bind_to_gconf (
-		shell_settings, "cal-use-system-timezone",
+	e_shell_settings_install_property_for_key (
+		"cal-use-system-timezone",
 		"/apps/evolution/calendar/display/use_system_timezone");
 
-	e_shell_settings_install_property (
-		g_param_spec_int (
-			"cal-week-start-day",
-			NULL,
-			NULL,
-			0,  /* Sunday */
-			6,  /* Saturday */
-			0,
-			G_PARAM_READWRITE));
-
-	e_shell_settings_bind_to_gconf (
-		shell_settings, "cal-week-start-day",
+	e_shell_settings_install_property_for_key (
+		"cal-week-start-day",
 		"/apps/evolution/calendar/display/week_start_day");
 
-	e_shell_settings_install_property (
-		g_param_spec_int (
-			"cal-work-day-end-hour",
-			NULL,
-			NULL,
-			G_MININT,
-			G_MAXINT,
-			0,
-			G_PARAM_READWRITE));
-
-	e_shell_settings_bind_to_gconf (
-		shell_settings, "cal-work-day-end-hour",
+	e_shell_settings_install_property_for_key (
+		"cal-work-day-end-hour",
 		"/apps/evolution/calendar/display/day_end_hour");
 
-	e_shell_settings_install_property (
-		g_param_spec_int (
-			"cal-work-day-end-minute",
-			NULL,
-			NULL,
-			G_MININT,
-			G_MAXINT,
-			0,
-			G_PARAM_READWRITE));
-
-	e_shell_settings_bind_to_gconf (
-		shell_settings, "cal-work-day-end-minute",
+	e_shell_settings_install_property_for_key (
+		"cal-work-day-end-minute",
 		"/apps/evolution/calendar/display/day_end_minute");
 
-	e_shell_settings_install_property (
-		g_param_spec_int (
-			"cal-work-day-start-hour",
-			NULL,
-			NULL,
-			G_MININT,
-			G_MAXINT,
-			0,
-			G_PARAM_READWRITE));
-
-	e_shell_settings_bind_to_gconf (
-		shell_settings, "cal-work-day-start-hour",
+	e_shell_settings_install_property_for_key (
+		"cal-work-day-start-hour",
 		"/apps/evolution/calendar/display/day_start_hour");
 
-	e_shell_settings_install_property (
-		g_param_spec_int (
-			"cal-work-day-start-minute",
-			NULL,
-			NULL,
-			G_MININT,
-			G_MAXINT,
-			0,
-			G_PARAM_READWRITE));
-
-	e_shell_settings_bind_to_gconf (
-		shell_settings, "cal-work-day-start-minute",
+	e_shell_settings_install_property_for_key (
+		"cal-work-day-start-minute",
 		"/apps/evolution/calendar/display/day_start_minute");
 
-	e_shell_settings_install_property (
-		g_param_spec_int (
-			"cal-working-days",
-			NULL,
-			NULL,
-			G_MININT,
-			G_MAXINT,
-			0,
-			G_PARAM_READWRITE));
-
-	e_shell_settings_bind_to_gconf (
-		shell_settings, "cal-working-days",
+	e_shell_settings_install_property_for_key (
+		"cal-working-days",
 		"/apps/evolution/calendar/display/working_days");
 }