From 379f60bc79b3fbeac6061d5c12f2d8ed65aa7c95 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 8 Mar 2013 11:14:28 -0500 Subject: EMeetingTimeSelector: Remove unused properties. The "show-week-numbers" and "week-start-day" properties are not used. --- calendar/gui/e-meeting-time-sel.c | 100 +-------------------- calendar/gui/e-meeting-time-sel.h | 10 --- .../settings/e-settings-meeting-time-selector.c | 10 --- 3 files changed, 2 insertions(+), 118 deletions(-) diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index 824ab992c5..ff1b8511cc 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -45,9 +45,7 @@ ((obj), E_TYPE_MEETING_TIME_SELECTOR, EMeetingTimeSelectorPrivate)) struct _EMeetingTimeSelectorPrivate { - gint week_start_day; - guint show_week_numbers : 1; - guint use_24_hour_format : 1; + gboolean use_24_hour_format; }; /* An array of hour strings for 24 hour time, "0:00" .. "23:00". */ @@ -80,9 +78,7 @@ const gchar *EMeetingTimeSelectorHours12[24] = { enum { PROP_0, - PROP_SHOW_WEEK_NUMBERS, - PROP_USE_24_HOUR_FORMAT, - PROP_WEEK_START_DAY + PROP_USE_24_HOUR_FORMAT }; enum { @@ -213,23 +209,11 @@ meeting_time_selector_set_property (GObject *object, GParamSpec *pspec) { switch (property_id) { - case PROP_SHOW_WEEK_NUMBERS: - e_meeting_time_selector_set_show_week_numbers ( - E_MEETING_TIME_SELECTOR (object), - g_value_get_boolean (value)); - return; - case PROP_USE_24_HOUR_FORMAT: e_meeting_time_selector_set_use_24_hour_format ( E_MEETING_TIME_SELECTOR (object), g_value_get_boolean (value)); return; - - case PROP_WEEK_START_DAY: - e_meeting_time_selector_set_week_start_day ( - E_MEETING_TIME_SELECTOR (object), - g_value_get_int (value)); - return; } G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -242,26 +226,12 @@ meeting_time_selector_get_property (GObject *object, GParamSpec *pspec) { switch (property_id) { - case PROP_SHOW_WEEK_NUMBERS: - g_value_set_boolean ( - value, - e_meeting_time_selector_get_show_week_numbers ( - E_MEETING_TIME_SELECTOR (object))); - return; - case PROP_USE_24_HOUR_FORMAT: g_value_set_boolean ( value, e_meeting_time_selector_get_use_24_hour_format ( E_MEETING_TIME_SELECTOR (object))); return; - - case PROP_WEEK_START_DAY: - g_value_set_int ( - value, - e_meeting_time_selector_get_week_start_day ( - E_MEETING_TIME_SELECTOR (object))); - return; } G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -320,16 +290,6 @@ e_meeting_time_selector_class_init (EMeetingTimeSelectorClass *class) widget_class->style_set = e_meeting_time_selector_style_set; widget_class->draw = e_meeting_time_selector_draw; - g_object_class_install_property ( - object_class, - PROP_SHOW_WEEK_NUMBERS, - g_param_spec_boolean ( - "show-week-numbers", - "Show Week Numbers", - NULL, - TRUE, - G_PARAM_READWRITE)); - g_object_class_install_property ( object_class, PROP_USE_24_HOUR_FORMAT, @@ -340,18 +300,6 @@ e_meeting_time_selector_class_init (EMeetingTimeSelectorClass *class) TRUE, G_PARAM_READWRITE)); - g_object_class_install_property ( - object_class, - PROP_WEEK_START_DAY, - g_param_spec_int ( - "week-start-day", - "Week Start Day", - NULL, - 0, /* Monday */ - 6, /* Sunday */ - 0, - G_PARAM_READWRITE)); - signals[CHANGED] = g_signal_new ( "changed", G_TYPE_FROM_CLASS (object_class), @@ -1014,28 +962,6 @@ e_meeting_time_selector_new (EMeetingStore *ems) return mts; } -gboolean -e_meeting_time_selector_get_show_week_numbers (EMeetingTimeSelector *mts) -{ - g_return_val_if_fail (E_IS_MEETING_TIME_SELECTOR (mts), FALSE); - - return mts->priv->show_week_numbers; -} - -void -e_meeting_time_selector_set_show_week_numbers (EMeetingTimeSelector *mts, - gboolean show_week_numbers) -{ - g_return_if_fail (E_IS_MEETING_TIME_SELECTOR (mts)); - - if (mts->priv->show_week_numbers == show_week_numbers) - return; - - mts->priv->show_week_numbers = show_week_numbers; - - g_object_notify (G_OBJECT (mts), "show-week-numbers"); -} - gboolean e_meeting_time_selector_get_use_24_hour_format (EMeetingTimeSelector *mts) { @@ -1058,28 +984,6 @@ e_meeting_time_selector_set_use_24_hour_format (EMeetingTimeSelector *mts, g_object_notify (G_OBJECT (mts), "use-24-hour-format"); } -gint -e_meeting_time_selector_get_week_start_day (EMeetingTimeSelector *mts) -{ - g_return_val_if_fail (E_IS_MEETING_TIME_SELECTOR (mts), 0); - - return mts->priv->week_start_day; -} - -void -e_meeting_time_selector_set_week_start_day (EMeetingTimeSelector *mts, - gint week_start_day) -{ - g_return_if_fail (E_IS_MEETING_TIME_SELECTOR (mts)); - - if (mts->priv->week_start_day == week_start_day) - return; - - mts->priv->week_start_day = week_start_day; - - g_object_notify (G_OBJECT (mts), "week-start-day"); -} - static cairo_pattern_t * e_meeting_time_selector_create_no_info_pattern (EMeetingTimeSelector *mts) { diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h index 9f4fb0ac31..109c36a296 100644 --- a/calendar/gui/e-meeting-time-sel.h +++ b/calendar/gui/e-meeting-time-sel.h @@ -283,21 +283,11 @@ GtkWidget * e_meeting_time_selector_new (EMeetingStore *ems); void e_meeting_time_selector_construct (EMeetingTimeSelector *mts, EMeetingStore *ems); -gboolean e_meeting_time_selector_get_show_week_numbers - (EMeetingTimeSelector *mts); -void e_meeting_time_selector_set_show_week_numbers - (EMeetingTimeSelector *mts, - gboolean show_week_numbers); gboolean e_meeting_time_selector_get_use_24_hour_format (EMeetingTimeSelector *mts); void e_meeting_time_selector_set_use_24_hour_format (EMeetingTimeSelector *mts, gboolean use_24_hour_format); -gint e_meeting_time_selector_get_week_start_day - (EMeetingTimeSelector *mts); -void e_meeting_time_selector_set_week_start_day - (EMeetingTimeSelector *mts, - gint week_start_day); /* This returns the currently selected meeting time. * Note that months are 1-12 and days are 1-31. The start time is guaranteed to diff --git a/modules/settings/e-settings-meeting-time-selector.c b/modules/settings/e-settings-meeting-time-selector.c index 50a56944ab..f6d9cef614 100644 --- a/modules/settings/e-settings-meeting-time-selector.c +++ b/modules/settings/e-settings-meeting-time-selector.c @@ -52,21 +52,11 @@ settings_meeting_time_selector_constructed (GObject *object) shell = e_shell_get_default (); shell_settings = e_shell_get_shell_settings (shell); - g_object_bind_property ( - shell_settings, "cal-show-week-numbers", - extensible, "show-week-numbers", - G_BINDING_SYNC_CREATE); - g_object_bind_property ( shell_settings, "cal-use-24-hour-format", extensible, "use-24-hour-format", G_BINDING_SYNC_CREATE); - g_object_bind_property ( - shell_settings, "cal-week-start-day", - extensible, "week-start-day", - G_BINDING_SYNC_CREATE); - /* Chain up to parent's constructed() method. */ G_OBJECT_CLASS (e_settings_meeting_time_selector_parent_class)-> constructed (object); -- cgit v1.2.3