diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-09-02 09:12:44 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-09-02 09:12:44 +0800 |
commit | 8962868ff902e58456c545478e62796029d1fe5c (patch) | |
tree | d43efa77beba51f716a259a3538dd55a38711923 /calendar/gui/dialogs | |
parent | 6b2a55be48922c9fe5c94d654a4d463f23a428f2 (diff) | |
download | gsoc2013-evolution-8962868ff902e58456c545478e62796029d1fe5c.tar gsoc2013-evolution-8962868ff902e58456c545478e62796029d1fe5c.tar.gz gsoc2013-evolution-8962868ff902e58456c545478e62796029d1fe5c.tar.bz2 gsoc2013-evolution-8962868ff902e58456c545478e62796029d1fe5c.tar.lz gsoc2013-evolution-8962868ff902e58456c545478e62796029d1fe5c.tar.xz gsoc2013-evolution-8962868ff902e58456c545478e62796029d1fe5c.tar.zst gsoc2013-evolution-8962868ff902e58456c545478e62796029d1fe5c.zip |
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.
Diffstat (limited to 'calendar/gui/dialogs')
-rw-r--r-- | calendar/gui/dialogs/cal-prefs-dialog.c | 94 | ||||
-rw-r--r-- | calendar/gui/dialogs/comp-editor-util.c | 8 | ||||
-rw-r--r-- | calendar/gui/dialogs/event-editor.c | 12 | ||||
-rw-r--r-- | calendar/gui/dialogs/recurrence-page.c | 8 | ||||
-rw-r--r-- | calendar/gui/dialogs/schedule-page.c | 12 | ||||
-rw-r--r-- | calendar/gui/dialogs/task-editor.c | 12 |
6 files changed, 73 insertions, 73 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 |