Relax the EBinding API to reduce GObject casting.

Also make it more fault-tolerant by warning about non-existent
property names instead of just crashing.

14 files changed, 137 insertions, 137 deletions

diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 6fccf0cea1..d9bf73d5bf 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -615,19 +615,19 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs,
 
 	widget = glade_xml_get_widget (gui, "use-system-tz-check");
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-use-system-timezone",
-		G_OBJECT (widget), "active");
+		shell_settings, "cal-use-system-timezone",
+		widget, "active");
 	g_signal_connect (
-		G_OBJECT (shell_settings), "notify::cal-use-system-timezone",
+		shell_settings, "notify::cal-use-system-timezone",
 		G_CALLBACK (update_system_tz_widgets), prefs);
 
 	widget = glade_xml_get_widget (gui, "timezone");
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-timezone",
-		G_OBJECT (widget), "timezone");
+		shell_settings, "cal-timezone",
+		widget, "timezone");
 	e_mutual_binding_new_with_negation (
-		G_OBJECT (shell_settings), "cal-use-system-timezone",
-		G_OBJECT (widget), "sensitive");
+		shell_settings, "cal-use-system-timezone",
+		widget, "sensitive");
 
 	/* General tab */
 	prefs->system_tz_label = glade_xml_get_widget (gui, "system-tz-label");
@@ -635,74 +635,74 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs,
 
 	widget = glade_xml_get_widget (gui, "sun_button");
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-working-days-sunday",
-		G_OBJECT (widget), "active");
+		shell_settings, "cal-working-days-sunday",
+		widget, "active");
 
 	widget = glade_xml_get_widget (gui, "mon_button");
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-working-days-monday",
-		G_OBJECT (widget), "active");
+		shell_settings, "cal-working-days-monday",
+		widget, "active");
 
 	widget = glade_xml_get_widget (gui, "tue_button");
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-working-days-tuesday",
-		G_OBJECT (widget), "active");
+		shell_settings, "cal-working-days-tuesday",
+		widget, "active");
 
 	widget = glade_xml_get_widget (gui, "wed_button");
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-working-days-wednesday",
-		G_OBJECT (widget), "active");
+		shell_settings, "cal-working-days-wednesday",
+		widget, "active");
 
 	widget = glade_xml_get_widget (gui, "thu_button");
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-working-days-thursday",
-		G_OBJECT (widget), "active");
+		shell_settings, "cal-working-days-thursday",
+		widget, "active");
 
 	widget = glade_xml_get_widget (gui, "fri_button");
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-working-days-friday",
-		G_OBJECT (widget), "active");
+		shell_settings, "cal-working-days-friday",
+		widget, "active");
 
 	widget = glade_xml_get_widget (gui, "sat_button");
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-working-days-saturday",
-		G_OBJECT (widget), "active");
+		shell_settings, "cal-working-days-saturday",
+		widget, "active");
 
 	widget = glade_xml_get_widget (gui, "week_start_day");
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-week-start-day",
-		G_OBJECT (widget), "active");
+		shell_settings, "cal-week-start-day",
+		widget, "active");
 
 	widget = glade_xml_get_widget (gui, "start_of_day");
 	prefs->start_of_day = widget;  /* XXX delete this */
 	if (locale_supports_12_hour_format)
 		e_binding_new (
-			G_OBJECT (shell_settings), "cal-use-24-hour-format",
-			G_OBJECT (widget), "use-24-hour-format");
+			shell_settings, "cal-use-24-hour-format",
+			widget, "use-24-hour-format");
 
 	widget = glade_xml_get_widget (gui, "end_of_day");
 	prefs->end_of_day = widget;  /* XXX delete this */
 	if (locale_supports_12_hour_format)
 		e_binding_new (
-			G_OBJECT (shell_settings), "cal-use-24-hour-format",
-			G_OBJECT (widget), "use-24-hour-format");
+			shell_settings, "cal-use-24-hour-format",
+			widget, "use-24-hour-format");
 
 	widget = glade_xml_get_widget (gui, "use_12_hour");
 	gtk_widget_set_sensitive (widget, locale_supports_12_hour_format);
 	e_mutual_binding_new_with_negation (
-		G_OBJECT (shell_settings), "cal-use-24-hour-format",
-		G_OBJECT (widget), "active");
+		shell_settings, "cal-use-24-hour-format",
+		widget, "active");
 
 	widget = glade_xml_get_widget (gui, "use_24_hour");
 	gtk_widget_set_sensitive (widget, locale_supports_12_hour_format);
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-use-24-hour-format",
-		G_OBJECT (widget), "active");
+		shell_settings, "cal-use-24-hour-format",
+		widget, "active");
 
 	widget = glade_xml_get_widget (gui, "confirm_delete");
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-confirm-delete",
-		G_OBJECT (widget), "active");
+		shell_settings, "cal-confirm-delete",
+		widget, "active");
 
 	prefs->default_reminder = glade_xml_get_widget (gui, "default_reminder");
 	prefs->default_reminder_interval = glade_xml_get_widget (gui, "default_reminder_interval");
