From ffc019e36fd4703e5342030ca6779032d91c7611 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 6 Jun 2010 16:08:47 -0400 Subject: Coding style and whitespace cleanups. --- calendar/gui/dialogs/schedule-page.c | 178 ++++++++++++++++------------------- 1 file changed, 81 insertions(+), 97 deletions(-) (limited to 'calendar/gui/dialogs/schedule-page.c') diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c index 7cd177e410..b98987618c 100644 --- a/calendar/gui/dialogs/schedule-page.c +++ b/calendar/gui/dialogs/schedule-page.c @@ -65,93 +65,10 @@ struct _SchedulePagePrivate { icaltimezone *zone; }; -static GtkWidget *schedule_page_get_widget (CompEditorPage *page); -static void schedule_page_focus_main_widget (CompEditorPage *page); -static gboolean schedule_page_fill_widgets (CompEditorPage *page, ECalComponent *comp); -static gboolean schedule_page_fill_component (CompEditorPage *page, ECalComponent *comp); -static void schedule_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates); - static void times_changed_cb (GtkWidget *widget, SchedulePage *spage); G_DEFINE_TYPE (SchedulePage, schedule_page, TYPE_COMP_EDITOR_PAGE) -static void -schedule_page_dispose (GObject *object) -{ - SchedulePagePrivate *priv; - - priv = SCHEDULE_PAGE_GET_PRIVATE (object); - - if (priv->main != NULL) { - g_object_unref (priv->main); - priv->main = NULL; - } - - if (priv->builder != NULL) { - g_object_unref (priv->builder); - priv->builder = NULL; - } - - if (priv->model != NULL) { - g_object_unref (priv->model); - priv->model = NULL; - } - - /* Chain up to parent's dispose() method. */ - G_OBJECT_CLASS (schedule_page_parent_class)->dispose (object); -} - -static void -schedule_page_class_init (SchedulePageClass *class) -{ - GObjectClass *object_class; - CompEditorPageClass *editor_page_class; - - g_type_class_add_private (class, sizeof (SchedulePagePrivate)); - - object_class = G_OBJECT_CLASS (class); - object_class->dispose = schedule_page_dispose; - - editor_page_class = COMP_EDITOR_PAGE_CLASS (class); - editor_page_class->get_widget = schedule_page_get_widget; - editor_page_class->focus_main_widget = schedule_page_focus_main_widget; - editor_page_class->fill_widgets = schedule_page_fill_widgets; - editor_page_class->fill_component = schedule_page_fill_component; - editor_page_class->set_dates = schedule_page_set_dates; -} - -static void -schedule_page_init (SchedulePage *spage) -{ - spage->priv = SCHEDULE_PAGE_GET_PRIVATE (spage); -} - -/* get_widget handler for the schedule page */ -static GtkWidget * -schedule_page_get_widget (CompEditorPage *page) -{ - SchedulePage *spage; - SchedulePagePrivate *priv; - - spage = SCHEDULE_PAGE (page); - priv = spage->priv; - - return priv->main; -} - -/* focus_main_widget handler for the schedule page */ -static void -schedule_page_focus_main_widget (CompEditorPage *page) -{ - SchedulePage *spage; - SchedulePagePrivate *priv; - - spage = SCHEDULE_PAGE (page); - priv = spage->priv; - - gtk_widget_grab_focus (GTK_WIDGET (priv->sel)); -} - static void sensitize_widgets (SchedulePage *spage) { @@ -171,7 +88,9 @@ sensitize_widgets (SchedulePage *spage) /* Set date/time */ static void -update_time (SchedulePage *spage, ECalComponentDateTime *start_date, ECalComponentDateTime *end_date) +update_time (SchedulePage *spage, + ECalComponentDateTime *start_date, + ECalComponentDateTime *end_date) { SchedulePagePrivate *priv = spage->priv; CompEditor *editor; @@ -241,13 +160,56 @@ update_time (SchedulePage *spage, ECalComponentDateTime *start_date, ECalCompone } -/* Fills the widgets with default values */ static void -clear_widgets (SchedulePage *spage) +schedule_page_dispose (GObject *object) { + SchedulePagePrivate *priv; + + priv = SCHEDULE_PAGE_GET_PRIVATE (object); + + if (priv->main != NULL) { + g_object_unref (priv->main); + priv->main = NULL; + } + + if (priv->builder != NULL) { + g_object_unref (priv->builder); + priv->builder = NULL; + } + + if (priv->model != NULL) { + g_object_unref (priv->model); + priv->model = NULL; + } + + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (schedule_page_parent_class)->dispose (object); +} + +static GtkWidget * +schedule_page_get_widget (CompEditorPage *page) +{ + SchedulePage *spage; + SchedulePagePrivate *priv; + + spage = SCHEDULE_PAGE (page); + priv = spage->priv; + + return priv->main; +} + +static void +schedule_page_focus_main_widget (CompEditorPage *page) +{ + SchedulePage *spage; + SchedulePagePrivate *priv; + + spage = SCHEDULE_PAGE (page); + priv = spage->priv; + + gtk_widget_grab_focus (GTK_WIDGET (priv->sel)); } -/* fill_widgets handler for the schedule page */ static gboolean schedule_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) { @@ -257,9 +219,6 @@ schedule_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) spage = SCHEDULE_PAGE (page); - /* Clean the screen */ - clear_widgets (spage); - /* Start and end times */ e_cal_component_get_dtstart (comp, &start_date); e_cal_component_get_dtend (comp, &end_date); @@ -278,7 +237,6 @@ schedule_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) return validated; } -/* fill_component handler for the schedule page */ static gboolean schedule_page_fill_component (CompEditorPage *page, ECalComponent *comp) { @@ -297,7 +255,30 @@ schedule_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates) comp_editor_page_set_updating (page, FALSE); } - +static void +schedule_page_class_init (SchedulePageClass *class) +{ + GObjectClass *object_class; + CompEditorPageClass *editor_page_class; + + g_type_class_add_private (class, sizeof (SchedulePagePrivate)); + + object_class = G_OBJECT_CLASS (class); + object_class->dispose = schedule_page_dispose; + + editor_page_class = COMP_EDITOR_PAGE_CLASS (class); + editor_page_class->get_widget = schedule_page_get_widget; + editor_page_class->focus_main_widget = schedule_page_focus_main_widget; + editor_page_class->fill_widgets = schedule_page_fill_widgets; + editor_page_class->fill_component = schedule_page_fill_component; + editor_page_class->set_dates = schedule_page_set_dates; +} + +static void +schedule_page_init (SchedulePage *spage) +{ + spage->priv = SCHEDULE_PAGE_GET_PRIVATE (spage); +} /* Gets the widgets from the XML file and returns if they are all available. */ static gboolean @@ -345,9 +326,10 @@ init_widgets (SchedulePage *spage) return TRUE; } - void -schedule_page_set_meeting_time (SchedulePage *spage, icaltimetype *start_tt, icaltimetype *end_tt) +schedule_page_set_meeting_time (SchedulePage *spage, + icaltimetype *start_tt, + icaltimetype *end_tt) { SchedulePagePrivate *priv; gboolean all_day; @@ -362,9 +344,11 @@ schedule_page_set_meeting_time (SchedulePage *spage, icaltimetype *start_tt, ica } } - e_meeting_time_selector_set_meeting_time (priv->sel, start_tt->year, start_tt->month, start_tt->day, - start_tt->hour, start_tt->minute, end_tt->year, end_tt->month, end_tt->day, end_tt->hour, - end_tt->minute); + e_meeting_time_selector_set_meeting_time ( + priv->sel, start_tt->year, start_tt->month, + start_tt->day, start_tt->hour, start_tt->minute, + end_tt->year, end_tt->month, end_tt->day, + end_tt->hour, end_tt->minute); e_meeting_time_selector_set_all_day (priv->sel, all_day); } -- cgit v1.2.3