More refactoring of settings management.

2 files changed, 0 insertions, 110 deletions

diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 6e7269ecae..7a8e659cbb 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -455,114 +455,6 @@ cal_shell_content_constructed (GObject *object)
 	key = "/apps/evolution/calendar/display/vpane_position";
 	gconf_bridge_bind_property_delayed (bridge, key, object, "position");
 
-	/* Bind day view properties to EShellSettings. */
-
-	view_type = GNOME_CAL_DAY_VIEW;
-	calendar_view = gnome_calendar_get_calendar_view (calendar, view_type);
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-marcus-bains-show-line",
-		G_OBJECT (calendar_view), "marcus-bains-show-line");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-marcus-bains-day-view-color",
-		G_OBJECT (calendar_view), "marcus-bains-day-view-color");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-marcus-bains-time-bar-color",
-		G_OBJECT (calendar_view), "marcus-bains-time-bar-color");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-time-divisions",
-		G_OBJECT (calendar_view), "mins-per-row");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-work-day-end-hour",
-		G_OBJECT (calendar_view), "work-day-end-hour");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-work-day-end-minute",
-		G_OBJECT (calendar_view), "work-day-end-minute");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-work-day-start-hour",
-		G_OBJECT (calendar_view), "work-day-start-hour");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-work-day-start-minute",
-		G_OBJECT (calendar_view), "work-day-start-minute");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-working-days-bitset",
-		G_OBJECT (calendar_view), "working-days");
-
-	/* Bind work week view properties to EShellSettings. */
-
-	view_type = GNOME_CAL_WORK_WEEK_VIEW;
-	calendar_view = gnome_calendar_get_calendar_view (calendar, view_type);
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-marcus-bains-show-line",
-		G_OBJECT (calendar_view), "marcus-bains-show-line");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-marcus-bains-day-view-color",
-		G_OBJECT (calendar_view), "marcus-bains-day-view-color");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-marcus-bains-time-bar-color",
-		G_OBJECT (calendar_view), "marcus-bains-time-bar-color");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-time-divisions",
-		G_OBJECT (calendar_view), "mins-per-row");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-work-day-end-hour",
-		G_OBJECT (calendar_view), "work-day-end-hour");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-work-day-end-minute",
-		G_OBJECT (calendar_view), "work-day-end-minute");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-work-day-start-hour",
-		G_OBJECT (calendar_view), "work-day-start-hour");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-work-day-start-minute",
-		G_OBJECT (calendar_view), "work-day-start-minute");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-working-days-bitset",
-		G_OBJECT (calendar_view), "working-days");
-
-	/* Bind week view properties to EShellSettings. */
-
-	view_type = GNOME_CAL_WEEK_VIEW;
-	calendar_view = gnome_calendar_get_calendar_view (calendar, view_type);
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-compress-weekend",
-		G_OBJECT (calendar_view), "compress-weekend");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-show-event-end-times",
-		G_OBJECT (calendar_view), "show-event-end-times");
-
-	/* Bind month view properties to EShellSettings. */
-
-	view_type = GNOME_CAL_MONTH_VIEW;
-	calendar_view = gnome_calendar_get_calendar_view (calendar, view_type);
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-compress-weekend",
-		G_OBJECT (calendar_view), "compress-weekend");
-
-	e_binding_new (
-		G_OBJECT (shell_settings), "cal-show-event-end-times",
-		G_OBJECT (calendar_view), "show-event-end-times");
-
 	g_object_unref (memo_model);
 	g_object_unref (task_model);
 }
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index 44aad3db5e..49c07ca70f 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -300,12 +300,10 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view)
 	/* KILL-BONOBO FIXME -- Need to connect to the "user-created"
 	 *                      signal for each ECalendarView. */
 
-#if 0 /* KILL-BONOBO */
 	g_signal_connect_swapped (
 		calendar, "dates-shown-changed",
 		G_CALLBACK (e_cal_shell_view_update_sidebar),
 		cal_shell_view);
-#endif
 
 	g_signal_connect_swapped (
 		model, "notify::timezone",