@@ -716,38 +716,38 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs,
 
 	widget = glade_xml_get_widget (gui, "show_end_times");
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-show-event-end-times",
-		G_OBJECT (widget), "active");
+		shell_settings, "cal-show-event-end-times",
+		widget, "active");
 
 	widget = glade_xml_get_widget (gui, "compress_weekend");
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-compress-weekend",
-		G_OBJECT (widget), "active");
+		shell_settings, "cal-compress-weekend",
+		widget, "active");
 
 	widget = glade_xml_get_widget (gui, "dnav_show_week_no");
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-show-week-numbers",
-		G_OBJECT (widget), "active");
+		shell_settings, "cal-show-week-numbers",
+		widget, "active");
 
 	widget = glade_xml_get_widget (gui, "dview_show_week_no");
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-day-view-show-week-numbers",
-		G_OBJECT (widget), "active");
+		shell_settings, "cal-day-view-show-week-numbers",
+		widget, "active");
 
 	prefs->month_scroll_by_week = glade_xml_get_widget (gui, "month_scroll_by_week");
 
 	widget = glade_xml_get_widget (gui, "tasks_due_today_color");
 	e_mutual_binding_new_full (
-		G_OBJECT (shell_settings), "cal-tasks-color-due-today",
-		G_OBJECT (widget), "color",
+		shell_settings, "cal-tasks-color-due-today",
+		widget, "color",
 		e_binding_transform_string_to_color,
 		e_binding_transform_color_to_string,
 		(GDestroyNotify) NULL, NULL);
 
 	widget = glade_xml_get_widget (gui, "tasks_overdue_color");
 	e_mutual_binding_new_full (
-		G_OBJECT (shell_settings), "cal-tasks-color-overdue",
-		G_OBJECT (widget), "color",
+		shell_settings, "cal-tasks-color-overdue",
+		widget, "color",
 		e_binding_transform_string_to_color,
 		e_binding_transform_color_to_string,
 		(GDestroyNotify) NULL, NULL);
