diff options
Diffstat (limited to 'calendar')
35 files changed, 117 insertions, 48 deletions
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c index 1a990a18b8..2a75d7943c 100644 --- a/calendar/gui/alarm-notify/alarm-notify.c +++ b/calendar/gui/alarm-notify/alarm-notify.c @@ -238,7 +238,8 @@ alarm_notify_init (AlarmNotify *an) { gint ii; - an->priv = G_TYPE_INSTANCE_GET_PRIVATE (an, TYPE_ALARM_NOTIFY, AlarmNotifyPrivate); + an->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + an, TYPE_ALARM_NOTIFY, AlarmNotifyPrivate); an->priv->mutex = g_mutex_new (); an->priv->selected_calendars = config_data_get_calendars ( "/apps/evolution/calendar/sources"); diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c index 68b5ef3307..4c5f80adcd 100644 --- a/calendar/gui/comp-util.c +++ b/calendar/gui/comp-util.c @@ -231,9 +231,11 @@ cal_comp_is_on_server (ECalComponent *comp, ECal *client) */ e_cal_component_get_uid (comp, &uid); - /*TODO We should not be checking for this here. But since e_cal_util_construct_instance does not - create the instances of all day events, so we dafault to old behaviour */ - if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER)) { + /* TODO We should not be checking for this here. But since + * e_cal_util_construct_instance does not create the instances + * of all day events, so we default to old behaviour. */ + if (e_cal_get_static_capability ( + client, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER)) { rid = e_cal_component_get_recurid_as_string (comp); } @@ -255,7 +257,8 @@ cal_comp_is_on_server (ECalComponent *comp, ECal *client) /** * is_icalcomp_on_the_server: - * same as @cal_comp_is_on_server, only the component parameter is icalcomponent, not the ECalComponent. + * same as @cal_comp_is_on_server, only the component parameter is + * icalcomponent, not the ECalComponent. **/ gboolean is_icalcomp_on_the_server (icalcomponent *icalcomp, ECal *client) @@ -446,7 +449,8 @@ cal_comp_update_time_by_active_window (ECalComponent *comp, EShell *shell) if (e_shell_window_get_active_view (shell_window) && g_str_equal (e_shell_window_get_active_view (shell_window), "calendar")) { - EShellView *view; + EShellContent *shell_content; + EShellView *shell_view; GnomeCalendar *gnome_cal; time_t start = 0, end = 0; icaltimezone *zone; @@ -454,11 +458,13 @@ cal_comp_update_time_by_active_window (ECalComponent *comp, EShell *shell) icalcomponent *icalcomp; icalproperty *prop; - view = e_shell_window_peek_shell_view (shell_window, "calendar"); - g_return_if_fail (view != NULL); + shell_view = e_shell_window_peek_shell_view ( + shell_window, "calendar"); + g_return_if_fail (shell_view != NULL); gnome_cal = NULL; - g_object_get (G_OBJECT (e_shell_view_get_shell_content (view)), "calendar", &gnome_cal, NULL); + shell_content = e_shell_view_get_shell_content (shell_view); + g_object_get (shell_content, "calendar", &gnome_cal, NULL); g_return_if_fail (gnome_cal != NULL); gnome_calendar_get_current_time_range (gnome_cal, &start, &end); @@ -616,7 +622,9 @@ datetime_to_zone (ECal *client, ECalComponentDateTime *date, const gchar *tzid) from = icaltimezone_get_builtin_timezone_from_tzid (date->tzid); if (!from) { if (!e_cal_get_timezone (client, date->tzid, &from, NULL)) - g_warning ("%s: Could not get timezone from server: %s", G_STRFUNC, date->tzid ? date->tzid : ""); + g_warning ( + "%s: Could not get timezone from server: %s", + G_STRFUNC, date->tzid ? date->tzid : ""); } to = icaltimezone_get_builtin_timezone_from_tzid (tzid); @@ -638,7 +646,9 @@ datetime_to_zone (ECal *client, ECalComponentDateTime *date, const gchar *tzid) * Changes 'dtstart' of the component, but converts time to the old timezone. **/ void -cal_comp_set_dtstart_with_oldzone (ECal *client, ECalComponent *comp, const ECalComponentDateTime *pdate) +cal_comp_set_dtstart_with_oldzone (ECal *client, + ECalComponent *comp, + const ECalComponentDateTime *pdate) { ECalComponentDateTime olddate, date; @@ -664,7 +674,9 @@ cal_comp_set_dtstart_with_oldzone (ECal *client, ECalComponent *comp, const ECal * Changes 'dtend' of the component, but converts time to the old timezone. **/ void -cal_comp_set_dtend_with_oldzone (ECal *client, ECalComponent *comp, const ECalComponentDateTime *pdate) +cal_comp_set_dtend_with_oldzone (ECal *client, + ECalComponent *comp, + const ECalComponentDateTime *pdate) { ECalComponentDateTime olddate, date; @@ -682,7 +694,8 @@ cal_comp_set_dtend_with_oldzone (ECal *client, ECalComponent *comp, const ECalCo } void -comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client) +comp_util_sanitize_recurrence_master (ECalComponent *comp, + ECal *client) { ECalComponent *master = NULL; icalcomponent *icalcomp = NULL; @@ -704,7 +717,9 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client) e_cal_component_get_recurid (comp, &rid); e_cal_component_get_dtstart (comp, &sdt); - if (rid.datetime.value && sdt.value && icaltime_compare_date_only (*rid.datetime.value, *sdt.value) == 0) { + if (rid.datetime.value && sdt.value && + icaltime_compare_date_only ( + *rid.datetime.value, *sdt.value) == 0) { ECalComponentDateTime msdt, medt, edt; gint *sequence; diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c index 657243d31b..a18b82c940 100644 --- a/calendar/gui/dialogs/comp-editor-page.c +++ b/calendar/gui/dialogs/comp-editor-page.c @@ -172,7 +172,8 @@ comp_editor_page_class_init (CompEditorPageClass *class) static void comp_editor_page_init (CompEditorPage *page) { - page->priv = G_TYPE_INSTANCE_GET_PRIVATE (page, TYPE_COMP_EDITOR_PAGE, CompEditorPagePrivate); + page->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + page, TYPE_COMP_EDITOR_PAGE, CompEditorPagePrivate); page->accel_group = NULL; } diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index b6be8bd7e6..0e4250c7c1 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -1831,7 +1831,8 @@ comp_editor_init (CompEditor *editor) express_mode = e_shell_get_express_mode (shell); meego_mode = e_shell_get_meego_mode (shell); - editor->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (editor, TYPE_COMP_EDITOR, CompEditorPrivate); + editor->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE ( + editor, TYPE_COMP_EDITOR, CompEditorPrivate); g_object_weak_ref ( G_OBJECT (editor), (GWeakNotify) diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 055fc229c0..3e146ed96d 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -539,7 +539,8 @@ event_editor_init (EventEditor *ee) const gchar *id; GError *error = NULL; - ee->priv = G_TYPE_INSTANCE_GET_PRIVATE (ee, TYPE_EVENT_EDITOR, EventEditorPrivate); + ee->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + ee, TYPE_EVENT_EDITOR, EventEditorPrivate); ee->priv->model = E_MEETING_STORE (e_meeting_store_new ()); ee->priv->meeting_shown = TRUE; ee->priv->updating = FALSE; diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 5d340a7b13..f9583538f2 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -289,7 +289,8 @@ event_page_class_init (EventPageClass *class) static void event_page_init (EventPage *epage) { - epage->priv = G_TYPE_INSTANCE_GET_PRIVATE (epage, TYPE_EVENT_PAGE, EventPagePrivate); + epage->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + epage, TYPE_EVENT_PAGE, EventPagePrivate); epage->priv->deleted_attendees = g_ptr_array_new (); epage->priv->alarm_interval = -1; epage->priv->alarm_map = alarm_map_with_user_time; diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c index 50f862aa7a..2f64910cab 100644 --- a/calendar/gui/dialogs/memo-editor.c +++ b/calendar/gui/dialogs/memo-editor.c @@ -136,7 +136,8 @@ memo_editor_init (MemoEditor *me) const gchar *id; GError *error = NULL; - me->priv = G_TYPE_INSTANCE_GET_PRIVATE (me, TYPE_MEMO_EDITOR, MemoEditorPrivate); + me->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + me, TYPE_MEMO_EDITOR, MemoEditorPrivate); me->priv->updating = FALSE; ui_manager = comp_editor_get_ui_manager (editor); diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 45b18a5982..424b3e370c 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -315,7 +315,8 @@ memo_page_class_init (MemoPageClass *class) static void memo_page_init (MemoPage *mpage) { - mpage->priv = G_TYPE_INSTANCE_GET_PRIVATE (mpage, TYPE_MEMO_PAGE, MemoPagePrivate); + mpage->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + mpage, TYPE_MEMO_PAGE, MemoPagePrivate); } /* returns whether changed info text */ diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index 3fd4811b16..e602157660 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -377,7 +377,8 @@ recurrence_page_class_init (RecurrencePageClass *class) static void recurrence_page_init (RecurrencePage *rpage) { - rpage->priv = G_TYPE_INSTANCE_GET_PRIVATE (rpage, TYPE_RECURRENCE_PAGE, RecurrencePagePrivate); + rpage->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + rpage, TYPE_RECURRENCE_PAGE, RecurrencePagePrivate); } /* get_widget handler for the recurrence page */ diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c index 50fc7d1865..26ea1cdf5c 100644 --- a/calendar/gui/dialogs/schedule-page.c +++ b/calendar/gui/dialogs/schedule-page.c @@ -271,7 +271,8 @@ schedule_page_class_init (SchedulePageClass *class) static void schedule_page_init (SchedulePage *spage) { - spage->priv = G_TYPE_INSTANCE_GET_PRIVATE (spage, TYPE_SCHEDULE_PAGE, SchedulePagePrivate); + spage->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + spage, TYPE_SCHEDULE_PAGE, SchedulePagePrivate); } /* Gets the widgets from the XML file and returns if they are all available. */ diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c index 16f986c5aa..55d44a7694 100644 --- a/calendar/gui/dialogs/task-details-page.c +++ b/calendar/gui/dialogs/task-details-page.c @@ -436,7 +436,8 @@ task_details_page_class_init (TaskDetailsPageClass *class) static void task_details_page_init (TaskDetailsPage *tdpage) { - tdpage->priv = G_TYPE_INSTANCE_GET_PRIVATE (tdpage, TYPE_TASK_DETAILS_PAGE, TaskDetailsPagePrivate); + tdpage->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + tdpage, TYPE_TASK_DETAILS_PAGE, TaskDetailsPagePrivate); } /* Gets the widgets from the XML file and returns if they are all available. */ diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 1d8bec3ea7..83ee031476 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -316,7 +316,8 @@ task_editor_init (TaskEditor *te) const gchar *id; GError *error = NULL; - te->priv = G_TYPE_INSTANCE_GET_PRIVATE (te, TYPE_TASK_EDITOR, TaskEditorPrivate); + te->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + te, TYPE_TASK_EDITOR, TaskEditorPrivate); te->priv->model = E_MEETING_STORE (e_meeting_store_new ()); te->priv->assignment_shown = TRUE; te->priv->updating = FALSE; diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 2bc4988b6e..ee8138ec07 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -217,7 +217,8 @@ task_page_class_init (TaskPageClass *class) static void task_page_init (TaskPage *tpage) { - tpage->priv = G_TYPE_INSTANCE_GET_PRIVATE (tpage, TYPE_TASK_PAGE, TaskPagePrivate); + tpage->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + tpage, TYPE_TASK_PAGE, TaskPagePrivate); tpage->priv->deleted_attendees = g_ptr_array_new (); } diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c index b9cb7f3eea..ebcc290cd9 100644 --- a/calendar/gui/e-cal-component-preview.c +++ b/calendar/gui/e-cal-component-preview.c @@ -400,7 +400,9 @@ cal_component_preview_class_init (ECalComponentPreviewClass *class) static void cal_component_preview_init (ECalComponentPreview *preview) { - preview->priv = G_TYPE_INSTANCE_GET_PRIVATE (preview, E_TYPE_CAL_COMPONENT_PREVIEW, ECalComponentPreviewPrivate); + preview->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + preview, E_TYPE_CAL_COMPONENT_PREVIEW, + ECalComponentPreviewPrivate); } GType diff --git a/calendar/gui/e-cal-config.c b/calendar/gui/e-cal-config.c index 213041bf30..980701e9be 100644 --- a/calendar/gui/e-cal-config.c +++ b/calendar/gui/e-cal-config.c @@ -36,7 +36,8 @@ struct _ECalConfigPrivate { static void ecp_init (ECalConfig *cfg) { - cfg->priv = G_TYPE_INSTANCE_GET_PRIVATE (cfg, E_TYPE_CAL_CONFIG, ECalConfigPrivate); + cfg->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + cfg, E_TYPE_CAL_CONFIG, ECalConfigPrivate); } static void diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h index 828bcf4cb4..f92886b1f8 100644 --- a/calendar/gui/e-cal-config.h +++ b/calendar/gui/e-cal-config.h @@ -29,8 +29,24 @@ #include <libecal/e-cal.h> #include "e-util/e-config.h" -#define E_TYPE_CAL_CONFIG (e_cal_config_get_type()) -#define E_CAL_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_CONFIG, ECalConfig)) +/* Standard GObject macros */ +#define E_TYPE_CAL_CONFIG \ + (e_cal_config_get_type ()) +#define E_CAL_CONFIG(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST \ + ((obj), E_TYPE_CAL_CONFIG, ECalConfig)) +#define E_CAL_CONFIG_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_CAST \ + ((cls), E_TYPE_CAL_CONFIG, ECalConfigClass)) +#define E_IS_CAL_CONFIG(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE \ + ((obj), E_TYPE_CAL_CONFIG)) +#define E_IS_CAL_CONFIG_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_TYPE \ + ((cls), E_TYPE_CAL_CONFIG)) +#define E_CAL_CONFIG_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), E_TYPE_CAL_CONFIG, ECalConfigClass)) G_BEGIN_DECLS diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c index 55548f489c..ff829e319f 100644 --- a/calendar/gui/e-cal-model-tasks.c +++ b/calendar/gui/e-cal-model-tasks.c @@ -180,7 +180,8 @@ e_cal_model_tasks_class_init (ECalModelTasksClass *class) static void e_cal_model_tasks_init (ECalModelTasks *model) { - model->priv = G_TYPE_INSTANCE_GET_PRIVATE (model, E_TYPE_CAL_MODEL_TASKS, ECalModelTasksPrivate); + model->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + model, E_TYPE_CAL_MODEL_TASKS, ECalModelTasksPrivate); e_cal_model_set_component_kind ( E_CAL_MODEL (model), ICAL_VTODO_COMPONENT); diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index 26d88898e1..9fd93324fb 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -690,7 +690,8 @@ e_cal_model_class_init (ECalModelClass *class) static void e_cal_model_init (ECalModel *model) { - model->priv = G_TYPE_INSTANCE_GET_PRIVATE (model, E_TYPE_CAL_MODEL, ECalModelPrivate); + model->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + model, E_TYPE_CAL_MODEL, ECalModelPrivate); /* match none by default */ model->priv->start = -1; diff --git a/calendar/gui/e-calendar-selector.c b/calendar/gui/e-calendar-selector.c index a920554352..8f9c063634 100644 --- a/calendar/gui/e-calendar-selector.c +++ b/calendar/gui/e-calendar-selector.c @@ -158,7 +158,8 @@ calendar_selector_class_init (ECalendarSelectorClass *class) static void calendar_selector_init (ECalendarSelector *selector) { - selector->priv = G_TYPE_INSTANCE_GET_PRIVATE (selector, E_TYPE_CALENDAR_SELECTOR, ECalendarSelectorPrivate); + selector->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + selector, E_TYPE_CALENDAR_SELECTOR, ECalendarSelectorPrivate); gtk_drag_dest_set ( GTK_WIDGET (selector), GTK_DEST_DEFAULT_ALL, diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 7a8a4ea6bf..d2548f28b7 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -913,7 +913,8 @@ e_calendar_view_init (ECalendarView *calendar_view) { GtkTargetList *target_list; - calendar_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (calendar_view, E_TYPE_CALENDAR_VIEW, ECalendarViewPrivate); + calendar_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + calendar_view, E_TYPE_CALENDAR_VIEW, ECalendarViewPrivate); /* Set this early to avoid a divide-by-zero during init. */ calendar_view->priv->time_divisions = 30; diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c index fc56271bc4..57c2d855d8 100644 --- a/calendar/gui/e-cell-date-edit-text.c +++ b/calendar/gui/e-cell-date-edit-text.c @@ -266,7 +266,8 @@ cell_date_edit_text_class_init (ECellDateEditTextClass *class) static void cell_date_edit_text_init (ECellDateEditText *ecd) { - ecd->priv = G_TYPE_INSTANCE_GET_PRIVATE (ecd, E_TYPE_CELL_DATE_EDIT_TEXT, ECellDateEditTextPrivate); + ecd->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + ecd, E_TYPE_CELL_DATE_EDIT_TEXT, ECellDateEditTextPrivate); ecd->priv->timezone = icaltimezone_get_utc_timezone (); ecd->priv->use_24_hour_format = TRUE; diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c index da5296c0f5..5e247a2932 100644 --- a/calendar/gui/e-day-view-main-item.c +++ b/calendar/gui/e-day-view-main-item.c @@ -1257,7 +1257,8 @@ day_view_main_item_class_init (EDayViewMainItemClass *class) static void day_view_main_item_init (EDayViewMainItem *main_item) { - main_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (main_item, E_TYPE_DAY_VIEW_MAIN_ITEM, EDayViewMainItemPrivate); + main_item->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + main_item, E_TYPE_DAY_VIEW_MAIN_ITEM, EDayViewMainItemPrivate); } GType diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index 6cf379f6a9..30efc13e74 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -208,7 +208,8 @@ day_view_time_item_init (EDayViewTimeItem *time_item) { gchar *last; - time_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (time_item, E_TYPE_DAY_VIEW_TIME_ITEM, EDayViewTimeItemPrivate); + time_item->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + time_item, E_TYPE_DAY_VIEW_TIME_ITEM, EDayViewTimeItemPrivate); time_item->priv->dragging_selection = FALSE; time_item->priv->second_zone = NULL; diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c index 12b1bc41fa..c3a3a07c4d 100644 --- a/calendar/gui/e-day-view-top-item.c +++ b/calendar/gui/e-day-view-top-item.c @@ -784,7 +784,8 @@ day_view_top_item_class_init (EDayViewTopItemClass *class) static void day_view_top_item_init (EDayViewTopItem *top_item) { - top_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (top_item, E_TYPE_DAY_VIEW_TOP_ITEM, EDayViewTopItemPrivate); + top_item->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + top_item, E_TYPE_DAY_VIEW_TOP_ITEM, EDayViewTopItemPrivate); } GType diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index 71806dd1d8..c89bd44e2a 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -818,7 +818,8 @@ e_meeting_store_class_init (EMeetingStoreClass *class) static void e_meeting_store_init (EMeetingStore *store) { - store->priv = G_TYPE_INSTANCE_GET_PRIVATE (store, E_TYPE_MEETING_STORE, EMeetingStorePrivate); + store->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + store, E_TYPE_MEETING_STORE, EMeetingStorePrivate); store->priv->attendees = g_ptr_array_new (); store->priv->refresh_queue = g_ptr_array_new (); diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index ce7587049d..ebe9bd05c0 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -361,7 +361,9 @@ e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * class) static void e_meeting_time_selector_init (EMeetingTimeSelector * mts) { - mts->priv = G_TYPE_INSTANCE_GET_PRIVATE (mts, E_TYPE_MEETING_TIME_SELECTOR, EMeetingTimeSelectorPrivate); + mts->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + mts, E_TYPE_MEETING_TIME_SELECTOR, + EMeetingTimeSelectorPrivate); /* The shadow is drawn in the border so it must be >= 2 pixels. */ gtk_container_set_border_width (GTK_CONTAINER (mts), 2); diff --git a/calendar/gui/e-memo-list-selector.c b/calendar/gui/e-memo-list-selector.c index e518ec3148..91c6b7fb9a 100644 --- a/calendar/gui/e-memo-list-selector.c +++ b/calendar/gui/e-memo-list-selector.c @@ -229,7 +229,8 @@ memo_list_selector_class_init (EMemoListSelectorClass *class) static void memo_list_selector_init (EMemoListSelector *selector) { - selector->priv = G_TYPE_INSTANCE_GET_PRIVATE (selector, E_TYPE_MEMO_LIST_SELECTOR, EMemoListSelectorPrivate); + selector->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + selector, E_TYPE_MEMO_LIST_SELECTOR, EMemoListSelectorPrivate); gtk_drag_dest_set ( GTK_WIDGET (selector), GTK_DEST_DEFAULT_ALL, diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 1482d25d26..2d6195099e 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -1125,7 +1125,8 @@ memo_table_init (EMemoTable *memo_table) { GtkTargetList *target_list; - memo_table->priv = G_TYPE_INSTANCE_GET_PRIVATE (memo_table, E_TYPE_MEMO_TABLE, EMemoTablePrivate); + memo_table->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + memo_table, E_TYPE_MEMO_TABLE, EMemoTablePrivate); target_list = gtk_target_list_new (NULL, 0); e_target_list_add_calendar_targets (target_list, 0); diff --git a/calendar/gui/e-month-view.c b/calendar/gui/e-month-view.c index bc82048b11..45ff2bd04e 100644 --- a/calendar/gui/e-month-view.c +++ b/calendar/gui/e-month-view.c @@ -171,7 +171,8 @@ month_view_class_init (EMonthViewClass *class) static void month_view_init (EMonthView *month_view) { - month_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (month_view, E_TYPE_MONTH_VIEW, EMonthViewPrivate); + month_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + month_view, E_TYPE_MONTH_VIEW, EMonthViewPrivate); } GType diff --git a/calendar/gui/e-task-list-selector.c b/calendar/gui/e-task-list-selector.c index 58096e295f..7e12125adc 100644 --- a/calendar/gui/e-task-list-selector.c +++ b/calendar/gui/e-task-list-selector.c @@ -230,7 +230,8 @@ task_list_selector_class_init (ETaskListSelectorClass *class) static void task_list_selector_init (ETaskListSelector *selector) { - selector->priv = G_TYPE_INSTANCE_GET_PRIVATE (selector, E_TYPE_TASK_LIST_SELECTOR, ETaskListSelectorPrivate); + selector->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + selector, E_TYPE_TASK_LIST_SELECTOR, ETaskListSelectorPrivate); gtk_drag_dest_set ( GTK_WIDGET (selector), GTK_DEST_DEFAULT_ALL, diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c index 8fbd4d986c..1ed0349892 100644 --- a/calendar/gui/e-task-table.c +++ b/calendar/gui/e-task-table.c @@ -1427,7 +1427,8 @@ task_table_init (ETaskTable *task_table) { GtkTargetList *target_list; - task_table->priv = G_TYPE_INSTANCE_GET_PRIVATE (task_table, E_TYPE_TASK_TABLE, ETaskTablePrivate); + task_table->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + task_table, E_TYPE_TASK_TABLE, ETaskTablePrivate); target_list = gtk_target_list_new (NULL, 0); e_target_list_add_calendar_targets (target_list, 0); diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c index 56872ea870..e1f8edb6ac 100644 --- a/calendar/gui/e-timezone-entry.c +++ b/calendar/gui/e-timezone-entry.c @@ -298,7 +298,8 @@ e_timezone_entry_init (ETimezoneEntry *timezone_entry) AtkObject *a11y; GtkWidget *widget; - timezone_entry->priv = G_TYPE_INSTANCE_GET_PRIVATE (timezone_entry, E_TYPE_TIMEZONE_ENTRY, ETimezoneEntryPrivate); + timezone_entry->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + timezone_entry, E_TYPE_TIMEZONE_ENTRY, ETimezoneEntryPrivate); gtk_widget_set_can_focus (GTK_WIDGET (timezone_entry), TRUE); diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index 7f1807ecbd..b6c818516b 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -1153,7 +1153,9 @@ week_view_event_item_class_init (EWeekViewEventItemClass *class) static void week_view_event_item_init (EWeekViewEventItem *event_item) { - event_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (event_item, E_TYPE_WEEK_VIEW_EVENT_ITEM, EWeekViewEventItemPrivate); + event_item->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + event_item, E_TYPE_WEEK_VIEW_EVENT_ITEM, + EWeekViewEventItemPrivate); event_item->priv->event_num = -1; event_item->priv->span_num = -1; diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c index 13ce34bbde..0bffb6cef9 100644 --- a/calendar/gui/e-week-view-main-item.c +++ b/calendar/gui/e-week-view-main-item.c @@ -445,7 +445,9 @@ week_view_main_item_class_init (EWeekViewMainItemClass *class) static void week_view_main_item_init (EWeekViewMainItem *main_item) { - main_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (main_item, E_TYPE_WEEK_VIEW_MAIN_ITEM, EWeekViewMainItemPrivate); + main_item->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + main_item, E_TYPE_WEEK_VIEW_MAIN_ITEM, + EWeekViewMainItemPrivate); } GType diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c index 2b9a040bb4..066e2c4d45 100644 --- a/calendar/gui/e-week-view-titles-item.c +++ b/calendar/gui/e-week-view-titles-item.c @@ -275,7 +275,9 @@ week_view_titles_item_class_init (EWeekViewTitlesItemClass *class) static void week_view_titles_item_init (EWeekViewTitlesItem *titles_item) { - titles_item->priv = G_TYPE_INSTANCE_GET_PRIVATE (titles_item, E_TYPE_WEEK_VIEW_TITLES_ITEM, EWeekViewTitlesItemPrivate); + titles_item->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + titles_item, E_TYPE_WEEK_VIEW_TITLES_ITEM, + EWeekViewTitlesItemPrivate); } GType |