@@ -763,8 +763,8 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs,
 	/* Free/Busy tab */
 	widget = glade_xml_get_widget (gui, "template_url");
 	e_mutual_binding_new (
-		G_OBJECT (shell_settings), "cal-free-busy-template",
-		G_OBJECT (widget), "text");
+		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);
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index 6fc05d4a92..07b776912d 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -240,12 +240,12 @@ comp_editor_new_date_edit (EShellSettings *shell_settings,
 #endif
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-show-week-numbers",
-		G_OBJECT (dedit), "show-week-numbers");
+		shell_settings, "cal-show-week-numbers",
+		dedit, "show-week-numbers");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-week-start-day",
-		G_OBJECT (dedit), "week-start-day");
+		shell_settings, "cal-week-start-day",
+		dedit, "week-start-day");
 
 	return GTK_WIDGET (dedit);
 }
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 91c879928c..5c01557758 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -373,16 +373,16 @@ event_editor_constructed (GObject *object)
 	shell_settings = e_shell_get_shell_settings (shell);
 
 	e_binding_new (
-		G_OBJECT (object), "client",
-		G_OBJECT (priv->model), "client");
+		object, "client",
+		priv->model, "client");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-free-busy-template",
-		G_OBJECT (priv->model), "free-busy-template");
+		shell_settings, "cal-free-busy-template",
+		priv->model, "free-busy-template");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-timezone",
-		G_OBJECT (priv->model), "timezone");
+		shell_settings, "cal-timezone",
+		priv->model, "timezone");
 }
 
 static void
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index ca53a41737..933924ba96 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -2269,12 +2269,12 @@ init_widgets (RecurrencePage *rpage)
 	ecal = E_CALENDAR (priv->preview_calendar);
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-show-week-numbers",
-		G_OBJECT (ecal->calitem), "show-week-numbers");
+		shell_settings, "cal-show-week-numbers",
+		ecal->calitem, "show-week-numbers");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-week-start-day",
-		G_OBJECT (ecal->calitem), "week-start-day");
+		shell_settings, "cal-week-start-day",
+		ecal->calitem, "week-start-day");
 
 	g_signal_connect((ecal->calitem), "date_range_changed",
 			    G_CALLBACK (preview_date_range_changed_cb),
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 5a7277084b..a9a7afac1e 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -429,16 +429,16 @@ schedule_page_construct (SchedulePage *spage, EMeetingStore *ems)
 	gtk_box_pack_start (GTK_BOX (priv->main), GTK_WIDGET (priv->sel), TRUE, TRUE, 6);
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-show-week-numbers",
-		G_OBJECT (priv->sel), "show-week-numbers");
+		shell_settings, "cal-show-week-numbers",
+		priv->sel, "show-week-numbers");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-use-24-hour-format",
-		G_OBJECT (priv->sel), "use-24-hour-format");
+		shell_settings, "cal-use-24-hour-format",
+		priv->sel, "use-24-hour-format");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-week-start-day",
-		G_OBJECT (priv->sel), "week-start-day");
+		shell_settings, "cal-week-start-day",
+		priv->sel, "week-start-day");
 
 	if (!init_widgets (spage)) {
 		g_message ("schedule_page_construct(): "
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index edd54859d6..3de0f0bc08 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -212,16 +212,16 @@ task_editor_constructed (GObject *object)
 	shell_settings = e_shell_get_shell_settings (shell);
 
 	e_binding_new (
-		G_OBJECT (object), "client",
-		G_OBJECT (priv->model), "client");
+		object, "client",
+		priv->model, "client");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-free-busy-template",
-		G_OBJECT (priv->model), "free-busy-template");
+		shell_settings, "cal-free-busy-template",
+		priv->model, "free-busy-template");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-timezone",
-		G_OBJECT (priv->model), "timezone");
+		shell_settings, "cal-timezone",
+		priv->model, "timezone");
 }
 
 static void
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index 42e7f941eb..7d95e41aa8 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -220,20 +220,20 @@ setup_e_table (ECalListView *cal_list_view)
 		      NULL);
 
 	e_mutual_binding_new (
-		G_OBJECT (model), "timezone",
-		G_OBJECT (cell), "timezone");
+		model, "timezone",
+		cell, "timezone");
 
 	e_mutual_binding_new (
-		G_OBJECT (model), "use-24-hour-format",
-		G_OBJECT (cell), "use-24-hour-format");
+		model, "use-24-hour-format",
+		cell, "use-24-hour-format");
 
 	popup_cell = e_cell_date_edit_new ();
 	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
 	g_object_unref (cell);
 
 	e_mutual_binding_new (
-		G_OBJECT (model), "use-24-hour-format",
-		G_OBJECT (popup_cell), "use-24-hour-format");
+		model, "use-24-hour-format",
+		popup_cell, "use-24-hour-format");
 
 	e_table_extras_add_cell (extras, "dateedit", popup_cell);
 	cal_list_view->dates_cell = E_CELL_DATE_EDIT (popup_cell);
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 74647e46dc..a56361905f 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -142,12 +142,12 @@ cal_model_tasks_constructed (GObject *object)
 	shell_settings = e_cal_model_get_shell_settings (model);
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-tasks-color-due-today",
-		G_OBJECT (model), "color-due-today");
+		shell_settings, "cal-tasks-color-due-today",
+		model, "color-due-today");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-tasks-color-overdue",
-		G_OBJECT (model), "color-overdue");
+		shell_settings, "cal-tasks-color-overdue",
+		model, "color-overdue");
 
 	/* Chain up to parent's constructed() method. */
 	G_OBJECT_CLASS (e_cal_model_tasks_parent_class)->constructed (object);
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index c582b0fb78..9d78274046 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -310,16 +310,16 @@ cal_model_constructed (GObject *object)
 	shell_settings = e_cal_model_get_shell_settings (model);
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-timezone",
-		G_OBJECT (model), "timezone");
+		shell_settings, "cal-timezone",
+		model, "timezone");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-use-24-hour-format",
-		G_OBJECT (model), "use-24-hour-format");
+		shell_settings, "cal-use-24-hour-format",
+		model, "use-24-hour-format");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-week-start-day",
-		G_OBJECT (model), "week-start-day");
+		shell_settings, "cal-week-start-day",
+		model, "week-start-day");
 }
 
 static void
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 1122310a49..59abdd5d77 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -659,20 +659,20 @@ calendar_table_constructed (GObject *object)
 		      NULL);
 
 	e_mutual_binding_new (
-		G_OBJECT (model), "timezone",
-		G_OBJECT (cell), "timezone");
+		model, "timezone",
+		cell, "timezone");
 
 	e_mutual_binding_new (
-		G_OBJECT (model), "use-24-hour-format",
-		G_OBJECT (cell), "use-24-hour-format");
+		model, "use-24-hour-format",
+		cell, "use-24-hour-format");
 
 	popup_cell = e_cell_date_edit_new ();
 	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
 	g_object_unref (cell);
 
 	e_mutual_binding_new (
-		G_OBJECT (model), "use-24-hour-format",
-		G_OBJECT (popup_cell), "use-24-hour-format");
+		model, "use-24-hour-format",
+		popup_cell, "use-24-hour-format");
 
 	e_table_extras_add_cell (extras, "dateedit", popup_cell);
 	cal_table->dates_cell = E_CELL_DATE_EDIT (popup_cell);
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index cb69eecf50..8184cfbdb6 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -607,44 +607,44 @@ day_view_constructed (GObject *object)
 	shell_settings = e_cal_model_get_shell_settings (model);
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-day-view-show-week-numbers",
-		G_OBJECT (day_view->week_number_label), "visible");
+		shell_settings, "cal-day-view-show-week-numbers",
+		day_view->week_number_label, "visible");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-marcus-bains-show-line",
-		G_OBJECT (day_view), "marcus-bains-show-line");
+		shell_settings, "cal-marcus-bains-show-line",
+		day_view, "marcus-bains-show-line");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-marcus-bains-day-view-color",
-		G_OBJECT (day_view), "marcus-bains-day-view-color");
+		shell_settings, "cal-marcus-bains-day-view-color",
+		day_view, "marcus-bains-day-view-color");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-marcus-bains-time-bar-color",
-		G_OBJECT (day_view), "marcus-bains-time-bar-color");
+		shell_settings, "cal-marcus-bains-time-bar-color",
+		day_view, "marcus-bains-time-bar-color");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-time-divisions",
-		G_OBJECT (day_view), "mins-per-row");
+		shell_settings, "cal-time-divisions",
+		day_view, "mins-per-row");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-work-day-end-hour",
-		G_OBJECT (day_view), "work-day-end-hour");
+		shell_settings, "cal-work-day-end-hour",
+		day_view, "work-day-end-hour");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-work-day-end-minute",
-		G_OBJECT (day_view), "work-day-end-minute");
+		shell_settings, "cal-work-day-end-minute",
+		day_view, "work-day-end-minute");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-work-day-start-hour",
-		G_OBJECT (day_view), "work-day-start-hour");
+		shell_settings, "cal-work-day-start-hour",
+		day_view, "work-day-start-hour");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-work-day-start-minute",
-		G_OBJECT (day_view), "work-day-start-minute");
+		shell_settings, "cal-work-day-start-minute",
+		day_view, "work-day-start-minute");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-working-days-bitset",
-		G_OBJECT (day_view), "working-days");
+		shell_settings, "cal-working-days-bitset",
+		day_view, "working-days");
 
 	g_signal_connect_swapped (
 		model, "notify::week-start-day",
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index ea6fca83c9..633af15e6d 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -742,16 +742,16 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 	e_date_edit_set_show_time (E_DATE_EDIT (mts->start_date_edit), TRUE);
 
 	e_binding_new (
-		G_OBJECT (mts), "show-week-numbers",
-		G_OBJECT (mts->start_date_edit), "show-week-numbers");
+		mts, "show-week-numbers",
+		mts->start_date_edit, "show-week-numbers");
 
 	e_binding_new (
-		G_OBJECT (mts), "use-24-hour-format",
-		G_OBJECT (mts->start_date_edit), "use-24-hour-format");
+		mts, "use-24-hour-format",
+		mts->start_date_edit, "use-24-hour-format");
 
 	e_binding_new (
-		G_OBJECT (mts), "week-start-day",
-		G_OBJECT (mts->start_date_edit), "week-start-day");
+		mts, "week-start-day",
+		mts->start_date_edit, "week-start-day");
 
 	gtk_table_attach (GTK_TABLE (table), mts->start_date_edit,
 			  1, 2, 0, 1, GTK_FILL, 0, 0, 0);
@@ -779,16 +779,16 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 	e_date_edit_set_show_time (E_DATE_EDIT (mts->end_date_edit), TRUE);
 
 	e_binding_new (
-		G_OBJECT (mts), "show-week-numbers",
-		G_OBJECT (mts->end_date_edit), "show-week-numbers");
+		mts, "show-week-numbers",
+		mts->end_date_edit, "show-week-numbers");
 
 	e_binding_new (
-		G_OBJECT (mts), "use-24-hour-format",
-		G_OBJECT (mts->end_date_edit), "use-24-hour-format");
+		mts, "use-24-hour-format",
+		mts->end_date_edit, "use-24-hour-format");
 
 	e_binding_new (
-		G_OBJECT (mts), "week-start-day",
-		G_OBJECT (mts->end_date_edit), "week-start-day");
+		mts, "week-start-day",
+		mts->end_date_edit, "week-start-day");
 
 	gtk_table_attach (GTK_TABLE (table), mts->end_date_edit,
 			  1, 2, 1, 2, GTK_FILL, 0, 0, 0);
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index dddaa52132..9a736801b6 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -569,20 +569,20 @@ memo_table_constructed (GObject *object)
 	g_object_set (cell, "bg_color_column", E_CAL_MODEL_FIELD_COLOR, NULL);
 
 	e_mutual_binding_new (
-		G_OBJECT (model), "timezone",
-		G_OBJECT (cell), "timezone");
+		model, "timezone",
+		cell, "timezone");
 
 	e_mutual_binding_new (
-		G_OBJECT (model), "use-24-hour-format",
-		G_OBJECT (cell), "use-24-hour-format");
+		model, "use-24-hour-format",
+		cell, "use-24-hour-format");
 
 	popup_cell = e_cell_date_edit_new ();
 	e_cell_popup_set_child (E_CELL_POPUP (popup_cell), cell);
 	g_object_unref (cell);
 
 	e_mutual_binding_new (
-		G_OBJECT (model), "use-24-hour-format",
-		G_OBJECT (popup_cell), "use-24-hour-format");
+		model, "use-24-hour-format",
+		popup_cell, "use-24-hour-format");
 
 	e_table_extras_add_cell (extras, "dateedit", popup_cell);
 	memo_table->dates_cell = E_CELL_DATE_EDIT (popup_cell);
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index d4043ff4fe..fc9237e6ea 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -311,12 +311,12 @@ week_view_constructed (GObject *object)
 	shell_settings = e_cal_model_get_shell_settings (model);
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-compress-weekend",
-		G_OBJECT (week_view), "compress-weekend");
+		shell_settings, "cal-compress-weekend",
+		week_view, "compress-weekend");
 
 	e_binding_new (
-		G_OBJECT (shell_settings), "cal-show-event-end-times",
-		G_OBJECT (week_view), "show-event-end-times");
+		shell_settings, "cal-show-event-end-times",
+		week_view, "show-event-end-times");
 
 	g_signal_connect_swapped (
 		model, "notify::week-start-day",