diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-03-06 01:33:49 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2011-03-06 01:34:28 +0800 |
commit | c6fd77460f5baf88528f5da2ffb99e86a2885ff0 (patch) | |
tree | 377ddb36bc9c907a06d5889123582b2066db42a8 | |
parent | 29d8b02c557a65aec4b015b274a830b402da2cfd (diff) | |
download | gsoc2013-evolution-c6fd77460f5baf88528f5da2ffb99e86a2885ff0.tar gsoc2013-evolution-c6fd77460f5baf88528f5da2ffb99e86a2885ff0.tar.gz gsoc2013-evolution-c6fd77460f5baf88528f5da2ffb99e86a2885ff0.tar.bz2 gsoc2013-evolution-c6fd77460f5baf88528f5da2ffb99e86a2885ff0.tar.lz gsoc2013-evolution-c6fd77460f5baf88528f5da2ffb99e86a2885ff0.tar.xz gsoc2013-evolution-c6fd77460f5baf88528f5da2ffb99e86a2885ff0.tar.zst gsoc2013-evolution-c6fd77460f5baf88528f5da2ffb99e86a2885ff0.zip |
Coding style and whitespace cleanup.
205 files changed, 1950 insertions, 1427 deletions
diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c index dcce405470..c5f55edad2 100644 --- a/addressbook/gui/contact-editor/eab-editor.c +++ b/addressbook/gui/contact-editor/eab-editor.c @@ -214,7 +214,8 @@ eab_editor_class_init (EABEditorClass *class) static void eab_editor_init (EABEditor *editor) { - editor->priv = G_TYPE_INSTANCE_GET_PRIVATE (editor, EAB_TYPE_EDITOR, EABEditorPrivate); + editor->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + editor, EAB_TYPE_EDITOR, EABEditorPrivate); all_editors = g_slist_prepend (all_editors, editor); } diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 547e172bca..08ddac7942 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -1266,7 +1266,8 @@ contact_list_editor_init (EContactListEditor *editor) GtkCellRenderer *renderer; GtkTreeView *view; - editor->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (editor, E_TYPE_CONTACT_LIST_EDITOR, EContactListEditorPrivate); + editor->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE ( + editor, E_TYPE_CONTACT_LIST_EDITOR, EContactListEditorPrivate); priv->editable = TRUE; priv->allows_contact_lists = TRUE; diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index b4afd76e74..785be1c49e 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -670,7 +670,8 @@ addressbook_model_class_init (EAddressbookModelClass *class) static void addressbook_model_init (EAddressbookModel *model) { - model->priv = G_TYPE_INSTANCE_GET_PRIVATE (model, E_TYPE_ADDRESSBOOK_MODEL, EAddressbookModelPrivate); + model->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + model, E_TYPE_ADDRESSBOOK_MODEL, EAddressbookModelPrivate); model->priv->contacts = g_ptr_array_new (); model->priv->first_get_view = TRUE; diff --git a/addressbook/gui/widgets/e-addressbook-selector.c b/addressbook/gui/widgets/e-addressbook-selector.c index 727bf3c402..a39750c805 100644 --- a/addressbook/gui/widgets/e-addressbook-selector.c +++ b/addressbook/gui/widgets/e-addressbook-selector.c @@ -320,7 +320,9 @@ addressbook_selector_class_init (EAddressbookSelectorClass *class) static void addressbook_selector_init (EAddressbookSelector *selector) { - selector->priv = G_TYPE_INSTANCE_GET_PRIVATE (selector, E_TYPE_ADDRESSBOOK_SELECTOR, EAddressbookSelectorPrivate); + selector->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + selector, E_TYPE_ADDRESSBOOK_SELECTOR, + EAddressbookSelectorPrivate); gtk_drag_dest_set ( GTK_WIDGET (selector), GTK_DEST_DEFAULT_ALL, diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 4e759f9dcc..804fa10ccc 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -844,7 +844,8 @@ addressbook_view_init (EAddressbookView *view) { GtkTargetList *target_list; - view->priv = G_TYPE_INSTANCE_GET_PRIVATE (view, E_TYPE_ADDRESSBOOK_VIEW, EAddressbookViewPrivate); + view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + view, E_TYPE_ADDRESSBOOK_VIEW, EAddressbookViewPrivate); view->priv->model = e_addressbook_model_new (); diff --git a/addressbook/gui/widgets/eab-config.c b/addressbook/gui/widgets/eab-config.c index e1f841af3f..218ad80685 100644 --- a/addressbook/gui/widgets/eab-config.c +++ b/addressbook/gui/widgets/eab-config.c @@ -35,7 +35,8 @@ struct _EABConfigPrivate { static void ecp_init (EABConfig *cfg) { - cfg->priv = G_TYPE_INSTANCE_GET_PRIVATE (cfg, EAB_TYPE_CONFIG, EABConfigPrivate); + cfg->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + cfg, EAB_TYPE_CONFIG, EABConfigPrivate); } static void @@ -86,7 +87,9 @@ ecp_set_target (EConfig *ec, EConfigTarget *t) case EAB_CONFIG_TARGET_SOURCE: { EABConfigTargetSource *s = (EABConfigTargetSource *)t; - p->source_changed_id = g_signal_connect(s->source, "changed", G_CALLBACK(ecp_source_changed), ec); + p->source_changed_id = g_signal_connect ( + s->source, "changed", + G_CALLBACK (ecp_source_changed), ec); break; } } } @@ -134,7 +137,8 @@ eab_config_new (gint type, const gchar *menuid) EABConfigTargetSource * eab_config_target_new_source (EABConfig *ecp, struct _ESource *source) { - EABConfigTargetSource *t = e_config_target_new (&ecp->config, EAB_CONFIG_TARGET_SOURCE, sizeof (*t)); + EABConfigTargetSource *t = e_config_target_new ( + &ecp->config, EAB_CONFIG_TARGET_SOURCE, sizeof (*t)); t->source = source; g_object_ref (source); diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index 449d112da4..e457486f4c 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -1194,7 +1194,8 @@ eab_contact_display_init (EABContactDisplay *display) const gchar *domain = GETTEXT_PACKAGE; GError *error = NULL; - display->priv = G_TYPE_INSTANCE_GET_PRIVATE (display, EAB_TYPE_CONTACT_DISPLAY, EABContactDisplayPrivate); + display->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + display, EAB_TYPE_CONTACT_DISPLAY, EABContactDisplayPrivate); display->priv->mode = EAB_CONTACT_DISPLAY_RENDER_NORMAL; display->priv->orientation = GTK_ORIENTATION_HORIZONTAL; 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 diff --git a/capplet/settings/mail-decoration.c b/capplet/settings/mail-decoration.c index ab63ce293b..f8e56f316a 100644 --- a/capplet/settings/mail-decoration.c +++ b/capplet/settings/mail-decoration.c @@ -337,7 +337,8 @@ mail_decoration_class_init (MailDecorationClass *klass) static void mail_decoration_init (MailDecoration *md) { - md->priv = G_TYPE_INSTANCE_GET_PRIVATE (md, MAIL_DECORATION_TYPE, MailDecorationPrivate); + md->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + md, MAIL_DECORATION_TYPE, MailDecorationPrivate); md->priv->cursors[0]= gdk_cursor_new (GDK_TOP_LEFT_CORNER); md->priv->cursors[1]= gdk_cursor_new (GDK_TOP_SIDE); diff --git a/composer/e-composer-activity.c b/composer/e-composer-activity.c index f29834b24d..6c285f2c1a 100644 --- a/composer/e-composer-activity.c +++ b/composer/e-composer-activity.c @@ -160,7 +160,8 @@ e_composer_activity_class_init (EComposerActivityClass *class) static void e_composer_activity_init (EComposerActivity *activity) { - activity->priv = G_TYPE_INSTANCE_GET_PRIVATE (activity, E_TYPE_COMPOSER_ACTIVITY, EComposerActivityPrivate); + activity->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + activity, E_TYPE_COMPOSER_ACTIVITY, EComposerActivityPrivate); } EActivity * diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index d2d41dfdcc..efac8a1d31 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -994,7 +994,9 @@ e_composer_header_table_init (EComposerHeaderTable *table) GtkWidget *widget; gint ii; - table->priv = G_TYPE_INSTANCE_GET_PRIVATE (table, E_TYPE_COMPOSER_HEADER_TABLE, EComposerHeaderTablePrivate); + table->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + table, E_TYPE_COMPOSER_HEADER_TABLE, + EComposerHeaderTablePrivate); name_selector = e_name_selector_new (); table->priv->name_selector = name_selector; diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c index baf5ea3845..f3f2f2833b 100644 --- a/composer/e-composer-header.c +++ b/composer/e-composer-header.c @@ -278,7 +278,8 @@ e_composer_header_class_init (EComposerHeaderClass *class) static void e_composer_header_init (EComposerHeader *header) { - header->priv = G_TYPE_INSTANCE_GET_PRIVATE (header, E_TYPE_COMPOSER_HEADER, EComposerHeaderPrivate); + header->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + header, E_TYPE_COMPOSER_HEADER, EComposerHeaderPrivate); } gchar * diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c index a8cdc6fca4..3589dea291 100644 --- a/composer/e-composer-name-header.c +++ b/composer/e-composer-name-header.c @@ -261,7 +261,9 @@ e_composer_name_header_class_init (EComposerNameHeaderClass *class) static void e_composer_name_header_init (EComposerNameHeader *header) { - header->priv = G_TYPE_INSTANCE_GET_PRIVATE (header, E_TYPE_COMPOSER_NAME_HEADER, EComposerNameHeaderPrivate); + header->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + header, E_TYPE_COMPOSER_NAME_HEADER, + EComposerNameHeaderPrivate); } EComposerHeader * diff --git a/composer/e-composer-post-header.c b/composer/e-composer-post-header.c index 49611d29f8..000ed7c55c 100644 --- a/composer/e-composer-post-header.c +++ b/composer/e-composer-post-header.c @@ -245,7 +245,9 @@ e_composer_post_header_class_init (EComposerPostHeaderClass *class) static void e_composer_post_header_init (EComposerPostHeader *header) { - header->priv = G_TYPE_INSTANCE_GET_PRIVATE (header, E_TYPE_COMPOSER_POST_HEADER, EComposerPostHeaderPrivate); + header->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + header, E_TYPE_COMPOSER_POST_HEADER, + EComposerPostHeaderPrivate); } EComposerHeader * diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 41703561c1..0bc9ca9c1d 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -2518,7 +2518,7 @@ e_msg_composer_class_init (EMsgComposerClass *class) editor_class->command_before = msg_composer_command_before; editor_class->command_after = msg_composer_command_after; editor_class->image_uri = msg_composer_image_uri; - editor_class->link_clicked = NULL; /* EWebView takes care of it in link-clicked handler */ + editor_class->link_clicked = NULL; /* EWebView handles this */ editor_class->object_deleted = msg_composer_object_deleted; class->presend = msg_composer_presend; @@ -2608,7 +2608,8 @@ e_msg_composer_alert_sink_init (EAlertSinkInterface *interface) static void e_msg_composer_init (EMsgComposer *composer) { - composer->priv = G_TYPE_INSTANCE_GET_PRIVATE (composer, E_TYPE_MSG_COMPOSER, EMsgComposerPrivate); + composer->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + composer, E_TYPE_MSG_COMPOSER, EMsgComposerPrivate); } /* Callbacks. */ diff --git a/e-util/e-activity.c b/e-util/e-activity.c index 0b4089cca2..231de505b4 100644 --- a/e-util/e-activity.c +++ b/e-util/e-activity.c @@ -332,7 +332,8 @@ e_activity_class_init (EActivityClass *class) static void e_activity_init (EActivity *activity) { - activity->priv = G_TYPE_INSTANCE_GET_PRIVATE (activity, E_TYPE_ACTIVITY, EActivityPrivate); + activity->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + activity, E_TYPE_ACTIVITY, EActivityPrivate); } EActivity * diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c index 4f399d351e..6d24dcde65 100644 --- a/e-util/e-alert-dialog.c +++ b/e-util/e-alert-dialog.c @@ -257,7 +257,8 @@ e_alert_dialog_class_init (EAlertDialogClass *class) static void e_alert_dialog_init (EAlertDialog *dialog) { - dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog, E_TYPE_ALERT_DIALOG, EAlertDialogPrivate); + dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + dialog, E_TYPE_ALERT_DIALOG, EAlertDialogPrivate); } GtkWidget * diff --git a/e-util/e-alert.c b/e-util/e-alert.c index 7df5ca9fe1..20199bc638 100644 --- a/e-util/e-alert.c +++ b/e-util/e-alert.c @@ -254,20 +254,30 @@ e_alert_load (const gchar *path) button->stock_id = stock_id; xmlFree (tmp); } - tmp = (gchar *)xmlGetProp(scan, (const guchar *)"label"); + tmp = (gchar *) xmlGetProp ( + scan, (xmlChar *) "label"); if (tmp) { - label = g_strdup (dgettext (table->translation_domain, tmp)); + label = g_strdup ( + dgettext (table-> + translation_domain, + tmp)); button->label = label; xmlFree (tmp); } - tmp = (gchar *)xmlGetProp(scan, (const guchar *)"response"); + tmp = (gchar *) xmlGetProp ( + scan, (xmlChar *) "response"); if (tmp) { - button->response_id = map_response (tmp); + button->response_id = + map_response (tmp); xmlFree (tmp); } if (stock_id == NULL && label == NULL) { - g_warning("Error file '%s': missing button details in error '%s'", path, e->id); + g_warning ( + "Error file '%s': " + "missing button " + "details in error " + "'%s'", path, e->id); g_free (stock_id); g_free (label); g_free (button); @@ -362,7 +372,9 @@ alert_format_string (const gchar *format, if (id < args->len) { g_string_append (string, args->pdata[id]); } else - g_warning("Error references argument %d not supplied by caller", id); + g_warning ( + "Error references argument %d " + "not supplied by caller", id); format = end + 1; } @@ -651,7 +663,8 @@ e_alert_class_init (EAlertClass *class) static void e_alert_init (EAlert *alert) { - alert->priv = G_TYPE_INSTANCE_GET_PRIVATE (alert, E_TYPE_ALERT, EAlertPrivate); + alert->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + alert, E_TYPE_ALERT, EAlertPrivate); g_queue_init (&alert->priv->actions); } diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c index acf318c939..ad651314f5 100644 --- a/e-util/e-bit-array.c +++ b/e-util/e-bit-array.c @@ -49,7 +49,9 @@ e_bit_array_insert_real (EBitArray *eba, gint row) if (eba->bit_count >= 0) { /* Add another word if needed. */ if ((eba->bit_count & 0x1f) == 0) { - eba->data = g_renew (guint32, eba->data, (eba->bit_count >> 5) + 1); + eba->data = g_renew ( + guint32, eba->data, + (eba->bit_count >> 5) + 1); eba->data[eba->bit_count >> 5] = 0; } @@ -95,7 +97,9 @@ e_bit_array_delete_real (EBitArray *eba, gint row, gboolean move_selection_mode) eba->data[box] &= eba->data[box + 1] >> 31; for (i = box + 1; i < last; i++) { - eba->data[i] = (eba->data[i] << 1) | (eba->data[i + 1] >> 31); + eba->data[i] = + (eba->data[i] << 1) | + (eba->data[i + 1] >> 31); } /* this over-runs our memory! */ /*eba->data[i] = eba->data[i] << 1; */ @@ -106,7 +110,8 @@ e_bit_array_delete_real (EBitArray *eba, gint row, gboolean move_selection_mode) eba->data = g_renew (guint32, eba->data, eba->bit_count >> 5); } if (move_selection_mode && selected && eba->bit_count > 0) { - e_bit_array_select_single_row (eba, row == eba->bit_count ? row - 1 : row); + e_bit_array_select_single_row ( + eba, row == eba->bit_count ? row - 1 : row); } } } @@ -327,7 +332,9 @@ e_bit_array_change_range (EBitArray *eba, gint start, gint end, gboolean grow) last = BOX (end); if (i == last) { - OPERATE (eba, i, BITMASK_LEFT (start) | BITMASK_RIGHT (end), grow); + OPERATE ( + eba, i, BITMASK_LEFT (start) | + BITMASK_RIGHT (end), grow); } else { OPERATE (eba, i, BITMASK_LEFT (start), grow); if (grow) diff --git a/e-util/e-config.c b/e-util/e-config.c index 17646e00f8..14765f853b 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -187,7 +187,8 @@ e_config_class_init (EConfigClass *class) static void e_config_init (EConfig *config) { - config->priv = G_TYPE_INSTANCE_GET_PRIVATE (config, E_TYPE_CONFIG, EConfigPrivate); + config->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + config, E_TYPE_CONFIG, EConfigPrivate); } /** diff --git a/e-util/e-event.c b/e-util/e-event.c index 4127a9c930..10ea83b30b 100644 --- a/e-util/e-event.c +++ b/e-util/e-event.c @@ -109,7 +109,8 @@ e_event_class_init (EEventClass *class) static void e_event_init (EEvent *event) { - event->priv = G_TYPE_INSTANCE_GET_PRIVATE (event, E_TYPE_EVENT, EEventPrivate); + event->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + event, E_TYPE_EVENT, EEventPrivate); g_queue_init (&event->priv->events); } @@ -380,11 +381,13 @@ emph_event_handle (EEvent *ee, EEventItem *item, gpointer data) { EEventHook *hook = data; - /* FIXME: we could/should just remove the items we added to the event handler */ + /* FIXME We could/should just remove the items + * we added to the event handler. */ if (!hook->hook.plugin->enabled) return; - e_plugin_invoke (hook->hook.plugin, (gchar *)item->user_data, ee->target); + e_plugin_invoke ( + hook->hook.plugin, (gchar *)item->user_data, ee->target); } static void @@ -449,7 +452,8 @@ emph_construct (EPluginHook *eph, EPlugin *ep, xmlNodePtr root) d(printf("loading event hook\n")); - if (((EPluginHookClass *)e_event_hook_parent_class)->construct (eph, ep, root) == -1) + if (((EPluginHookClass *)e_event_hook_parent_class)-> + construct (eph, ep, root) == -1) return -1; class = E_EVENT_HOOK_GET_CLASS (eph); diff --git a/e-util/e-extension.c b/e-util/e-extension.c index 9c61110911..baf6b49fa4 100644 --- a/e-util/e-extension.c +++ b/e-util/e-extension.c @@ -161,7 +161,8 @@ e_extension_class_init (EExtensionClass *class) static void e_extension_init (EExtension *extension) { - extension->priv = G_TYPE_INSTANCE_GET_PRIVATE (extension, E_TYPE_EXTENSION, EExtensionPrivate); + extension->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + extension, E_TYPE_EXTENSION, EExtensionPrivate); } /** diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c index 8a859ac378..087ac7a162 100644 --- a/e-util/e-html-utils.c +++ b/e-util/e-html-utils.c @@ -468,18 +468,29 @@ struct { { "http://www.foo.com, 555-9999", "http://www.foo.com" }, { "|http://www.foo.com|555-9999|", "http://www.foo.com" }, { "foo http://www.foo.com/ bar", "http://www.foo.com/" }, - { "foo http://www.foo.com/index.html bar", "http://www.foo.com/index.html" }, + { "foo http://www.foo.com/index.html bar", + "http://www.foo.com/index.html" }, { "foo http://www.foo.com/q?99 bar", "http://www.foo.com/q?99" }, - { "foo http://www.foo.com/;foo=bar&baz=quux bar", "http://www.foo.com/;foo=bar&baz=quux" }, - { "foo http://www.foo.com/index.html#anchor bar", "http://www.foo.com/index.html#anchor" }, - { "http://www.foo.com/index.html; foo", "http://www.foo.com/index.html" }, - { "http://www.foo.com/index.html: foo", "http://www.foo.com/index.html" }, - { "http://www.foo.com/index.html-- foo", "http://www.foo.com/index.html" }, - { "http://www.foo.com/index.html?", "http://www.foo.com/index.html" }, - { "http://www.foo.com/index.html!", "http://www.foo.com/index.html" }, - { "\"http://www.foo.com/index.html\"", "http://www.foo.com/index.html" }, - { "'http://www.foo.com/index.html'", "http://www.foo.com/index.html" }, - { "http://bob@www.foo.com/bar/baz/", "http://bob@www.foo.com/bar/baz/" }, + { "foo http://www.foo.com/;foo=bar&baz=quux bar", + "http://www.foo.com/;foo=bar&baz=quux" }, + { "foo http://www.foo.com/index.html#anchor bar", + "http://www.foo.com/index.html#anchor" }, + { "http://www.foo.com/index.html; foo", + "http://www.foo.com/index.html" }, + { "http://www.foo.com/index.html: foo", + "http://www.foo.com/index.html" }, + { "http://www.foo.com/index.html-- foo", + "http://www.foo.com/index.html" }, + { "http://www.foo.com/index.html?", + "http://www.foo.com/index.html" }, + { "http://www.foo.com/index.html!", + "http://www.foo.com/index.html" }, + { "\"http://www.foo.com/index.html\"", + "http://www.foo.com/index.html" }, + { "'http://www.foo.com/index.html'", + "http://www.foo.com/index.html" }, + { "http://bob@www.foo.com/bar/baz/", + "http://bob@www.foo.com/bar/baz/" }, { "http no match http", NULL }, { "http: no match http:", NULL }, { "http:// no match http://", NULL }, diff --git a/e-util/e-import.c b/e-util/e-import.c index 700d4b885c..ac41024e73 100644 --- a/e-util/e-import.c +++ b/e-util/e-import.c @@ -533,7 +533,8 @@ emph_construct (EPluginHook *eph, EPlugin *ep, xmlNodePtr root) d (printf ("loading import hook\n")); - if (E_PLUGIN_HOOK_CLASS (e_import_hook_parent_class)->construct (eph, ep, root) == -1) + if (E_PLUGIN_HOOK_CLASS (e_import_hook_parent_class)-> + construct (eph, ep, root) == -1) return -1; class = E_IMPORT_HOOK_GET_CLASS (eph)->import_class; diff --git a/e-util/e-import.h b/e-util/e-import.h index ea3f22cbdf..4fc3294e3b 100644 --- a/e-util/e-import.h +++ b/e-util/e-import.h @@ -78,7 +78,8 @@ typedef void (*EImportImportFunc) (EImport *ei, /* The global target types, implementors may add additional ones */ enum _e_import_target_t { E_IMPORT_TARGET_URI, /* simple file */ - E_IMPORT_TARGET_HOME, /* a home-directory thing, i.e. old applications */ + E_IMPORT_TARGET_HOME, /* a home-directory thing, + * i.e. old applications */ E_IMPORT_TARGET_LAST = 256 }; diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c index 5e4daa81d1..148dc414a8 100644 --- a/e-util/e-mktemp.c +++ b/e-util/e-mktemp.c @@ -138,14 +138,16 @@ get_dir (gboolean make) return NULL; } - /* make sure this is a directory and belongs to us... */ + /* make sure this is a directory and + * belongs to us... */ if (!S_ISDIR (st.st_mode) || st.st_uid != getuid ()) { /* eek! this is bad... */ g_string_free (path, TRUE); return NULL; } } else { - /* some other error...do not pass go, do not collect $200 */ + /* some other error...do not pass go, + * do not collect $200 */ g_string_free (path, TRUE); return NULL; } diff --git a/e-util/e-module.c b/e-util/e-module.c index 56add2b27f..cc397a9001 100644 --- a/e-util/e-module.c +++ b/e-util/e-module.c @@ -199,7 +199,8 @@ e_module_class_init (EModuleClass *class) static void e_module_init (EModule *module) { - module->priv = G_TYPE_INSTANCE_GET_PRIVATE (module, E_TYPE_MODULE, EModulePrivate); + module->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + module, E_TYPE_MODULE, EModulePrivate); } /** diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c index e606e713f6..a6ecb834c8 100644 --- a/e-util/e-plugin-ui.c +++ b/e-util/e-plugin-ui.c @@ -520,7 +520,8 @@ e_plugin_ui_hook_init (EPluginUIHook *hook) registry = g_hash_table_new (g_direct_hash, g_direct_equal); - hook->priv = G_TYPE_INSTANCE_GET_PRIVATE (hook, E_TYPE_PLUGIN_UI_HOOK, EPluginUIHookPrivate); + hook->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + hook, E_TYPE_PLUGIN_UI_HOOK, EPluginUIHookPrivate); hook->priv->ui_definitions = ui_definitions; hook->priv->callbacks = callbacks; hook->priv->registry = registry; diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index db717e8dcd..d3579b7d89 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -154,8 +154,6 @@ ep_construct (EPlugin *ep, xmlNodePtr root) ep->name = e_plugin_xml_prop_domain(root, "name", ep->domain); - pd(printf("creating plugin '%s' '%s'\n", ep->name?ep->name:"un-named", ep->id)); - node = root->children; while (node) { if (strcmp((gchar *)node->name, "hook") == 0) { @@ -173,12 +171,15 @@ ep_construct (EPlugin *ep, xmlNodePtr root) if (ep->enabled && eph_types != NULL - && (type = g_hash_table_lookup (eph_types, class)) != NULL) { + && (type = g_hash_table_lookup ( + eph_types, class)) != NULL) { g_free (class); hook = g_object_new (G_OBJECT_CLASS_TYPE (type), NULL); res = type->construct (hook, ep, node); if (res == -1) { - g_warning("Plugin '%s' failed to load hook", ep->name); + g_warning ( + "Plugin '%s' failed to " + "load hook", ep->name); g_object_unref (hook); goto fail; } else { @@ -188,7 +189,8 @@ ep_construct (EPlugin *ep, xmlNodePtr root) g_free (class); } } else if (strcmp((gchar *)node->name, "description") == 0) { - ep->description = e_plugin_xml_content_domain (node, ep->domain); + ep->description = + e_plugin_xml_content_domain (node, ep->domain); } else if (strcmp((gchar *)node->name, "author") == 0) { gchar *name = e_plugin_xml_prop(node, "name"); gchar *email = e_plugin_xml_prop(node, "email"); @@ -353,7 +355,6 @@ ep_load_plugin (xmlNodePtr root, struct _plugin_doc *pdoc) * which is checked when a new type is registered. */ class = g_hash_table_lookup (ep_types, prop); if (class == NULL) { - pd(printf("Delaying loading of plugin '%s' unknown type '%s'\n", id, prop)); g_free (id); xmlFree (prop); return NULL; @@ -404,22 +405,20 @@ ep_load (const gchar *filename, gint load_level) if ((atoi (plugin_load_level) == load_level) ) { ep = ep_load_plugin (root, pdoc); - if (ep) { - if (load_level == 1) - e_plugin_invoke (ep, "load_plugin_type_register_function", NULL); - } + if (ep && load_level == 1) + e_plugin_invoke (ep, "load_plugin_type_register_function", NULL); } } else if (load_level == 2) { ep = ep_load_plugin (root, pdoc); } if (ep) { - pd(printf ("\nloading plugin [%s] at load_level [%d]\n", ep->name, load_level)); - - /* README: May be we can use load_levels to achieve the same thing. - But it may be confusing for a plugin writer */ - is_system_plugin = e_plugin_xml_prop (root, "system_plugin"); - if (is_system_plugin && !strcmp (is_system_plugin, "true")) { + /* README: Maybe we can use load_levels to + * achieve the same thing. But it may be + * confusing for a plugin writer. */ + is_system_plugin = + e_plugin_xml_prop (root, "system_plugin"); + if (g_strcmp0 (is_system_plugin, "true") == 0) { e_plugin_enable (ep, TRUE); ep->flags |= E_PLUGIN_FLAGS_SYSTEM_PLUGIN; } else @@ -559,8 +558,9 @@ e_plugin_load_plugins (void) while ((d = g_dir_read_name (dir))) { if (g_str_has_suffix (d, ".eplug")) { - gchar * name = g_build_filename (path, d, NULL); + gchar *name; + name = g_build_filename (path, d, NULL); ep_load (name, i); g_free (name); } diff --git a/e-util/e-profile-event.c b/e-util/e-profile-event.c index 2a455b3e45..7ca11c5d37 100644 --- a/e-util/e-profile-event.c +++ b/e-util/e-profile-event.c @@ -68,17 +68,24 @@ EProfileEvent * e_profile_event_peek (void) { if (e_profile_event == NULL) { - e_profile_event = g_object_new (e_profile_event_get_type (), NULL); - e_event_construct(&e_profile_event->popup, "org.gnome.evolution.profile.events"); + e_profile_event = g_object_new ( + e_profile_event_get_type (), NULL); + e_event_construct ( + &e_profile_event->popup, + "org.gnome.evolution.profile.events"); } return e_profile_event; } EProfileEventTarget * -e_profile_event_target_new (EProfileEvent *eme, const gchar *id, const gchar *uid, guint32 flags) +e_profile_event_target_new (EProfileEvent *eme, + const gchar *id, + const gchar *uid, + guint32 flags) { - EProfileEventTarget *t = e_event_target_new (&eme->popup, E_PROFILE_EVENT_TARGET, sizeof (*t)); + EProfileEventTarget *t = e_event_target_new ( + &eme->popup, E_PROFILE_EVENT_TARGET, sizeof (*t)); GTimeVal tv; t->id = g_strdup (id); @@ -133,10 +140,12 @@ e_profile_event_hook_class_init (EProfileEventHookClass *class) { gint i; - ((EPluginHookClass *)class)->id = "org.gnome.evolution.profile.events:1.0"; + ((EPluginHookClass *)class)->id = + "org.gnome.evolution.profile.events:1.0"; for (i=0;emeh_targets[i].type;i++) - e_event_hook_class_add_target_map ((EEventHookClass *)class, &emeh_targets[i]); + e_event_hook_class_add_target_map ( + (EEventHookClass *) class, &emeh_targets[i]); ((EEventHookClass *)class)->event = (EEvent *)e_profile_event_peek (); } diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c index 7b8a320782..f089b22d75 100644 --- a/e-util/e-signature-list.c +++ b/e-util/e-signature-list.c @@ -109,7 +109,8 @@ e_signature_list_class_init (ESignatureListClass *class) static void e_signature_list_init (ESignatureList *signature_list) { - signature_list->priv = G_TYPE_INSTANCE_GET_PRIVATE (signature_list, E_TYPE_SIGNATURE_LIST, ESignatureListPrivate); + signature_list->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + signature_list, E_TYPE_SIGNATURE_LIST, ESignatureListPrivate); } static GSList * @@ -161,13 +162,16 @@ gconf_signatures_changed (GConfClient *client, * it from "old_sigs" and update it. */ found = TRUE; e_iterator_delete (iter); - if (e_signature_set_from_xml (signature, l->data)) + if (e_signature_set_from_xml ( + signature, l->data)) g_signal_emit ( signature_list, signals[SIGNATURE_CHANGED], 0, signature); - have_autogen |= e_signature_get_autogenerated (signature); + have_autogen |= + e_signature_get_autogenerated ( + signature); break; } @@ -184,7 +188,8 @@ gconf_signatures_changed (GConfClient *client, /* Must be a new signature */ signature = e_signature_new_from_xml (l->data); if (signature) { - have_autogen |= e_signature_get_autogenerated (signature); + have_autogen |= + e_signature_get_autogenerated (signature); e_list_append (E_LIST (signature_list), signature); new_sigs = g_slist_prepend (new_sigs, signature); @@ -205,7 +210,10 @@ gconf_signatures_changed (GConfClient *client, while (l != NULL) { n = l->next; signature = l->data; - g_signal_emit (signature_list, signals[SIGNATURE_ADDED], 0, signature); + g_signal_emit ( + signature_list, + signals[SIGNATURE_ADDED], 0, + signature); g_object_unref (signature); g_slist_free_1 (l); l = n; diff --git a/e-util/e-signature.c b/e-util/e-signature.c index 7bd2b74bf0..a7ab2519ef 100644 --- a/e-util/e-signature.c +++ b/e-util/e-signature.c @@ -319,7 +319,8 @@ e_signature_class_init (ESignatureClass *class) static void e_signature_init (ESignature *signature) { - signature->priv = G_TYPE_INSTANCE_GET_PRIVATE (signature, E_TYPE_SIGNATURE, ESignaturePrivate); + signature->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + signature, E_TYPE_SIGNATURE, ESignaturePrivate); } /** @@ -453,12 +454,15 @@ e_signature_set_from_xml (ESignature *signature, const gchar *xml) cur = node->children; while (cur) { if (!strcmp ((gchar *)cur->name, "filename")) { - changed |= xml_set_content (cur, &signature->priv->filename); - changed |= xml_set_bool (cur, "script", &signature->priv->is_script); + changed |= xml_set_content ( + cur, &signature->priv->filename); + changed |= xml_set_bool ( + cur, "script", &signature->priv->is_script); break; } else if (!strcmp ((gchar *)cur->name, "script")) { /* this is for handling 1.4 signature script definitions */ - changed |= xml_set_content (cur, &signature->priv->filename); + changed |= xml_set_content ( + cur, &signature->priv->filename); if (!e_signature_get_is_script (signature)) { e_signature_set_is_script (signature, TRUE); changed = TRUE; diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c index 808af66242..2630a6608f 100644 --- a/e-util/e-sorter-array.c +++ b/e-util/e-sorter-array.c @@ -37,14 +37,18 @@ G_DEFINE_TYPE ( e_sorter_array, E_SORTER_TYPE) -static void esa_sort (ESorterArray *esa); -static void esa_backsort (ESorterArray *esa); - -static gint esa_model_to_sorted (ESorter *sorter, gint row); -static gint esa_sorted_to_model (ESorter *sorter, gint row); -static void esa_get_model_to_sorted_array (ESorter *sorter, gint **array, gint *count); -static void esa_get_sorted_to_model_array (ESorter *sorter, gint **array, gint *count); -static gboolean esa_needs_sorting (ESorter *esa); +static void esa_sort (ESorterArray *esa); +static void esa_backsort (ESorterArray *esa); + +static gint esa_model_to_sorted (ESorter *sorter, gint row); +static gint esa_sorted_to_model (ESorter *sorter, gint row); +static void esa_get_model_to_sorted_array (ESorter *sorter, + gint **array, + gint *count); +static void esa_get_sorted_to_model_array (ESorter *sorter, + gint **array, + gint *count); +static gboolean esa_needs_sorting (ESorter *esa); #define ESA_NEEDS_SORTING(esa) (((ESorterArray *) (esa))->compare != NULL) diff --git a/e-util/e-ui-manager.c b/e-util/e-ui-manager.c index 238df39e9f..52196626d4 100644 --- a/e-util/e-ui-manager.c +++ b/e-util/e-ui-manager.c @@ -159,7 +159,8 @@ e_ui_manager_class_init (EUIManagerClass *class) static void e_ui_manager_init (EUIManager *ui_manager) { - ui_manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (ui_manager, E_TYPE_UI_MANAGER, EUIManagerPrivate); + ui_manager->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + ui_manager, E_TYPE_UI_MANAGER, EUIManagerPrivate); } /** diff --git a/e-util/e-unicode.c b/e-util/e-unicode.c index 46d6a6c996..0fc5a8b5da 100644 --- a/e-util/e-unicode.c +++ b/e-util/e-unicode.c @@ -168,7 +168,8 @@ e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) ibl = bytes - (ib - string); if (ibl > bytes) ibl = 0; - /* FIXME: this is wrong... what if the destination charset is 16 or 32 bit? */ + /* FIXME This is wrong. What if the destination + * charset is 16 or 32 bit? */ *ob++ = '_'; obl--; } @@ -181,7 +182,9 @@ e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes) } gchar * -e_utf8_to_charset_string_sized (const gchar *charset, const gchar *string, gint bytes) +e_utf8_to_charset_string_sized (const gchar *charset, + const gchar *string, + gint bytes) { iconv_t ic; gchar *ret; diff --git a/e-util/e-util.c b/e-util/e-util.c index 8f91558823..5fdfed901b 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -712,9 +712,11 @@ e_format_number (gint number) case 0: divider = epow10 (last_count); if (number >= divider) { - group = g_strdup_printf("%0*d", last_count, number % divider); + group = g_strdup_printf ( + "%0*d", last_count, number % divider); } else { - group = g_strdup_printf("%d", number % divider); + group = g_strdup_printf ( + "%d", number % divider); } number /= divider; break; @@ -1132,9 +1134,11 @@ e_flexible_strtod (const gchar *nptr, gchar **endptr) if (fail_pos) { if (fail_pos > decimal_point_pos) - fail_pos = (gchar *)nptr + (fail_pos - copy) - (decimal_point_len - 1); + fail_pos = + (gchar *) nptr + (fail_pos - copy) - + (decimal_point_len - 1); else - fail_pos = (gchar *)nptr + (fail_pos - copy); + fail_pos = (gchar *) nptr + (fail_pos - copy); } g_free (copy); @@ -1296,41 +1300,58 @@ get_font_options (void) /* Antialiasing */ if (fo_antialiasing == NULL) - cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_DEFAULT); + cairo_font_options_set_antialias ( + font_options, CAIRO_ANTIALIAS_DEFAULT); else if (strcmp (fo_antialiasing, "grayscale") == 0) - cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_GRAY); + cairo_font_options_set_antialias ( + font_options, CAIRO_ANTIALIAS_GRAY); else if (strcmp (fo_antialiasing, "rgba") == 0) - cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_SUBPIXEL); + cairo_font_options_set_antialias ( + font_options, CAIRO_ANTIALIAS_SUBPIXEL); else if (strcmp (fo_antialiasing, "none") == 0) - cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_NONE); + cairo_font_options_set_antialias ( + font_options, CAIRO_ANTIALIAS_NONE); else - cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_DEFAULT); + cairo_font_options_set_antialias ( + font_options, CAIRO_ANTIALIAS_DEFAULT); if (fo_hinting == NULL) - cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_DEFAULT); + cairo_font_options_set_hint_style ( + font_options, CAIRO_HINT_STYLE_DEFAULT); else if (strcmp (fo_hinting, "full") == 0) - cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_FULL); + cairo_font_options_set_hint_style ( + font_options, CAIRO_HINT_STYLE_FULL); else if (strcmp (fo_hinting, "medium") == 0) - cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_MEDIUM); + cairo_font_options_set_hint_style ( + font_options, CAIRO_HINT_STYLE_MEDIUM); else if (strcmp (fo_hinting, "slight") == 0) - cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_SLIGHT); + cairo_font_options_set_hint_style ( + font_options, CAIRO_HINT_STYLE_SLIGHT); else if (strcmp (fo_hinting, "none") == 0) - cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_NONE); + cairo_font_options_set_hint_style ( + font_options, CAIRO_HINT_STYLE_NONE); else - cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_DEFAULT); + cairo_font_options_set_hint_style ( + font_options, CAIRO_HINT_STYLE_DEFAULT); if (fo_subpixel_order == NULL) - cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_DEFAULT); + cairo_font_options_set_subpixel_order ( + font_options, CAIRO_SUBPIXEL_ORDER_DEFAULT); else if (strcmp (fo_subpixel_order, "rgb") == 0) - cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_RGB); + cairo_font_options_set_subpixel_order ( + font_options, CAIRO_SUBPIXEL_ORDER_RGB); else if (strcmp (fo_subpixel_order, "bgr") == 0) - cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_BGR); + cairo_font_options_set_subpixel_order ( + font_options, CAIRO_SUBPIXEL_ORDER_BGR); else if (strcmp (fo_subpixel_order, "vrgb") == 0) - cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_VRGB); + cairo_font_options_set_subpixel_order ( + font_options, CAIRO_SUBPIXEL_ORDER_VRGB); else if (strcmp (fo_subpixel_order, "vbgr") == 0) - cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_VBGR); + cairo_font_options_set_subpixel_order ( + font_options, CAIRO_SUBPIXEL_ORDER_VBGR); else - cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_DEFAULT); + cairo_font_options_set_subpixel_order ( + font_options, CAIRO_SUBPIXEL_ORDER_DEFAULT); g_static_mutex_unlock (&fo_lock); diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c index c83bbabf9d..f67cd514bd 100644 --- a/e-util/e-xml-utils.c +++ b/e-util/e-xml-utils.c @@ -75,7 +75,8 @@ e_xml_get_child_by_name_by_lang (const xmlNode *parent, } for (child = parent->xmlChildrenNode; child != NULL; child = child->next) { if (xmlStrcmp (child->name, child_name) == 0) { - xmlChar *this_lang = xmlGetProp (child, (const guchar *)"lang"); + xmlChar *this_lang = xmlGetProp ( + child, (const guchar *)"lang"); if (this_lang == NULL) { C = child; } else if (xmlStrcmp (this_lang, (xmlChar *)lang) == 0) { diff --git a/em-format/em-format.c b/em-format/em-format.c index 59ae409912..e71e2a96a2 100644 --- a/em-format/em-format.c +++ b/em-format/em-format.c @@ -356,7 +356,8 @@ emf_init (EMFormat *emf) EShell *shell; EShellSettings *shell_settings; - emf->priv = G_TYPE_INSTANCE_GET_PRIVATE (emf, EM_TYPE_FORMAT, EMFormatPrivate); + emf->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + emf, EM_TYPE_FORMAT, EMFormatPrivate); emf->inline_table = g_hash_table_new_full ( g_str_hash, g_str_equal, diff --git a/em-format/em-format.h b/em-format/em-format.h index b1f0746fed..06aa127cea 100644 --- a/em-format/em-format.h +++ b/em-format/em-format.h @@ -198,7 +198,8 @@ struct _EMFormat { /* Current part ID prefix for identifying parts directly. */ GString *part_id; - /* part_id of the currently processing message (when the message has message-attachments) */ + /* part_id of the currently processing message + * (when the message has message-attachments) */ gchar *current_message_part_id; /* If empty, then all. */ diff --git a/filter/e-filter-datespec.c b/filter/e-filter-datespec.c index 95e9dfd68a..34155f8073 100644 --- a/filter/e-filter-datespec.c +++ b/filter/e-filter-datespec.c @@ -461,7 +461,8 @@ e_filter_datespec_class_init (EFilterDatespecClass *class) static void e_filter_datespec_init (EFilterDatespec *datespec) { - datespec->priv = G_TYPE_INSTANCE_GET_PRIVATE (datespec, E_TYPE_FILTER_DATESPEC, EFilterDatespecPrivate); + datespec->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + datespec, E_TYPE_FILTER_DATESPEC, EFilterDatespecPrivate); datespec->type = FDST_UNKNOWN; } diff --git a/filter/e-filter-rule.c b/filter/e-filter-rule.c index ab39940843..d10ae85dda 100644 --- a/filter/e-filter-rule.c +++ b/filter/e-filter-rule.c @@ -860,7 +860,8 @@ e_filter_rule_class_init (EFilterRuleClass *class) static void e_filter_rule_init (EFilterRule *rule) { - rule->priv = G_TYPE_INSTANCE_GET_PRIVATE (rule, E_TYPE_FILTER_RULE, EFilterRulePrivate); + rule->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + rule, E_TYPE_FILTER_RULE, EFilterRulePrivate); rule->enabled = TRUE; } diff --git a/filter/e-rule-context.c b/filter/e-rule-context.c index 95ca9bbc7a..edfa9e41ea 100644 --- a/filter/e-rule-context.c +++ b/filter/e-rule-context.c @@ -514,7 +514,8 @@ e_rule_context_class_init (ERuleContextClass *class) static void e_rule_context_init (ERuleContext *context) { - context->priv = G_TYPE_INSTANCE_GET_PRIVATE (context, E_TYPE_RULE_CONTEXT, ERuleContextPrivate); + context->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + context, E_TYPE_RULE_CONTEXT, ERuleContextPrivate); context->part_set_map = g_hash_table_new (g_str_hash, g_str_equal); context->rule_set_map = g_hash_table_new (g_str_hash, g_str_equal); diff --git a/filter/e-rule-editor.c b/filter/e-rule-editor.c index e1e702638c..d8099b1eb8 100644 --- a/filter/e-rule-editor.c +++ b/filter/e-rule-editor.c @@ -650,7 +650,8 @@ e_rule_editor_class_init (ERuleEditorClass *class) static void e_rule_editor_init (ERuleEditor *editor) { - editor->priv = G_TYPE_INSTANCE_GET_PRIVATE (editor, E_TYPE_RULE_EDITOR, ERuleEditorPrivate); + editor->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + editor, E_TYPE_RULE_EDITOR, ERuleEditorPrivate); } /** diff --git a/libgnomecanvas/gnome-canvas-pixbuf.c b/libgnomecanvas/gnome-canvas-pixbuf.c index fa6d403959..fbe673d4c0 100644 --- a/libgnomecanvas/gnome-canvas-pixbuf.c +++ b/libgnomecanvas/gnome-canvas-pixbuf.c @@ -99,7 +99,8 @@ gnome_canvas_pixbuf_class_init (GnomeCanvasPixbufClass *class) static void gnome_canvas_pixbuf_init (GnomeCanvasPixbuf *gcp) { - gcp->priv = G_TYPE_INSTANCE_GET_PRIVATE (gcp, GNOME_TYPE_CANVAS_PIXBUF, GnomeCanvasPixbufPrivate); + gcp->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + gcp, GNOME_TYPE_CANVAS_PIXBUF, GnomeCanvasPixbufPrivate); } /* Dispose handler for the pixbuf canvas item */ diff --git a/libgnomecanvas/gnome-canvas-rect.c b/libgnomecanvas/gnome-canvas-rect.c index b75a177c81..b90dc4c08a 100644 --- a/libgnomecanvas/gnome-canvas-rect.c +++ b/libgnomecanvas/gnome-canvas-rect.c @@ -700,7 +700,8 @@ gnome_canvas_rect_class_init (GnomeCanvasRectClass *class) static void gnome_canvas_rect_init (GnomeCanvasRect *rect) { - rect->priv = G_TYPE_INSTANCE_GET_PRIVATE (rect, GNOME_TYPE_CANVAS_RECT, GnomeCanvasRectPrivate); + rect->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + rect, GNOME_TYPE_CANVAS_RECT, GnomeCanvasRectPrivate); rect->priv->scale = 1.0; diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index 0a5a3271fe..786fda255c 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -503,7 +503,8 @@ mail_attachment_bar_init (EMailAttachmentBar *bar) GtkWidget *widget; GtkAction *action; - bar->priv = G_TYPE_INSTANCE_GET_PRIVATE (bar, E_TYPE_MAIL_ATTACHMENT_BAR, EMailAttachmentBarPrivate); + bar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + bar, E_TYPE_MAIL_ATTACHMENT_BAR, EMailAttachmentBarPrivate); bar->priv->model = e_attachment_store_new (); gtk_box_set_spacing (GTK_BOX (bar), 6); diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c index fb2a384796..c75f7c96a2 100644 --- a/mail/e-mail-backend.c +++ b/mail/e-mail-backend.c @@ -546,7 +546,8 @@ e_mail_backend_class_init (EMailBackendClass *class) static void e_mail_backend_init (EMailBackend *backend) { - backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (backend, E_TYPE_MAIL_BACKEND, EMailBackendPrivate); + backend->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + backend, E_TYPE_MAIL_BACKEND, EMailBackendPrivate); } EMailSession * diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c index b1186aa945..ba0c585f7b 100644 --- a/mail/e-mail-browser.c +++ b/mail/e-mail-browser.c @@ -939,7 +939,8 @@ e_mail_browser_init (EMailBrowser *browser) GConfBridge *bridge; const gchar *prefix; - browser->priv = G_TYPE_INSTANCE_GET_PRIVATE (browser, E_TYPE_MAIL_BROWSER, EMailBrowserPrivate); + browser->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + browser, E_TYPE_MAIL_BROWSER, EMailBrowserPrivate); browser->priv->action_group = gtk_action_group_new ("mail-browser"); browser->priv->formatter = em_format_html_display_new (); diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index 7fc16943a4..c0c96b5066 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -363,7 +363,8 @@ mail_display_init (EMailDisplay *display) web_view = E_WEB_VIEW (display); - display->priv = G_TYPE_INSTANCE_GET_PRIVATE (display, E_TYPE_MAIL_DISPLAY, EMailDisplayPrivate); + display->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + display, E_TYPE_MAIL_DISPLAY, EMailDisplayPrivate); /* EWebView's action groups are added during its instance * initialization function (like what we're in now), so it diff --git a/mail/e-mail-folder-pane.c b/mail/e-mail-folder-pane.c index beac9cc1ef..12123128e1 100644 --- a/mail/e-mail-folder-pane.c +++ b/mail/e-mail-folder-pane.c @@ -167,7 +167,8 @@ e_mail_folder_pane_class_init (EMailFolderPaneClass *class) static void e_mail_folder_pane_init (EMailFolderPane *browser) { - browser->priv = G_TYPE_INSTANCE_GET_PRIVATE (browser, E_TYPE_MAIL_FOLDER_PANE, EMailFolderPanePrivate); + browser->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + browser, E_TYPE_MAIL_FOLDER_PANE, EMailFolderPanePrivate); } EMailView * diff --git a/mail/e-mail-label-action.c b/mail/e-mail-label-action.c index c7cf71a655..f83055bb34 100644 --- a/mail/e-mail-label-action.c +++ b/mail/e-mail-label-action.c @@ -102,7 +102,8 @@ mail_label_action_class_init (EMailLabelActionClass *class) static void mail_label_action_init (EMailLabelAction *action) { - action->priv = G_TYPE_INSTANCE_GET_PRIVATE (action, E_TYPE_MAIL_LABEL_ACTION, EMailLabelActionPrivate); + action->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + action, E_TYPE_MAIL_LABEL_ACTION, EMailLabelActionPrivate); } GType diff --git a/mail/e-mail-label-dialog.c b/mail/e-mail-label-dialog.c index 4a4728a433..534ab9e705 100644 --- a/mail/e-mail-label-dialog.c +++ b/mail/e-mail-label-dialog.c @@ -181,7 +181,8 @@ mail_label_dialog_init (EMailLabelDialog *dialog) GtkWidget *container; GtkWidget *widget; - dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog, E_TYPE_MAIL_LABEL_DIALOG, EMailLabelDialogPrivate); + dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + dialog, E_TYPE_MAIL_LABEL_DIALOG, EMailLabelDialogPrivate); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c index 104e392a28..c0774e4f52 100644 --- a/mail/e-mail-label-list-store.c +++ b/mail/e-mail-label-list-store.c @@ -234,7 +234,9 @@ mail_label_list_store_init (EMailLabelListStore *store) (GDestroyNotify) g_free, (GDestroyNotify) gtk_tree_row_reference_free); - store->priv = G_TYPE_INSTANCE_GET_PRIVATE (store, E_TYPE_MAIL_LABEL_LIST_STORE, EMailLabelListStorePrivate); + store->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + store, E_TYPE_MAIL_LABEL_LIST_STORE, + EMailLabelListStorePrivate); store->priv->tag_index = tag_index; /* XXX While it may seem awkward to cram the label name and color diff --git a/mail/e-mail-label-manager.c b/mail/e-mail-label-manager.c index 54b2b7fd90..0a210178aa 100644 --- a/mail/e-mail-label-manager.c +++ b/mail/e-mail-label-manager.c @@ -305,7 +305,8 @@ mail_label_manager_init (EMailLabelManager *manager) GtkWidget *container; GtkWidget *widget; - manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (manager, E_TYPE_MAIL_LABEL_MANAGER, EMailLabelManagerPrivate); + manager->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + manager, E_TYPE_MAIL_LABEL_MANAGER, EMailLabelManagerPrivate); gtk_table_resize (GTK_TABLE (manager), 2, 2); gtk_table_set_col_spacings (GTK_TABLE (manager), 6); diff --git a/mail/e-mail-label-tree-view.c b/mail/e-mail-label-tree-view.c index 3d53108a6e..0d5baab145 100644 --- a/mail/e-mail-label-tree-view.c +++ b/mail/e-mail-label-tree-view.c @@ -75,7 +75,9 @@ mail_label_tree_view_init (EMailLabelTreeView *tree_view) GtkTreeViewColumn *column; GtkCellRenderer *renderer; - tree_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (tree_view, E_TYPE_MAIL_LABEL_TREE_VIEW, EMailLabelTreeViewPrivate); + tree_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + tree_view, E_TYPE_MAIL_LABEL_TREE_VIEW, + EMailLabelTreeViewPrivate); column = gtk_tree_view_column_new (); renderer = gtk_cell_renderer_pixbuf_new (); diff --git a/mail/e-mail-message-pane.c b/mail/e-mail-message-pane.c index 75fd4597ee..0a23429cf3 100644 --- a/mail/e-mail-message-pane.c +++ b/mail/e-mail-message-pane.c @@ -76,7 +76,8 @@ e_mail_message_pane_class_init (EMailMessagePaneClass *class) static void e_mail_message_pane_init (EMailMessagePane *browser) { - browser->priv = G_TYPE_INSTANCE_GET_PRIVATE (browser, E_TYPE_MAIL_MESSAGE_PANE, EMailMessagePanePrivate); + browser->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + browser, E_TYPE_MAIL_MESSAGE_PANE, EMailMessagePanePrivate); } EMailView * diff --git a/mail/e-mail-notebook-view.c b/mail/e-mail-notebook-view.c index 1ff0a014f0..bd92b52d14 100644 --- a/mail/e-mail-notebook-view.c +++ b/mail/e-mail-notebook-view.c @@ -1339,7 +1339,8 @@ e_mail_notebook_view_reader_init (EMailReaderInterface *interface) static void e_mail_notebook_view_init (EMailNotebookView *view) { - view->priv = G_TYPE_INSTANCE_GET_PRIVATE (view, E_TYPE_MAIL_NOTEBOOK_VIEW, EMailNotebookViewPrivate); + view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + view, E_TYPE_MAIL_NOTEBOOK_VIEW, EMailNotebookViewPrivate); view->priv->inited = FALSE; view->priv->views = g_hash_table_new (g_str_hash, g_str_equal); diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c index 05777d254e..2f98ebf61e 100644 --- a/mail/e-mail-paned-view.c +++ b/mail/e-mail-paned-view.c @@ -975,7 +975,8 @@ e_mail_paned_view_reader_init (EMailReaderInterface *interface) static void e_mail_paned_view_init (EMailPanedView *view) { - view->priv = G_TYPE_INSTANCE_GET_PRIVATE (view, E_TYPE_MAIL_PANED_VIEW, EMailPanedViewPrivate); + view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + view, E_TYPE_MAIL_PANED_VIEW, EMailPanedViewPrivate); view->priv->enable_show_folder = FALSE; g_signal_connect ( diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c index 4f78be0d90..e6afdc05b4 100644 --- a/mail/e-mail-session.c +++ b/mail/e-mail-session.c @@ -997,7 +997,8 @@ e_mail_session_init (EMailSession *session) { GConfClient *client; - session->priv = G_TYPE_INSTANCE_GET_PRIVATE (session, E_TYPE_MAIL_SESSION, EMailSessionPrivate); + session->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + session, E_TYPE_MAIL_SESSION, EMailSessionPrivate); session->priv->folder_cache = mail_folder_cache_new (); /* Initialize the EAccount setup. */ diff --git a/mail/e-mail-sidebar.c b/mail/e-mail-sidebar.c index 19f38f7d30..9f44f9e1a2 100644 --- a/mail/e-mail-sidebar.c +++ b/mail/e-mail-sidebar.c @@ -421,7 +421,8 @@ mail_sidebar_init (EMailSidebar *sidebar) GtkTreeSelection *selection; EMFolderTree *folder_tree; - sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (sidebar, E_TYPE_MAIL_SIDEBAR, EMailSidebarPrivate); + sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + sidebar, E_TYPE_MAIL_SIDEBAR, EMailSidebarPrivate); folder_tree = EM_FOLDER_TREE (sidebar); em_folder_tree_set_excluded (folder_tree, 0); diff --git a/mail/e-mail-tab-picker.c b/mail/e-mail-tab-picker.c index 89b672e782..7c71d0580a 100644 --- a/mail/e-mail-tab-picker.c +++ b/mail/e-mail-tab-picker.c @@ -25,1305 +25,1297 @@ static void mx_droppable_iface_init (MxDroppableIface *iface); static gint e_mail_tab_picker_find_tab_cb (gconstpointer a, gconstpointer b); -G_DEFINE_TYPE_WITH_CODE (EMailTabPicker, - e_mail_tab_picker, - MX_TYPE_WIDGET, - G_IMPLEMENT_INTERFACE (MX_TYPE_DROPPABLE, - mx_droppable_iface_init)) +G_DEFINE_TYPE_WITH_CODE ( + EMailTabPicker, + e_mail_tab_picker, + MX_TYPE_WIDGET, + G_IMPLEMENT_INTERFACE ( + MX_TYPE_DROPPABLE, mx_droppable_iface_init)) enum { - PROP_0, + PROP_0, - PROP_PREVIEW_MODE, - PROP_DROP_ENABLED, + PROP_PREVIEW_MODE, + PROP_DROP_ENABLED, }; enum { - TAB_ACTIVATED, - CHOOSER_CLICKED, + TAB_ACTIVATED, + CHOOSER_CLICKED, - LAST_SIGNAL + LAST_SIGNAL }; static guint signals[LAST_SIGNAL] = { 0, }; typedef struct { - EMailTab *tab; - gfloat position; - gfloat width; - gboolean docking; - gboolean docked; + EMailTab *tab; + gfloat position; + gfloat width; + gboolean docking; + gboolean docked; } EMailTabPickerProps; struct _EMailTabPickerPrivate { - GList *tabs; - gint n_tabs; - ClutterActor *chooser_button; - ClutterActor *close_button; - gint current_tab; - gboolean preview_mode; - gboolean drop_enabled; - gboolean in_drag; - gboolean drag_preview; - - gint width; - gint total_width; - gint max_offset; - gboolean docked_tabs; - - ClutterTimeline *scroll_timeline; - ClutterAlpha *scroll_alpha; - gint scroll_start; - gint scroll_end; - gint scroll_offset; - gboolean keep_current_visible; - MxAdjustment *scroll_adjustment; - ClutterActor *scroll_bar; - - ClutterTimeline *preview_timeline; - gfloat preview_progress; + GList *tabs; + gint n_tabs; + ClutterActor *chooser_button; + ClutterActor *close_button; + gint current_tab; + gboolean preview_mode; + gboolean drop_enabled; + gboolean in_drag; + gboolean drag_preview; + + gint width; + gint total_width; + gint max_offset; + gboolean docked_tabs; + + ClutterTimeline *scroll_timeline; + ClutterAlpha *scroll_alpha; + gint scroll_start; + gint scroll_end; + gint scroll_offset; + gboolean keep_current_visible; + MxAdjustment *scroll_adjustment; + ClutterActor *scroll_bar; + + ClutterTimeline *preview_timeline; + gfloat preview_progress; }; static void e_mail_tab_picker_over_in (MxDroppable *droppable, - MxDraggable *draggable) + MxDraggable *draggable) { } static void e_mail_tab_picker_over_out (MxDroppable *droppable, - MxDraggable *draggable) + MxDraggable *draggable) { } static void -e_mail_tab_picker_drop (MxDroppable *droppable, - MxDraggable *draggable, - gfloat event_x, - gfloat event_y, - gint button, - ClutterModifierType modifiers) +e_mail_tab_picker_drop (MxDroppable *droppable, + MxDraggable *draggable, + gfloat event_x, + gfloat event_y, + gint button, + ClutterModifierType modifiers) { - GList *t; - EMailTabPickerProps *tab; - gint current_position, new_position; - - EMailTabPicker *picker = E_MAIL_TAB_PICKER (droppable); - EMailTabPickerPrivate *priv = picker->priv; - - /* Make sure this is a valid drop */ - if (!priv->drop_enabled) - return; - - if (!E_MAIL_IS_TAB (draggable)) - return; - - if (clutter_actor_get_parent (CLUTTER_ACTOR (draggable)) != - (ClutterActor *)picker) - return; - - /* Get current position and property data structure */ - t = g_list_find_custom (priv->tabs, draggable, e_mail_tab_picker_find_tab_cb); - tab = (EMailTabPickerProps *)t->data; - if (!tab) - { - g_warning ("Tab that's parented to a picker not actually in picker"); - return; - } - current_position = g_list_position (priv->tabs, t); - - /* Work out new position */ - for (new_position = 0, t = priv->tabs; t; t = t->next) - { - EMailTabPickerProps *props = t->data; - - /* Ignore docked tabs */ - if (!props->docked) - { - /* If the tab is beyond the dragged tab and not draggable, - * we don't want to drag past it. - */ - if ((event_x >= props->position + priv->scroll_offset) && - (tab->position + tab->width <= props->position) && - !mx_draggable_is_enabled (MX_DRAGGABLE (props->tab))) - { - new_position--; - break; - } - - /* The same check for dragging left instead of right */ - if ((event_x < props->position + props->width + priv->scroll_offset)&& - (tab->position >= props->position) && - !mx_draggable_is_enabled (MX_DRAGGABLE (props->tab))) - break; - - /* If the tab-end position is after the drop position, - * break - we want to drop before here. - */ - if (props->position + props->width + priv->scroll_offset > event_x) - break; - } + GList *t; + EMailTabPickerProps *tab; + gint current_position, new_position; + + EMailTabPicker *picker = E_MAIL_TAB_PICKER (droppable); + EMailTabPickerPrivate *priv = picker->priv; + + /* Make sure this is a valid drop */ + if (!priv->drop_enabled) + return; - /* Increment the position */ - new_position++; - } + if (!E_MAIL_IS_TAB (draggable)) + return; - /* Re-order */ - e_mail_tab_picker_reorder (picker, current_position, new_position); + if (clutter_actor_get_parent (CLUTTER_ACTOR (draggable)) != (ClutterActor *)picker) + return; + + /* Get current position and property data structure */ + t = g_list_find_custom (priv->tabs, draggable, e_mail_tab_picker_find_tab_cb); + tab = (EMailTabPickerProps *)t->data; + if (!tab) { + g_warning ("Tab that's parented to a picker not actually in picker"); + return; + } + current_position = g_list_position (priv->tabs, t); + + /* Work out new position */ + for (new_position = 0, t = priv->tabs; t; t = t->next) { + EMailTabPickerProps *props = t->data; + + /* Ignore docked tabs */ + if (!props->docked) { + /* If the tab is beyond the dragged tab and not + * draggable, we don't want to drag past it. */ + if ((event_x >= props->position + priv->scroll_offset) && + (tab->position + tab->width <= props->position) && + !mx_draggable_is_enabled (MX_DRAGGABLE (props->tab))) { + new_position--; + break; + } + + /* The same check for dragging left instead of right */ + if ((event_x < props->position + props->width + priv->scroll_offset)&& + (tab->position >= props->position) && + !mx_draggable_is_enabled (MX_DRAGGABLE (props->tab))) + break; + + /* If the tab-end position is after the drop position, + * break - we want to drop before here. */ + if (props->position + props->width + priv->scroll_offset > event_x) + break; + } + + /* Increment the position */ + new_position++; + } + + /* Re-order */ + e_mail_tab_picker_reorder (picker, current_position, new_position); } static void mx_droppable_iface_init (MxDroppableIface *iface) { - iface->over_in = e_mail_tab_picker_over_in; - iface->over_out = e_mail_tab_picker_over_out; - iface->drop = e_mail_tab_picker_drop; + iface->over_in = e_mail_tab_picker_over_in; + iface->over_out = e_mail_tab_picker_over_out; + iface->drop = e_mail_tab_picker_drop; } static void -e_mail_tab_picker_get_property (GObject *object, guint property_id, - GValue *value, GParamSpec *pspec) +e_mail_tab_picker_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) { - EMailTabPicker *tab_picker = E_MAIL_TAB_PICKER (object); - EMailTabPickerPrivate *priv = tab_picker->priv; - - switch (property_id) - { - case PROP_PREVIEW_MODE: - g_value_set_boolean (value, e_mail_tab_picker_get_preview_mode (tab_picker)); - break; - - case PROP_DROP_ENABLED: - g_value_set_boolean (value, priv->drop_enabled); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - } + EMailTabPicker *tab_picker = E_MAIL_TAB_PICKER (object); + EMailTabPickerPrivate *priv = tab_picker->priv; + + switch (property_id) { + case PROP_PREVIEW_MODE: + g_value_set_boolean ( + value, e_mail_tab_picker_get_preview_mode ( + E_MAIL_TAB_PICKER (object))); + return; + + case PROP_DROP_ENABLED: + g_value_set_boolean (value, priv->drop_enabled); + return; + } + + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } static void -e_mail_tab_picker_set_property (GObject *object, guint property_id, - const GValue *value, GParamSpec *pspec) +e_mail_tab_picker_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) { - EMailTabPicker *tab_picker = E_MAIL_TAB_PICKER (object); - EMailTabPickerPrivate *priv = tab_picker->priv; - - switch (property_id) - { - case PROP_PREVIEW_MODE: - e_mail_tab_picker_set_preview_mode (tab_picker, g_value_get_boolean (value)); - break; - - case PROP_DROP_ENABLED: - priv->drop_enabled = g_value_get_boolean (value); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - } + EMailTabPicker *tab_picker = E_MAIL_TAB_PICKER (object); + EMailTabPickerPrivate *priv = tab_picker->priv; + + switch (property_id) { + case PROP_PREVIEW_MODE: + e_mail_tab_picker_set_preview_mode ( + E_MAIL_TAB_PICKER (object), + g_value_get_boolean (value)); + return; + + case PROP_DROP_ENABLED: + priv->drop_enabled = g_value_get_boolean (value); + return; + } + + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } static void e_mail_tab_picker_dispose (GObject *object) { - EMailTabPicker *picker = E_MAIL_TAB_PICKER (object); - EMailTabPickerPrivate *priv = picker->priv; - - if (priv->scroll_bar) - { - clutter_actor_unparent (CLUTTER_ACTOR (priv->scroll_bar)); - priv->scroll_bar = NULL; - } - - if (priv->scroll_timeline) - { - clutter_timeline_stop (priv->scroll_timeline); - g_object_unref (priv->scroll_alpha); - g_object_unref (priv->scroll_timeline); - priv->scroll_timeline = NULL; - priv->scroll_alpha = NULL; - } - - if (priv->preview_timeline) - { - clutter_timeline_stop (priv->preview_timeline); - g_object_unref (priv->preview_timeline); - priv->preview_timeline = NULL; - } - - if (priv->chooser_button) - { - clutter_actor_unparent (CLUTTER_ACTOR (priv->chooser_button)); - priv->chooser_button = NULL; - } - - if (priv->close_button) - { - clutter_actor_unparent (CLUTTER_ACTOR (priv->close_button)); - priv->close_button = NULL; - } - - while (priv->tabs) - { - EMailTabPickerProps *props = priv->tabs->data; - e_mail_tab_picker_remove_tab (picker, props->tab); - } - - G_OBJECT_CLASS (e_mail_tab_picker_parent_class)->dispose (object); -} + EMailTabPicker *picker = E_MAIL_TAB_PICKER (object); + EMailTabPickerPrivate *priv = picker->priv; -static void -e_mail_tab_picker_finalize (GObject *object) -{ - G_OBJECT_CLASS (e_mail_tab_picker_parent_class)->finalize (object); + if (priv->scroll_bar) { + clutter_actor_unparent (CLUTTER_ACTOR (priv->scroll_bar)); + priv->scroll_bar = NULL; + } + + if (priv->scroll_timeline) { + clutter_timeline_stop (priv->scroll_timeline); + g_object_unref (priv->scroll_alpha); + g_object_unref (priv->scroll_timeline); + priv->scroll_timeline = NULL; + priv->scroll_alpha = NULL; + } + + if (priv->preview_timeline) { + clutter_timeline_stop (priv->preview_timeline); + g_object_unref (priv->preview_timeline); + priv->preview_timeline = NULL; + } + + if (priv->chooser_button) { + clutter_actor_unparent (CLUTTER_ACTOR (priv->chooser_button)); + priv->chooser_button = NULL; + } + + if (priv->close_button) { + clutter_actor_unparent (CLUTTER_ACTOR (priv->close_button)); + priv->close_button = NULL; + } + + while (priv->tabs) { + EMailTabPickerProps *props = priv->tabs->data; + e_mail_tab_picker_remove_tab (picker, props->tab); + } + + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (e_mail_tab_picker_parent_class)->dispose (object); } static void e_mail_tab_picker_paint (ClutterActor *actor) { - GList *t; - gfloat width, height, offset; + GList *t; + gfloat width, height, offset; - EMailTabPickerPrivate *priv = E_MAIL_TAB_PICKER (actor)->priv; + EMailTabPickerPrivate *priv = E_MAIL_TAB_PICKER (actor)->priv; - CLUTTER_ACTOR_CLASS (e_mail_tab_picker_parent_class)->paint (actor); + CLUTTER_ACTOR_CLASS (e_mail_tab_picker_parent_class)->paint (actor); - clutter_actor_get_size (actor, &width, &height); + clutter_actor_get_size (actor, &width, &height); - cogl_clip_push_rectangle (0, 0, width, height); + cogl_clip_push_rectangle (0, 0, width, height); - offset = priv->scroll_offset; - cogl_translate (-priv->scroll_offset, 0, 0); + offset = priv->scroll_offset; + cogl_translate (-priv->scroll_offset, 0, 0); - /* Draw normal tabs */ - for (t = priv->tabs; t; t = t->next) - { - EMailTabPickerProps *props = t->data; + /* Draw normal tabs */ + for (t = priv->tabs; t; t = t->next) { + EMailTabPickerProps *props = t->data; - if (props->docked) - continue; - if (props->position + props->width < offset) - continue; - if (props->position > width + offset) - break; + if (props->docked) + continue; + if (props->position + props->width < offset) + continue; + if (props->position > width + offset) + break; - if (CLUTTER_ACTOR_IS_MAPPED (props->tab)) - clutter_actor_paint (CLUTTER_ACTOR (props->tab)); - } + if (CLUTTER_ACTOR_IS_MAPPED (props->tab)) + clutter_actor_paint (CLUTTER_ACTOR (props->tab)); + } - cogl_translate (priv->scroll_offset, 0, 0); + cogl_translate (priv->scroll_offset, 0, 0); - /* Draw docked tabs */ - if (priv->docked_tabs) - { - for (t = priv->tabs; t; t = t->next) - { - EMailTabPickerProps *props = t->data; + /* Draw docked tabs */ + if (priv->docked_tabs) { + for (t = priv->tabs; t; t = t->next) { + EMailTabPickerProps *props = t->data; - if (!props->docked) - continue; + if (!props->docked) + continue; - if (CLUTTER_ACTOR_IS_MAPPED (props->tab)) - clutter_actor_paint (CLUTTER_ACTOR (props->tab)); + if (CLUTTER_ACTOR_IS_MAPPED (props->tab)) + clutter_actor_paint (CLUTTER_ACTOR (props->tab)); + } } - } - - cogl_clip_pop (); - - /* Draw tab chooser button */ - if (CLUTTER_ACTOR_IS_MAPPED (priv->chooser_button)) - clutter_actor_paint (CLUTTER_ACTOR (priv->chooser_button)); - - /* Draw scrollbar */ - if (CLUTTER_ACTOR_IS_MAPPED (priv->scroll_bar)) - { - gfloat height; - clutter_actor_get_preferred_height (CLUTTER_ACTOR (priv->close_button), - -1, NULL, &height); - height *= priv->preview_progress; - if (height >= 1.0) - { - cogl_clip_push_rectangle (0, 0, width, height); - if (CLUTTER_ACTOR_IS_MAPPED (priv->close_button)) - clutter_actor_paint (CLUTTER_ACTOR (priv->close_button)); - clutter_actor_paint (CLUTTER_ACTOR (priv->scroll_bar)); - cogl_clip_pop (); + + cogl_clip_pop (); + + /* Draw tab chooser button */ + if (CLUTTER_ACTOR_IS_MAPPED (priv->chooser_button)) + clutter_actor_paint (CLUTTER_ACTOR (priv->chooser_button)); + + /* Draw scrollbar */ + if (CLUTTER_ACTOR_IS_MAPPED (priv->scroll_bar)) { + gfloat height; + clutter_actor_get_preferred_height ( + CLUTTER_ACTOR (priv->close_button), + -1, NULL, &height); + height *= priv->preview_progress; + if (height >= 1.0) { + cogl_clip_push_rectangle (0, 0, width, height); + if (CLUTTER_ACTOR_IS_MAPPED (priv->close_button)) + clutter_actor_paint (CLUTTER_ACTOR (priv->close_button)); + clutter_actor_paint (CLUTTER_ACTOR (priv->scroll_bar)); + cogl_clip_pop (); + } } - } } static void -e_mail_tab_picker_pick (ClutterActor *actor, - const ClutterColor *color) +e_mail_tab_picker_pick (ClutterActor *actor, + const ClutterColor *color) { - EMailTabPickerPrivate *priv = E_MAIL_TAB_PICKER (actor)->priv; + EMailTabPickerPrivate *priv = E_MAIL_TAB_PICKER (actor)->priv; - /* Chain up to paint background */ - CLUTTER_ACTOR_CLASS (e_mail_tab_picker_parent_class)->pick (actor, color); + /* Chain up to paint background */ + CLUTTER_ACTOR_CLASS (e_mail_tab_picker_parent_class)->pick (actor, color); - if (!priv->in_drag) - e_mail_tab_picker_paint (actor); + if (!priv->in_drag) + e_mail_tab_picker_paint (actor); } static void e_mail_tab_picker_get_preferred_width (ClutterActor *actor, - gfloat for_height, - gfloat *min_width_p, - gfloat *natural_width_p) + gfloat for_height, + gfloat *min_width_p, + gfloat *natural_width_p) { - GList *t; - MxPadding padding; + GList *t; + MxPadding padding; - EMailTabPickerPrivate *priv = E_MAIL_TAB_PICKER (actor)->priv; + EMailTabPickerPrivate *priv = E_MAIL_TAB_PICKER (actor)->priv; - clutter_actor_get_preferred_width (CLUTTER_ACTOR (priv->chooser_button), - for_height, min_width_p, natural_width_p); + clutter_actor_get_preferred_width ( + CLUTTER_ACTOR (priv->chooser_button), + for_height, min_width_p, natural_width_p); - mx_widget_get_padding (MX_WIDGET (actor), &padding); - if (min_width_p) - *min_width_p += padding.left + padding.right; - if (natural_width_p) - *natural_width_p += padding.left + padding.right; + mx_widget_get_padding (MX_WIDGET (actor), &padding); + if (min_width_p) + *min_width_p += padding.left + padding.right; + if (natural_width_p) + *natural_width_p += padding.left + padding.right; - for (t = priv->tabs; t; t = t->next) - { - gfloat min_width, natural_width; + for (t = priv->tabs; t; t = t->next) { + gfloat min_width, natural_width; + EMailTabPickerProps *props = t->data; - EMailTabPickerProps *props = t->data; + clutter_actor_get_preferred_width ( + CLUTTER_ACTOR (props->tab), for_height, + &min_width, &natural_width); - clutter_actor_get_preferred_width (CLUTTER_ACTOR (props->tab), for_height, - &min_width, &natural_width); - - if (min_width_p && !t->prev) - *min_width_p += min_width; - if (natural_width_p) - *natural_width_p += natural_width; - } + if (min_width_p && !t->prev) + *min_width_p += min_width; + if (natural_width_p) + *natural_width_p += natural_width; + } } void e_mail_tab_picker_get_preferred_height (EMailTabPicker *tab_picker, - gfloat for_width, - gfloat *min_height_p, - gfloat *natural_height_p, - gboolean with_previews) + gfloat for_width, + gfloat *min_height_p, + gfloat *natural_height_p, + gboolean with_previews) { - MxPadding padding; - - ClutterActor *actor = CLUTTER_ACTOR (tab_picker); - EMailTabPickerPrivate *priv = tab_picker->priv; - - clutter_actor_get_preferred_height (CLUTTER_ACTOR (priv->chooser_button), - for_width, min_height_p, natural_height_p); - - if (priv->tabs) - { - gfloat min_height, natural_height, scroll_height; - - EMailTabPickerProps *props = priv->tabs->data; - - /* Get the height of the first tab - it's assumed that tabs are - * fixed height. - */ - if (with_previews) - { - clutter_actor_get_preferred_height (CLUTTER_ACTOR (props->tab), - for_width, - &min_height, - &natural_height); - if (CLUTTER_ACTOR_IS_VISIBLE (priv->scroll_bar)) - { - /* Add the height of the scrollbar-section */ - clutter_actor_get_preferred_height ( - CLUTTER_ACTOR (priv->close_button), -1, NULL, &scroll_height); - scroll_height *= priv->preview_progress; - - min_height += scroll_height; - natural_height += scroll_height; - } + MxPadding padding; + + ClutterActor *actor = CLUTTER_ACTOR (tab_picker); + EMailTabPickerPrivate *priv = tab_picker->priv; + + clutter_actor_get_preferred_height ( + CLUTTER_ACTOR (priv->chooser_button), + for_width, min_height_p, natural_height_p); + + if (priv->tabs) { + gfloat min_height, natural_height, scroll_height; + EMailTabPickerProps *props = priv->tabs->data; + + /* Get the height of the first tab - it's assumed that + * tabs are fixed height. */ + if (with_previews) { + clutter_actor_get_preferred_height ( + CLUTTER_ACTOR (props->tab), + for_width, &min_height, + &natural_height); + + if (CLUTTER_ACTOR_IS_VISIBLE (priv->scroll_bar)) { + /* Add the height of the scrollbar-section */ + clutter_actor_get_preferred_height ( + CLUTTER_ACTOR (priv->close_button), + -1, NULL, &scroll_height); + scroll_height *= priv->preview_progress; + + min_height += scroll_height; + natural_height += scroll_height; + } + } else + e_mail_tab_get_height_no_preview ( + props->tab, for_width, + &min_height, &natural_height); + + if (min_height_p && (*min_height_p < min_height)) + *min_height_p = min_height; + if (natural_height_p && (*natural_height_p < natural_height)) + *natural_height_p = natural_height; } - else - e_mail_tab_get_height_no_preview (props->tab, for_width, - &min_height, &natural_height); - - if (min_height_p && (*min_height_p < min_height)) - *min_height_p = min_height; - if (natural_height_p && (*natural_height_p < natural_height)) - *natural_height_p = natural_height; - } - - mx_widget_get_padding (MX_WIDGET (actor), &padding); - if (min_height_p) - *min_height_p += padding.top + padding.bottom; - if (natural_height_p) - *natural_height_p += padding.top + padding.bottom; + + mx_widget_get_padding (MX_WIDGET (actor), &padding); + if (min_height_p) + *min_height_p += padding.top + padding.bottom; + if (natural_height_p) + *natural_height_p += padding.top + padding.bottom; } static void _e_mail_tab_picker_get_preferred_height (ClutterActor *actor, - gfloat for_width, - gfloat *min_height_p, - gfloat *natural_height_p) + gfloat for_width, + gfloat *min_height_p, + gfloat *natural_height_p) { - e_mail_tab_picker_get_preferred_height (E_MAIL_TAB_PICKER (actor), for_width, - min_height_p, natural_height_p, TRUE); + e_mail_tab_picker_get_preferred_height ( + E_MAIL_TAB_PICKER (actor), for_width, + min_height_p, natural_height_p, TRUE); } static void -e_mail_tab_picker_allocate_docked (EMailTabPicker *tab_picker, - const ClutterActorBox *picker_box_p, - const ClutterActorBox *chooser_box_p, - ClutterAllocationFlags flags) +e_mail_tab_picker_allocate_docked (EMailTabPicker *tab_picker, + const ClutterActorBox *picker_box_p, + const ClutterActorBox *chooser_box_p, + ClutterAllocationFlags flags) { - GList *t; - MxPadding padding; - ClutterActorBox picker_box, chooser_box, child_box; - gfloat offset, width, left, right, height; - - EMailTabPickerPrivate *priv = tab_picker->priv; - - if (!picker_box_p) - { - clutter_actor_get_allocation_box (CLUTTER_ACTOR (tab_picker), - &picker_box); - picker_box_p = &picker_box; - } - if (!chooser_box_p) - { - clutter_actor_get_allocation_box (CLUTTER_ACTOR (priv->chooser_button), - &chooser_box); - chooser_box_p = &chooser_box; - } - - mx_widget_get_padding (MX_WIDGET (tab_picker), &padding); - - /* Calculate available width and height */ - width = picker_box_p->x2 - picker_box_p->x1 - padding.right; - - e_mail_tab_picker_get_preferred_height (tab_picker, -1, NULL, &height, FALSE); - child_box.y2 = picker_box_p->y2 - picker_box_p->y1 - padding.bottom; - child_box.y1 = child_box.y2 - height; - - /* Don't dock over the chooser button */ - width -= chooser_box_p->x2 - chooser_box_p->x1; - - offset = priv->scroll_offset; - - left = 0; - right = width; - priv->docked_tabs = FALSE; - - for (t = g_list_last (priv->tabs); t; t = t->prev) - { - EMailTabPickerProps *props = t->data; - - props->docked = FALSE; - - if (!props->docking) - continue; - - if (props->position < offset) - { - /* Dock left */ - priv->docked_tabs = TRUE; - props->docked = TRUE; - child_box.x1 = left; - child_box.x2 = child_box.x1 + props->width; - left += props->width; - } - else if (props->position + props->width > width + offset) - { - /* Dock right */ - priv->docked_tabs = TRUE; - props->docked = TRUE; - child_box.x2 = right; - child_box.x1 = child_box.x2 - props->width; - right -= props->width; + GList *t; + MxPadding padding; + ClutterActorBox picker_box, chooser_box, child_box; + gfloat offset, width, left, right, height; + + EMailTabPickerPrivate *priv = tab_picker->priv; + + if (!picker_box_p) { + clutter_actor_get_allocation_box ( + CLUTTER_ACTOR (tab_picker), &picker_box); + picker_box_p = &picker_box; } - else - { - child_box.x1 = props->position; - child_box.x2 = child_box.x1 + props->width; + + if (!chooser_box_p) { + clutter_actor_get_allocation_box ( + CLUTTER_ACTOR (priv->chooser_button), &chooser_box); + chooser_box_p = &chooser_box; } - clutter_actor_allocate (CLUTTER_ACTOR (props->tab), &child_box, flags); - } + mx_widget_get_padding (MX_WIDGET (tab_picker), &padding); + + /* Calculate available width and height */ + width = picker_box_p->x2 - picker_box_p->x1 - padding.right; + + e_mail_tab_picker_get_preferred_height ( + tab_picker, -1, NULL, &height, FALSE); + child_box.y2 = picker_box_p->y2 - picker_box_p->y1 - padding.bottom; + child_box.y1 = child_box.y2 - height; + + /* Don't dock over the chooser button */ + width -= chooser_box_p->x2 - chooser_box_p->x1; + + offset = priv->scroll_offset; + + left = 0; + right = width; + priv->docked_tabs = FALSE; + + for (t = g_list_last (priv->tabs); t; t = t->prev) { + EMailTabPickerProps *props = t->data; + + props->docked = FALSE; + + if (!props->docking) + continue; + + if (props->position < offset) { + /* Dock left */ + priv->docked_tabs = TRUE; + props->docked = TRUE; + child_box.x1 = left; + child_box.x2 = child_box.x1 + props->width; + left += props->width; + } else if (props->position + props->width > width + offset) { + /* Dock right */ + priv->docked_tabs = TRUE; + props->docked = TRUE; + child_box.x2 = right; + child_box.x1 = child_box.x2 - props->width; + right -= props->width; + } else { + child_box.x1 = props->position; + child_box.x2 = child_box.x1 + props->width; + } + + clutter_actor_allocate ( + CLUTTER_ACTOR (props->tab), &child_box, flags); + } } static void e_mail_tab_picker_scroll_new_frame_cb (ClutterTimeline *timeline, - guint msecs, - EMailTabPicker *tab_picker) + guint msecs, + EMailTabPicker *tab_picker) { - EMailTabPickerPrivate *priv = tab_picker->priv; - gdouble alpha = clutter_alpha_get_alpha (priv->scroll_alpha); - - priv->scroll_offset = (priv->scroll_start * (1.0 - alpha)) + - (priv->scroll_end * alpha); - mx_adjustment_set_value (priv->scroll_adjustment, priv->scroll_offset); - e_mail_tab_picker_allocate_docked (tab_picker, NULL, NULL, 0); - clutter_actor_queue_redraw (CLUTTER_ACTOR (tab_picker)); + EMailTabPickerPrivate *priv = tab_picker->priv; + gdouble alpha = clutter_alpha_get_alpha (priv->scroll_alpha); + + priv->scroll_offset = + (priv->scroll_start * (1.0 - alpha)) + + (priv->scroll_end * alpha); + mx_adjustment_set_value (priv->scroll_adjustment, priv->scroll_offset); + e_mail_tab_picker_allocate_docked (tab_picker, NULL, NULL, 0); + clutter_actor_queue_redraw (CLUTTER_ACTOR (tab_picker)); } static void e_mail_tab_picker_scroll_completed_cb (ClutterTimeline *timeline, - EMailTabPicker *tab_picker) + EMailTabPicker *tab_picker) { - EMailTabPickerPrivate *priv = tab_picker->priv; + EMailTabPickerPrivate *priv = tab_picker->priv; - priv->scroll_offset = priv->scroll_end; - mx_adjustment_set_value (priv->scroll_adjustment, priv->scroll_offset); - e_mail_tab_picker_allocate_docked (tab_picker, NULL, NULL, 0); - clutter_actor_queue_redraw (CLUTTER_ACTOR (tab_picker)); + priv->scroll_offset = priv->scroll_end; + mx_adjustment_set_value (priv->scroll_adjustment, priv->scroll_offset); + e_mail_tab_picker_allocate_docked (tab_picker, NULL, NULL, 0); + clutter_actor_queue_redraw (CLUTTER_ACTOR (tab_picker)); - g_object_unref (priv->scroll_alpha); - g_object_unref (priv->scroll_timeline); - priv->scroll_alpha = NULL; - priv->scroll_timeline = NULL; + g_object_unref (priv->scroll_alpha); + g_object_unref (priv->scroll_timeline); + priv->scroll_alpha = NULL; + priv->scroll_timeline = NULL; } static void e_mail_tab_picker_scroll_to (EMailTabPicker *tab_picker, - gint destination, - guint duration) + gint destination, + guint duration) { - EMailTabPickerPrivate *priv = tab_picker->priv; - - priv->scroll_start = priv->scroll_offset; - priv->scroll_end = CLAMP (destination, 0, priv->max_offset); - - if (priv->scroll_timeline) - { - clutter_timeline_stop (priv->scroll_timeline); - clutter_timeline_rewind (priv->scroll_timeline); - clutter_timeline_set_duration (priv->scroll_timeline, duration); - } - else - { - if (priv->scroll_end == priv->scroll_offset) - return; - - priv->scroll_timeline = clutter_timeline_new (duration); - priv->scroll_alpha = clutter_alpha_new_full (priv->scroll_timeline, - CLUTTER_EASE_OUT_QUAD); - g_signal_connect (priv->scroll_timeline, "new_frame", + EMailTabPickerPrivate *priv = tab_picker->priv; + + priv->scroll_start = priv->scroll_offset; + priv->scroll_end = CLAMP (destination, 0, priv->max_offset); + + if (priv->scroll_timeline) { + clutter_timeline_stop (priv->scroll_timeline); + clutter_timeline_rewind (priv->scroll_timeline); + clutter_timeline_set_duration (priv->scroll_timeline, duration); + } else { + if (priv->scroll_end == priv->scroll_offset) + return; + + priv->scroll_timeline = clutter_timeline_new (duration); + priv->scroll_alpha = clutter_alpha_new_full ( + priv->scroll_timeline, CLUTTER_EASE_OUT_QUAD); + g_signal_connect ( + priv->scroll_timeline, "new_frame", G_CALLBACK (e_mail_tab_picker_scroll_new_frame_cb), tab_picker); - g_signal_connect (priv->scroll_timeline, "completed", + g_signal_connect ( + priv->scroll_timeline, "completed", G_CALLBACK (e_mail_tab_picker_scroll_completed_cb), tab_picker); - } + } - clutter_timeline_start (priv->scroll_timeline); + clutter_timeline_start (priv->scroll_timeline); } static void -e_mail_tab_picker_allocate (ClutterActor *actor, - const ClutterActorBox *box, - ClutterAllocationFlags flags) +e_mail_tab_picker_allocate (ClutterActor *actor, + const ClutterActorBox *box, + ClutterAllocationFlags flags) { - GList *t; - MxPadding padding; - gint old_max_offset, old_scroll_offset; - ClutterActorBox child_box, scroll_box; - gfloat width, total_width, height; - - EMailTabPicker *tab_picker = E_MAIL_TAB_PICKER (actor); - EMailTabPickerPrivate *priv = tab_picker->priv; - - mx_widget_get_padding (MX_WIDGET (actor), &padding); - - /* Allocate for scroll-bar and close button */ - clutter_actor_get_preferred_size (CLUTTER_ACTOR (priv->close_button), - NULL, NULL, &width, &height); - child_box.x1 = 0; - child_box.x2 = box->x2 - box->x1 - padding.right; - child_box.y1 = 0; - child_box.y2 = child_box.y1 + height; - clutter_actor_allocate (CLUTTER_ACTOR (priv->close_button), - &child_box, - flags); - - /* FIXME: Make this a property */ -#define SPACING 4.0 - /* Work out allocation for scroll-bar, but allocate it later */ - scroll_box = child_box; - scroll_box.x2 -= width + SPACING; - scroll_box.x1 += SPACING; - scroll_box.y1 += SPACING; - scroll_box.y2 -= SPACING; - - child_box.y1 += (height * priv->preview_progress) + padding.top; - - /* Allocate for tabs */ - total_width = 0; - child_box.x1 = padding.left; - e_mail_tab_picker_get_preferred_height (tab_picker, -1, NULL, &height, FALSE); - for (t = priv->tabs; t; t = t->next) - { - EMailTabPickerProps *props = t->data; - ClutterActor *actor = CLUTTER_ACTOR (props->tab); - - clutter_actor_get_preferred_width (actor, child_box.y2, NULL, &width); - - /* Fill out data - note it's ok to fill out docking here as when it - * changes, the tab queues a relayout. - */ - props->docking = e_mail_tab_get_docking (props->tab); - props->position = child_box.x1; - props->width = width; - - total_width += width; - - /* Don't stretch tabs without a preview to fit tabs with a preview */ - if (e_mail_tab_get_preview_actor (props->tab)) - child_box.y2 = box->y2 - box->y1 - padding.bottom; - else + GList *t; + MxPadding padding; + gint old_max_offset, old_scroll_offset; + ClutterActorBox child_box, scroll_box; + gfloat width, total_width, height; + + EMailTabPicker *tab_picker = E_MAIL_TAB_PICKER (actor); + EMailTabPickerPrivate *priv = tab_picker->priv; + + mx_widget_get_padding (MX_WIDGET (actor), &padding); + + /* Allocate for scroll-bar and close button */ + clutter_actor_get_preferred_size ( + CLUTTER_ACTOR (priv->close_button), + NULL, NULL, &width, &height); + child_box.x1 = 0; + child_box.x2 = box->x2 - box->x1 - padding.right; + child_box.y1 = 0; child_box.y2 = child_box.y1 + height; + clutter_actor_allocate ( + CLUTTER_ACTOR (priv->close_button), &child_box, flags); - child_box.x2 = child_box.x1 + width; - clutter_actor_allocate (actor, &child_box, flags); - - child_box.x1 = child_box.x2; - } - - /* Allocate for the chooser button */ - clutter_actor_get_preferred_width (CLUTTER_ACTOR (priv->chooser_button), - box->y2 - box->y1, NULL, &width); - - child_box.x2 = box->x2 - box->x1 - padding.right; - child_box.x1 = child_box.x2 - width; - child_box.y1 = 0; - child_box.y2 = child_box.y1 + height; - clutter_actor_allocate (CLUTTER_ACTOR (priv->chooser_button), - &child_box, flags); - - /* Cache some useful size values */ - priv->width = (gint)(box->x2 - box->x1); - - priv->total_width = (gint)(total_width + padding.left + padding.right); - - old_max_offset = priv->max_offset; - priv->max_offset = priv->total_width - priv->width + - (gint)(child_box.x2 - child_box.x1); - if (priv->max_offset < 0) - priv->max_offset = 0; - - /* Allocate for tab picker */ - old_scroll_offset = priv->scroll_offset; - priv->scroll_offset = CLAMP (priv->scroll_offset, 0, priv->max_offset); - e_mail_tab_picker_allocate_docked (tab_picker, box, &child_box, flags); + /* FIXME: Make this a property */ +#define SPACING 4.0 + /* Work out allocation for scroll-bar, but allocate it later */ + scroll_box = child_box; + scroll_box.x2 -= width + SPACING; + scroll_box.x1 += SPACING; + scroll_box.y1 += SPACING; + scroll_box.y2 -= SPACING; + + child_box.y1 += (height * priv->preview_progress) + padding.top; + + /* Allocate for tabs */ + total_width = 0; + child_box.x1 = padding.left; + e_mail_tab_picker_get_preferred_height ( + tab_picker, -1, NULL, &height, FALSE); + for (t = priv->tabs; t; t = t->next) { + EMailTabPickerProps *props = t->data; + ClutterActor *actor = CLUTTER_ACTOR (props->tab); + + clutter_actor_get_preferred_width ( + actor, child_box.y2, NULL, &width); + + /* Fill out data - note it's ok to fill out docking here + * as when it changes, the tab queues a relayout. */ + props->docking = e_mail_tab_get_docking (props->tab); + props->position = child_box.x1; + props->width = width; + + total_width += width; + + /* Don't stretch tabs without a preview to fit tabs + * with a preview. */ + if (e_mail_tab_get_preview_actor (props->tab)) + child_box.y2 = box->y2 - box->y1 - padding.bottom; + else + child_box.y2 = child_box.y1 + height; + + child_box.x2 = child_box.x1 + width; + clutter_actor_allocate (actor, &child_box, flags); + + child_box.x1 = child_box.x2; + } - /* Chain up (store box) */ - CLUTTER_ACTOR_CLASS (e_mail_tab_picker_parent_class)-> - allocate (actor, box, flags); + /* Allocate for the chooser button */ + clutter_actor_get_preferred_width ( + CLUTTER_ACTOR (priv->chooser_button), + box->y2 - box->y1, NULL, &width); - /* Sync up the scroll-bar properties */ - g_object_set (G_OBJECT (priv->scroll_adjustment), - "page-increment", (gdouble)(box->x2 - box->x1), - "page-size", (gdouble)(box->x2 - box->x1), - "upper", (gdouble)total_width, + child_box.x2 = box->x2 - box->x1 - padding.right; + child_box.x1 = child_box.x2 - width; + child_box.y1 = 0; + child_box.y2 = child_box.y1 + height; + clutter_actor_allocate ( + CLUTTER_ACTOR (priv->chooser_button), &child_box, flags); + + /* Cache some useful size values */ + priv->width = (gint)(box->x2 - box->x1); + + priv->total_width = (gint)(total_width + padding.left + padding.right); + + old_max_offset = priv->max_offset; + priv->max_offset = + priv->total_width - priv->width + + (gint) (child_box.x2 - child_box.x1); + if (priv->max_offset < 0) + priv->max_offset = 0; + + /* Allocate for tab picker */ + old_scroll_offset = priv->scroll_offset; + priv->scroll_offset = CLAMP (priv->scroll_offset, 0, priv->max_offset); + e_mail_tab_picker_allocate_docked (tab_picker, box, &child_box, flags); + + /* Chain up (store box) */ + CLUTTER_ACTOR_CLASS (e_mail_tab_picker_parent_class)-> + allocate (actor, box, flags); + + /* Sync up the scroll-bar properties */ + g_object_set ( + priv->scroll_adjustment, + "page-increment", (gdouble)(box->x2 - box->x1), + "page-size", (gdouble)(box->x2 - box->x1), + "upper", (gdouble)total_width, NULL); - if ((priv->max_offset != old_max_offset) || - (priv->scroll_offset != old_scroll_offset)) - mx_adjustment_set_value (priv->scroll_adjustment, - (gdouble)priv->scroll_offset); + if ((priv->max_offset != old_max_offset) || + (priv->scroll_offset != old_scroll_offset)) + mx_adjustment_set_value ( + priv->scroll_adjustment, + (gdouble)priv->scroll_offset); + + /* Allocate for scroll-bar */ + clutter_actor_allocate ( + CLUTTER_ACTOR (priv->scroll_bar), &scroll_box, flags); - /* Allocate for scroll-bar */ - clutter_actor_allocate (CLUTTER_ACTOR (priv->scroll_bar), &scroll_box, flags); + /* Keep current tab visible */ + if (priv->keep_current_visible) { + EMailTabPickerProps *current; - /* Keep current tab visible */ - if (priv->keep_current_visible) - { - EMailTabPickerProps *current = - g_list_nth_data (priv->tabs, priv->current_tab); + current = g_list_nth_data (priv->tabs, priv->current_tab); - if ((current->position < priv->scroll_offset) || - (current->position + current->width >= priv->max_offset)) - e_mail_tab_picker_scroll_to (tab_picker, current->position, 150); - } + if ((current->position < priv->scroll_offset) || + (current->position + current->width >= priv->max_offset)) + e_mail_tab_picker_scroll_to ( + tab_picker, current->position, 150); + } } static void e_mail_tab_picker_map (ClutterActor *actor) { - GList *t; - EMailTabPickerPrivate *priv = E_MAIL_TAB_PICKER (actor)->priv; + GList *t; + EMailTabPickerPrivate *priv = E_MAIL_TAB_PICKER (actor)->priv; - CLUTTER_ACTOR_CLASS (e_mail_tab_picker_parent_class)->map (actor); + CLUTTER_ACTOR_CLASS (e_mail_tab_picker_parent_class)->map (actor); - clutter_actor_map (CLUTTER_ACTOR (priv->chooser_button)); - clutter_actor_map (CLUTTER_ACTOR (priv->close_button)); - clutter_actor_map (CLUTTER_ACTOR (priv->scroll_bar)); + clutter_actor_map (CLUTTER_ACTOR (priv->chooser_button)); + clutter_actor_map (CLUTTER_ACTOR (priv->close_button)); + clutter_actor_map (CLUTTER_ACTOR (priv->scroll_bar)); - for (t = priv->tabs; t; t = t->next) - { - EMailTabPickerProps *props = t->data; - clutter_actor_map (CLUTTER_ACTOR (props->tab)); - } + for (t = priv->tabs; t; t = t->next) { + EMailTabPickerProps *props = t->data; + clutter_actor_map (CLUTTER_ACTOR (props->tab)); + } } static void e_mail_tab_picker_unmap (ClutterActor *actor) { - GList *t; - EMailTabPickerPrivate *priv = E_MAIL_TAB_PICKER (actor)->priv; + GList *t; + EMailTabPickerPrivate *priv = E_MAIL_TAB_PICKER (actor)->priv; - CLUTTER_ACTOR_CLASS (e_mail_tab_picker_parent_class)->unmap (actor); + CLUTTER_ACTOR_CLASS (e_mail_tab_picker_parent_class)->unmap (actor); - clutter_actor_unmap (CLUTTER_ACTOR (priv->chooser_button)); - clutter_actor_unmap (CLUTTER_ACTOR (priv->close_button)); - clutter_actor_unmap (CLUTTER_ACTOR (priv->scroll_bar)); + clutter_actor_unmap (CLUTTER_ACTOR (priv->chooser_button)); + clutter_actor_unmap (CLUTTER_ACTOR (priv->close_button)); + clutter_actor_unmap (CLUTTER_ACTOR (priv->scroll_bar)); - for (t = priv->tabs; t; t = t->next) - { - EMailTabPickerProps *props = t->data; - clutter_actor_unmap (CLUTTER_ACTOR (props->tab)); - } + for (t = priv->tabs; t; t = t->next) { + EMailTabPickerProps *props = t->data; + clutter_actor_unmap (CLUTTER_ACTOR (props->tab)); + } } static void -e_mail_tab_picker_class_init (EMailTabPickerClass *klass) +e_mail_tab_picker_class_init (EMailTabPickerClass *class) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass); - - g_type_class_add_private (klass, sizeof (EMailTabPickerPrivate)); - - object_class->get_property = e_mail_tab_picker_get_property; - object_class->set_property = e_mail_tab_picker_set_property; - object_class->dispose = e_mail_tab_picker_dispose; - object_class->finalize = e_mail_tab_picker_finalize; - - actor_class->paint = e_mail_tab_picker_paint; - actor_class->pick = e_mail_tab_picker_pick; - actor_class->get_preferred_width = e_mail_tab_picker_get_preferred_width; - actor_class->get_preferred_height = _e_mail_tab_picker_get_preferred_height; - actor_class->allocate = e_mail_tab_picker_allocate; - actor_class->map = e_mail_tab_picker_map; - actor_class->unmap = e_mail_tab_picker_unmap; - - g_object_class_install_property (object_class, - PROP_PREVIEW_MODE, - g_param_spec_boolean ("preview-mode", - "Preview mode", - "Whether to display " - "in preview mode.", - FALSE, - G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); - - g_object_class_override_property (object_class, - PROP_DROP_ENABLED, - "drop-enabled"); - - signals[TAB_ACTIVATED] = - g_signal_new ("tab-activated", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EMailTabPickerClass, tab_activated), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, E_MAIL_TYPE_TAB); - - signals[CHOOSER_CLICKED] = - g_signal_new ("chooser-clicked", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EMailTabPickerClass, chooser_clicked), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + GObjectClass *object_class = G_OBJECT_CLASS (class); + ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (class); + + g_type_class_add_private (class, sizeof (EMailTabPickerPrivate)); + + object_class->get_property = e_mail_tab_picker_get_property; + object_class->set_property = e_mail_tab_picker_set_property; + object_class->dispose = e_mail_tab_picker_dispose; + + actor_class->paint = e_mail_tab_picker_paint; + actor_class->pick = e_mail_tab_picker_pick; + actor_class->get_preferred_width = e_mail_tab_picker_get_preferred_width; + actor_class->get_preferred_height = _e_mail_tab_picker_get_preferred_height; + actor_class->allocate = e_mail_tab_picker_allocate; + actor_class->map = e_mail_tab_picker_map; + actor_class->unmap = e_mail_tab_picker_unmap; + + g_object_class_install_property ( + object_class, + PROP_PREVIEW_MODE, + g_param_spec_boolean ( + "preview-mode", + "Preview mode", + "Whether to display " + "in preview mode.", + FALSE, + G_PARAM_READWRITE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + g_object_class_override_property ( + object_class, + PROP_DROP_ENABLED, + "drop-enabled"); + + signals[TAB_ACTIVATED] = g_signal_new ( + "tab-activated", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (EMailTabPickerClass, tab_activated), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + E_MAIL_TYPE_TAB); + + signals[CHOOSER_CLICKED] = g_signal_new ( + "chooser-clicked", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (EMailTabPickerClass, chooser_clicked), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); } static void e_mail_tab_picker_chooser_clicked_cb (ClutterActor *button, - EMailTabPicker *self) + EMailTabPicker *self) { - g_signal_emit (self, signals[CHOOSER_CLICKED], 0); + g_signal_emit (self, signals[CHOOSER_CLICKED], 0); } static gboolean -e_mail_tab_picker_scroll_event_cb (ClutterActor *actor, - ClutterScrollEvent *event, - gpointer user_data) +e_mail_tab_picker_scroll_event_cb (ClutterActor *actor, + ClutterScrollEvent *event, + gpointer user_data) { - EMailTabPicker *self = E_MAIL_TAB_PICKER (actor); - EMailTabPickerPrivate *priv = self->priv; - - priv->keep_current_visible = FALSE; - - switch (event->direction) - { - case CLUTTER_SCROLL_UP : - case CLUTTER_SCROLL_LEFT : - e_mail_tab_picker_scroll_to (self, priv->scroll_end - 200, 150); - break; - - case CLUTTER_SCROLL_DOWN : - case CLUTTER_SCROLL_RIGHT : - e_mail_tab_picker_scroll_to (self, priv->scroll_end + 200, 150); - break; - } + EMailTabPicker *self = E_MAIL_TAB_PICKER (actor); + EMailTabPickerPrivate *priv = self->priv; + + priv->keep_current_visible = FALSE; + + switch (event->direction) { + case CLUTTER_SCROLL_UP : + case CLUTTER_SCROLL_LEFT : + e_mail_tab_picker_scroll_to ( + self, priv->scroll_end - 200, 150); + break; + + case CLUTTER_SCROLL_DOWN : + case CLUTTER_SCROLL_RIGHT : + e_mail_tab_picker_scroll_to ( + self, priv->scroll_end + 200, 150); + break; + } - return TRUE; + return TRUE; } static void -e_mail_tab_picker_scroll_value_cb (MxAdjustment *adjustment, - GParamSpec *pspec, - EMailTabPicker *picker) +e_mail_tab_picker_scroll_value_cb (MxAdjustment *adjustment, + GParamSpec *pspec, + EMailTabPicker *picker) { - EMailTabPickerPrivate *priv = picker->priv; - gdouble value = mx_adjustment_get_value (adjustment); - - if ((gint)value != priv->scroll_offset) - { - priv->keep_current_visible = FALSE; - priv->scroll_offset = (gint)value; - clutter_actor_queue_relayout (CLUTTER_ACTOR (picker)); - } + EMailTabPickerPrivate *priv = picker->priv; + gdouble value = mx_adjustment_get_value (adjustment); + + if ((gint) value != priv->scroll_offset) { + priv->keep_current_visible = FALSE; + priv->scroll_offset = (gint)value; + clutter_actor_queue_relayout (CLUTTER_ACTOR (picker)); + } } static void e_mail_tab_picker_init (EMailTabPicker *self) { - EMailTabPickerPrivate *priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, E_MAIL_TYPE_TAB_PICKER, EMailTabPickerPrivate); - - clutter_actor_set_reactive (CLUTTER_ACTOR (self), TRUE); - - priv->chooser_button = mx_button_new (); - clutter_actor_set_name (CLUTTER_ACTOR (priv->chooser_button), - "chooser-button"); - clutter_actor_set_parent (CLUTTER_ACTOR (priv->chooser_button), - CLUTTER_ACTOR (self)); - - priv->close_button = mx_button_new (); - clutter_actor_set_name (CLUTTER_ACTOR (priv->close_button), - "chooser-close-button"); - clutter_actor_set_parent (CLUTTER_ACTOR (priv->close_button), - CLUTTER_ACTOR (self)); - clutter_actor_hide (CLUTTER_ACTOR (priv->close_button)); - - priv->scroll_adjustment = mx_adjustment_new_with_values (0, 0, 0, 100, 200, 200); - priv->scroll_bar = mx_scroll_bar_new_with_adjustment (priv->scroll_adjustment); - g_object_unref (priv->scroll_adjustment); - clutter_actor_set_parent (CLUTTER_ACTOR (priv->scroll_bar), - CLUTTER_ACTOR (self)); - clutter_actor_hide (CLUTTER_ACTOR (priv->scroll_bar)); - - g_signal_connect (priv->chooser_button, "clicked", - G_CALLBACK (e_mail_tab_picker_chooser_clicked_cb), self); - g_signal_connect (priv->close_button, "clicked", - G_CALLBACK (e_mail_tab_picker_chooser_clicked_cb), self); - g_signal_connect (self, "scroll-event", - G_CALLBACK (e_mail_tab_picker_scroll_event_cb), NULL); + EMailTabPickerPrivate *priv; + + priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + self, E_MAIL_TYPE_TAB_PICKER, EMailTabPickerPrivate); + + clutter_actor_set_reactive (CLUTTER_ACTOR (self), TRUE); + + priv->chooser_button = mx_button_new (); + clutter_actor_set_name ( + CLUTTER_ACTOR (priv->chooser_button), "chooser-button"); + clutter_actor_set_parent ( + CLUTTER_ACTOR (priv->chooser_button), CLUTTER_ACTOR (self)); + + priv->close_button = mx_button_new (); + clutter_actor_set_name ( + CLUTTER_ACTOR (priv->close_button), "chooser-close-button"); + clutter_actor_set_parent ( + CLUTTER_ACTOR (priv->close_button), CLUTTER_ACTOR (self)); + clutter_actor_hide (CLUTTER_ACTOR (priv->close_button)); + + priv->scroll_adjustment = + mx_adjustment_new_with_values (0, 0, 0, 100, 200, 200); + priv->scroll_bar = + mx_scroll_bar_new_with_adjustment (priv->scroll_adjustment); + g_object_unref (priv->scroll_adjustment); + clutter_actor_set_parent ( + CLUTTER_ACTOR (priv->scroll_bar), CLUTTER_ACTOR (self)); + clutter_actor_hide (CLUTTER_ACTOR (priv->scroll_bar)); + + g_signal_connect ( + priv->chooser_button, "clicked", + G_CALLBACK (e_mail_tab_picker_chooser_clicked_cb), self); + g_signal_connect ( + priv->close_button, "clicked", + G_CALLBACK (e_mail_tab_picker_chooser_clicked_cb), self); + g_signal_connect ( + self, "scroll-event", + G_CALLBACK (e_mail_tab_picker_scroll_event_cb), NULL); } static gint e_mail_tab_picker_find_tab_cb (gconstpointer a, gconstpointer b) { - EMailTabPickerProps *props = (EMailTabPickerProps *)a; - EMailTab *tab = (EMailTab *)b; + EMailTabPickerProps *props = (EMailTabPickerProps *)a; + EMailTab *tab = (EMailTab *)b; - if (props->tab == tab) - return 0; - else - return -1; + return (props->tab == tab) ? 0 : -1; } static void e_mail_tab_picker_tab_clicked_cb (EMailTab *tab, EMailTabPicker *self) { - EMailTabPickerPrivate *priv = self->priv; - EMailTab *old_tab = - ((EMailTabPickerProps *)g_list_nth_data (priv->tabs, priv->current_tab))->tab; - GList *new_tab_link = g_list_find_custom (priv->tabs, tab, - e_mail_tab_picker_find_tab_cb); - - if (!new_tab_link) - return; - - priv->keep_current_visible = TRUE; - - /* If the same tab is clicked, make sure we remain active and return */ - if (tab == old_tab) - { - e_mail_tab_set_active (tab, TRUE); - if (priv->preview_mode) - g_signal_emit (self, signals[TAB_ACTIVATED], 0, tab); - return; - } + EMailTabPickerPrivate *priv = self->priv; + EMailTab *old_tab; + GList *new_tab_link; + + old_tab = ((EMailTabPickerProps *) g_list_nth_data ( + priv->tabs, priv->current_tab))->tab; + new_tab_link = g_list_find_custom ( + priv->tabs, tab, e_mail_tab_picker_find_tab_cb); + + if (!new_tab_link) + return; + + priv->keep_current_visible = TRUE; + + /* If the same tab is clicked, make sure we remain active and return */ + if (tab == old_tab) { + e_mail_tab_set_active (tab, TRUE); + if (priv->preview_mode) + g_signal_emit (self, signals[TAB_ACTIVATED], 0, tab); + return; + } - /* Deselect old tab */ - e_mail_tab_set_active (old_tab, FALSE); + /* Deselect old tab */ + e_mail_tab_set_active (old_tab, FALSE); - /* Set new tab */ - priv->current_tab = g_list_position (priv->tabs, new_tab_link); - g_signal_emit (self, signals[TAB_ACTIVATED], 0, tab); + /* Set new tab */ + priv->current_tab = g_list_position (priv->tabs, new_tab_link); + g_signal_emit (self, signals[TAB_ACTIVATED], 0, tab); } ClutterActor * e_mail_tab_picker_new (void) { - return g_object_new (E_MAIL_TYPE_TAB_PICKER, NULL); + return g_object_new (E_MAIL_TYPE_TAB_PICKER, NULL); } static void -e_mail_tab_picker_tab_drag_begin_cb (MxDraggable *draggable, - gfloat event_x, - gfloat event_y, - gint event_button, - ClutterModifierType modifiers, - EMailTabPicker *picker) +e_mail_tab_picker_tab_drag_begin_cb (MxDraggable *draggable, + gfloat event_x, + gfloat event_y, + gint event_button, + ClutterModifierType modifiers, + EMailTabPicker *picker) { - EMailTabPickerPrivate *priv = picker->priv; - priv->in_drag = TRUE; - - if (!priv->preview_mode) - { - e_mail_tab_picker_set_preview_mode (picker, TRUE); - priv->drag_preview = TRUE; - } + EMailTabPickerPrivate *priv = picker->priv; + priv->in_drag = TRUE; + + if (!priv->preview_mode) { + e_mail_tab_picker_set_preview_mode (picker, TRUE); + priv->drag_preview = TRUE; + } } static void -e_mail_tab_picker_tab_drag_end_cb (MxDraggable *draggable, - gfloat event_x, - gfloat event_y, - EMailTabPicker *picker) +e_mail_tab_picker_tab_drag_end_cb (MxDraggable *draggable, + gfloat event_x, + gfloat event_y, + EMailTabPicker *picker) { - EMailTabPickerPrivate *priv = picker->priv; - priv->in_drag = FALSE; - - if (priv->drag_preview) - { - e_mail_tab_picker_set_preview_mode (picker, FALSE); - priv->drag_preview = FALSE; - } + EMailTabPickerPrivate *priv = picker->priv; + priv->in_drag = FALSE; + + if (priv->drag_preview) { + e_mail_tab_picker_set_preview_mode (picker, FALSE); + priv->drag_preview = FALSE; + } } void -e_mail_tab_picker_add_tab (EMailTabPicker *picker, EMailTab *tab, gint position) +e_mail_tab_picker_add_tab (EMailTabPicker *picker, + EMailTab *tab, + gint position) { - EMailTabPickerProps *props; - EMailTabPickerPrivate *priv = picker->priv; - - if (priv->tabs && (priv->current_tab >= position)) - priv->current_tab++; - - props = g_slice_new (EMailTabPickerProps); - props->tab = tab; - priv->tabs = g_list_insert (priv->tabs, props, position); - priv->n_tabs++; - - clutter_actor_set_parent (CLUTTER_ACTOR (tab), CLUTTER_ACTOR (picker)); - mx_draggable_set_axis (MX_DRAGGABLE (tab), MX_DRAG_AXIS_X); - - g_signal_connect_after (tab, "clicked", - G_CALLBACK (e_mail_tab_picker_tab_clicked_cb), picker); - g_signal_connect (tab, "drag-begin", - G_CALLBACK (e_mail_tab_picker_tab_drag_begin_cb), picker); - g_signal_connect (tab, "drag-end", - G_CALLBACK (e_mail_tab_picker_tab_drag_end_cb), picker); - - e_mail_tab_set_preview_mode (tab, priv->preview_mode); - clutter_actor_queue_relayout (CLUTTER_ACTOR (picker)); + EMailTabPickerProps *props; + EMailTabPickerPrivate *priv = picker->priv; + + if (priv->tabs && (priv->current_tab >= position)) + priv->current_tab++; + + props = g_slice_new (EMailTabPickerProps); + props->tab = tab; + priv->tabs = g_list_insert (priv->tabs, props, position); + priv->n_tabs++; + + clutter_actor_set_parent (CLUTTER_ACTOR (tab), CLUTTER_ACTOR (picker)); + mx_draggable_set_axis (MX_DRAGGABLE (tab), MX_DRAG_AXIS_X); + + g_signal_connect_after ( + tab, "clicked", + G_CALLBACK (e_mail_tab_picker_tab_clicked_cb), picker); + g_signal_connect ( + tab, "drag-begin", + G_CALLBACK (e_mail_tab_picker_tab_drag_begin_cb), picker); + g_signal_connect ( + tab, "drag-end", + G_CALLBACK (e_mail_tab_picker_tab_drag_end_cb), picker); + + e_mail_tab_set_preview_mode (tab, priv->preview_mode); + clutter_actor_queue_relayout (CLUTTER_ACTOR (picker)); } void e_mail_tab_picker_remove_tab (EMailTabPicker *picker, EMailTab *tab) { - GList *tab_link; - EMailTabPickerPrivate *priv = picker->priv; - - tab_link = g_list_find_custom (priv->tabs, tab, e_mail_tab_picker_find_tab_cb); - - if (!tab_link) - return; - - g_signal_handlers_disconnect_by_func (tab, - e_mail_tab_picker_tab_clicked_cb, - picker); - g_signal_handlers_disconnect_by_func (tab, - e_mail_tab_picker_tab_drag_begin_cb, - picker); - g_signal_handlers_disconnect_by_func (tab, - e_mail_tab_picker_tab_drag_end_cb, - picker); - - /* We don't want to do this during dispose, checking if chooser_button - * exists is a way of checking if we're in dispose without keeping an - * extra variable around. - */ - if (priv->chooser_button) - { - gint position = g_list_position (priv->tabs, tab_link); - if (priv->current_tab) - { - if (priv->current_tab > position) - priv->current_tab--; - else if (priv->current_tab == position) - e_mail_tab_picker_set_current_tab (picker, priv->current_tab - 1); + GList *tab_link; + EMailTabPickerPrivate *priv = picker->priv; + + tab_link = g_list_find_custom ( + priv->tabs, tab, e_mail_tab_picker_find_tab_cb); + + if (!tab_link) + return; + + g_signal_handlers_disconnect_by_func ( + tab, e_mail_tab_picker_tab_clicked_cb, picker); + g_signal_handlers_disconnect_by_func ( + tab, e_mail_tab_picker_tab_drag_begin_cb, picker); + g_signal_handlers_disconnect_by_func ( + tab, e_mail_tab_picker_tab_drag_end_cb, picker); + + /* We don't want to do this during dispose, checking if chooser_button + * exists is a way of checking if we're in dispose without keeping an + * extra variable around. */ + if (priv->chooser_button) { + gint position = g_list_position (priv->tabs, tab_link); + if (priv->current_tab) { + if (priv->current_tab > position) + priv->current_tab--; + else if (priv->current_tab == position) + e_mail_tab_picker_set_current_tab ( + picker, priv->current_tab - 1); + } else if (priv->tabs->next && (position == 0)) { + e_mail_tab_picker_set_current_tab ( + picker, priv->current_tab + 1); + priv->current_tab--; + } } - else if (priv->tabs->next && (position == 0)) - { - e_mail_tab_picker_set_current_tab (picker, priv->current_tab + 1); - priv->current_tab--; - } - } - g_slice_free (EMailTabPickerProps, tab_link->data); - priv->tabs = g_list_delete_link (priv->tabs, tab_link); - clutter_actor_unparent (CLUTTER_ACTOR (tab)); - priv->n_tabs--; + g_slice_free (EMailTabPickerProps, tab_link->data); + priv->tabs = g_list_delete_link (priv->tabs, tab_link); + clutter_actor_unparent (CLUTTER_ACTOR (tab)); + priv->n_tabs--; - clutter_actor_queue_relayout (CLUTTER_ACTOR (picker)); + clutter_actor_queue_relayout (CLUTTER_ACTOR (picker)); } GList * e_mail_tab_picker_get_tabs (EMailTabPicker *picker) { - GList *tab_list, *t; + GList *tab_list, *t; - EMailTabPickerPrivate *priv = picker->priv; + EMailTabPickerPrivate *priv = picker->priv; - tab_list = NULL; - for (t = g_list_last (priv->tabs); t; t = t->prev) - { - EMailTabPickerProps *props = t->data; - tab_list = g_list_prepend (tab_list, props->tab); - } + tab_list = NULL; + for (t = g_list_last (priv->tabs); t; t = t->prev) { + EMailTabPickerProps *props = t->data; + tab_list = g_list_prepend (tab_list, props->tab); + } - return tab_list; + return tab_list; } EMailTab * e_mail_tab_picker_get_tab (EMailTabPicker *picker, gint tab) { - EMailTabPickerProps *props = g_list_nth_data (picker->priv->tabs, tab); - return props->tab; + EMailTabPickerProps *props = g_list_nth_data (picker->priv->tabs, tab); + return props->tab; } gint e_mail_tab_picker_get_tab_no (EMailTabPicker *picker, EMailTab *tab) { - GList *tab_link = g_list_find_custom (picker->priv->tabs, tab, - e_mail_tab_picker_find_tab_cb); - return g_list_position (picker->priv->tabs, tab_link); + GList *tab_link; + + tab_link = g_list_find_custom ( + picker->priv->tabs, tab, + e_mail_tab_picker_find_tab_cb); + + return g_list_position (picker->priv->tabs, tab_link); } gint e_mail_tab_picker_get_current_tab (EMailTabPicker *picker) { - return picker->priv->current_tab; + return picker->priv->current_tab; } void e_mail_tab_picker_set_current_tab (EMailTabPicker *picker, gint tab_no) { - EMailTabPickerPrivate *priv = picker->priv; - EMailTabPickerProps *props; + EMailTabPickerPrivate *priv = picker->priv; + EMailTabPickerProps *props; - printf("OLD %d new %d\n", priv->current_tab, tab_no); - if (priv->n_tabs == 0) - return; + printf("OLD %d new %d\n", priv->current_tab, tab_no); + if (priv->n_tabs == 0) + return; - if (ABS (tab_no) >= priv->n_tabs) - return; + if (ABS (tab_no) >= priv->n_tabs) + return; - if (tab_no < 0) - tab_no = priv->n_tabs + tab_no; + if (tab_no < 0) + tab_no = priv->n_tabs + tab_no; - props = g_list_nth_data (priv->tabs, (guint)tab_no); + props = g_list_nth_data (priv->tabs, (guint)tab_no); - if (props) - { - e_mail_tab_picker_tab_clicked_cb (props->tab, picker); - e_mail_tab_set_active (props->tab, TRUE); - } + if (props) { + e_mail_tab_picker_tab_clicked_cb (props->tab, picker); + e_mail_tab_set_active (props->tab, TRUE); + } } void e_mail_tab_picker_reorder (EMailTabPicker *picker, - gint old_position, - gint new_position) + gint old_position, + gint new_position) { - GList *link; - gpointer data; - - EMailTabPickerPrivate *priv = picker->priv; - - if (old_position == new_position) - return; - - if (!(link = g_list_nth (priv->tabs, old_position))) - return; - - data = link->data; - priv->tabs = g_list_delete_link (priv->tabs, link); - priv->tabs = g_list_insert (priv->tabs, data, new_position); - - if (priv->current_tab == old_position) - { - if (new_position < 0) - priv->current_tab = priv->n_tabs - 1; - else - priv->current_tab = CLAMP (new_position, 0, priv->n_tabs - 1); - } - else if ((priv->current_tab > old_position) && - (new_position >= priv->current_tab)) - priv->current_tab--; - else if ((priv->current_tab < old_position) && - (new_position <= priv->current_tab)) - priv->current_tab++; - - clutter_actor_queue_relayout (CLUTTER_ACTOR (picker)); + GList *link; + gpointer data; + + EMailTabPickerPrivate *priv = picker->priv; + + if (old_position == new_position) + return; + + if (!(link = g_list_nth (priv->tabs, old_position))) + return; + + data = link->data; + priv->tabs = g_list_delete_link (priv->tabs, link); + priv->tabs = g_list_insert (priv->tabs, data, new_position); + + if (priv->current_tab == old_position) { + if (new_position < 0) + priv->current_tab = priv->n_tabs - 1; + else + priv->current_tab = CLAMP ( + new_position, 0, priv->n_tabs - 1); + } else if ((priv->current_tab > old_position) && + (new_position >= priv->current_tab)) + priv->current_tab--; + else if ((priv->current_tab < old_position) && + (new_position <= priv->current_tab)) + priv->current_tab++; + + clutter_actor_queue_relayout (CLUTTER_ACTOR (picker)); } gint e_mail_tab_picker_get_n_tabs (EMailTabPicker *picker) { - return picker->priv->n_tabs; + return picker->priv->n_tabs; } static void preview_new_frame_cb (ClutterTimeline *timeline, - guint msecs, - EMailTabPicker *picker) + guint msecs, + EMailTabPicker *picker) { - picker->priv->preview_progress = clutter_timeline_get_progress (timeline); - clutter_actor_queue_relayout (CLUTTER_ACTOR (picker)); + picker->priv->preview_progress = + clutter_timeline_get_progress (timeline); + clutter_actor_queue_relayout (CLUTTER_ACTOR (picker)); } static void preview_completed_cb (ClutterTimeline *timeline, - EMailTabPicker *picker) + EMailTabPicker *picker) { - EMailTabPickerPrivate *priv = picker->priv; - - if (priv->preview_timeline) - { - g_object_unref (priv->preview_timeline); - priv->preview_timeline = NULL; - - if (priv->preview_mode) - { - priv->preview_progress = 1.0; - clutter_actor_hide (CLUTTER_ACTOR (priv->chooser_button)); - } - else - { - priv->preview_progress = 0.0; - clutter_actor_hide (CLUTTER_ACTOR (priv->scroll_bar)); - clutter_actor_hide (CLUTTER_ACTOR (priv->close_button)); + EMailTabPickerPrivate *priv = picker->priv; + + if (priv->preview_timeline) { + g_object_unref (priv->preview_timeline); + priv->preview_timeline = NULL; + + if (priv->preview_mode) { + priv->preview_progress = 1.0; + clutter_actor_hide ( + CLUTTER_ACTOR (priv->chooser_button)); + } else { + priv->preview_progress = 0.0; + clutter_actor_hide (CLUTTER_ACTOR (priv->scroll_bar)); + clutter_actor_hide (CLUTTER_ACTOR (priv->close_button)); + } + + clutter_actor_queue_relayout (CLUTTER_ACTOR (picker)); } - clutter_actor_queue_relayout (CLUTTER_ACTOR (picker)); - } } void e_mail_tab_picker_set_preview_mode (EMailTabPicker *picker, gboolean preview) { - GList *t; + GList *t; - EMailTabPickerPrivate *priv = picker->priv; + EMailTabPickerPrivate *priv = picker->priv; - if (priv->preview_mode == preview) - return; + if (priv->preview_mode == preview) + return; - priv->preview_mode = preview; + priv->preview_mode = preview; - /* Put all tabs in preview mode */ - for (t = priv->tabs; t; t = t->next) - { - EMailTabPickerProps *prop = t->data; - e_mail_tab_set_preview_mode (prop->tab, preview); - } + /* Put all tabs in preview mode */ + for (t = priv->tabs; t; t = t->next) { + EMailTabPickerProps *prop = t->data; + e_mail_tab_set_preview_mode (prop->tab, preview); + } - /* Slide in the scroll-bar */ - if (!priv->preview_timeline) - { - if (preview) - clutter_actor_show (CLUTTER_ACTOR (priv->scroll_bar)); + /* Slide in the scroll-bar */ + if (!priv->preview_timeline) { + if (preview) + clutter_actor_show (CLUTTER_ACTOR (priv->scroll_bar)); - priv->preview_timeline = clutter_timeline_new (150); - g_signal_connect (priv->preview_timeline, "new-frame", + priv->preview_timeline = clutter_timeline_new (150); + g_signal_connect ( + priv->preview_timeline, "new-frame", G_CALLBACK (preview_new_frame_cb), picker); - g_signal_connect (priv->preview_timeline, "completed", + g_signal_connect ( + priv->preview_timeline, "completed", G_CALLBACK (preview_completed_cb), picker); - clutter_timeline_start (priv->preview_timeline); - } - clutter_timeline_set_direction (priv->preview_timeline, - preview ? CLUTTER_TIMELINE_FORWARD : - CLUTTER_TIMELINE_BACKWARD); - - /* Connect/disconnect the scrollbar */ - if (preview) - g_signal_connect (priv->scroll_adjustment, "notify::value", - G_CALLBACK (e_mail_tab_picker_scroll_value_cb), picker); - else - g_signal_handlers_disconnect_by_func (priv->scroll_adjustment, - e_mail_tab_picker_scroll_value_cb, - picker); - - if (preview) - { - /* Fade out the chooser button show close button */ - clutter_actor_animate (CLUTTER_ACTOR (priv->chooser_button), - CLUTTER_EASE_IN_OUT_QUAD, 150, - "opacity", 0x00, - NULL); - clutter_actor_show (CLUTTER_ACTOR (priv->close_button)); - } - else - { - /* Fade in the chooser button */ - clutter_actor_show (CLUTTER_ACTOR (priv->chooser_button)); - clutter_actor_animate (CLUTTER_ACTOR (priv->chooser_button), - CLUTTER_EASE_IN_OUT_QUAD, 150, - "opacity", 0xff, - NULL); - } - clutter_actor_set_reactive (CLUTTER_ACTOR (priv->chooser_button), !preview); - - /* Remove the hover state, which likely got stuck when we clicked it */ - if (!preview) - mx_stylable_set_style_pseudo_class (MX_STYLABLE (priv->chooser_button), - NULL); - - g_object_notify (G_OBJECT (picker), "preview-mode"); + clutter_timeline_start (priv->preview_timeline); + } + + clutter_timeline_set_direction ( + priv->preview_timeline, + preview ? CLUTTER_TIMELINE_FORWARD : + CLUTTER_TIMELINE_BACKWARD); + + /* Connect/disconnect the scrollbar */ + if (preview) + g_signal_connect ( + priv->scroll_adjustment, "notify::value", + G_CALLBACK (e_mail_tab_picker_scroll_value_cb), picker); + else + g_signal_handlers_disconnect_by_func ( + priv->scroll_adjustment, + e_mail_tab_picker_scroll_value_cb, picker); + + if (preview) { + /* Fade out the chooser button show close button */ + clutter_actor_animate ( + CLUTTER_ACTOR (priv->chooser_button), + CLUTTER_EASE_IN_OUT_QUAD, 150, + "opacity", 0x00, NULL); + clutter_actor_show (CLUTTER_ACTOR (priv->close_button)); + } else { + /* Fade in the chooser button */ + clutter_actor_show (CLUTTER_ACTOR (priv->chooser_button)); + clutter_actor_animate ( + CLUTTER_ACTOR (priv->chooser_button), + CLUTTER_EASE_IN_OUT_QUAD, 150, + "opacity", 0xff, NULL); + } + + clutter_actor_set_reactive ( + CLUTTER_ACTOR (priv->chooser_button), !preview); + + /* Remove the hover state, which likely got stuck when we clicked it */ + if (!preview) + mx_stylable_set_style_pseudo_class ( + MX_STYLABLE (priv->chooser_button), NULL); + + g_object_notify (G_OBJECT (picker), "preview-mode"); } gboolean e_mail_tab_picker_get_preview_mode (EMailTabPicker *picker) { - EMailTabPickerPrivate *priv = picker->priv; - return priv->preview_mode; + EMailTabPickerPrivate *priv = picker->priv; + return priv->preview_mode; } void e_mail_tab_picker_enable_drop (EMailTabPicker *picker, gboolean enable) { - EMailTabPickerPrivate *priv = picker->priv; + EMailTabPickerPrivate *priv = picker->priv; - if (priv->drop_enabled == enable) - return; + if (priv->drop_enabled == enable) + return; - priv->drop_enabled = enable; - if (enable) - mx_droppable_enable (MX_DROPPABLE (picker)); - else - mx_droppable_disable (MX_DROPPABLE (picker)); + priv->drop_enabled = enable; + if (enable) + mx_droppable_enable (MX_DROPPABLE (picker)); + else + mx_droppable_disable (MX_DROPPABLE (picker)); - g_object_notify (G_OBJECT (picker), "enabled"); + g_object_notify (G_OBJECT (picker), "enabled"); } diff --git a/mail/e-mail-tab.c b/mail/e-mail-tab.c index aefe49f1df..a0dfad2602 100644 --- a/mail/e-mail-tab.c +++ b/mail/e-mail-tab.c @@ -1306,8 +1306,10 @@ e_mail_tab_init (EMailTab *self) { ClutterActor *text; GtkSettings *settings; + EMailTabPrivate *priv; - EMailTabPrivate *priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, E_MAIL_TYPE_TAB, EMailTabPrivate); + priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + self, E_MAIL_TYPE_TAB, EMailTabPrivate); priv->width = -1; priv->anim_length = 200; diff --git a/mail/e-mail-tag-editor.c b/mail/e-mail-tag-editor.c index 5cc29b5bde..d1ef428bc3 100644 --- a/mail/e-mail-tag-editor.c +++ b/mail/e-mail-tag-editor.c @@ -281,7 +281,8 @@ mail_tag_editor_init (EMailTagEditor *editor) GtkCellRenderer *renderer; GtkListStore *store; - editor->priv = G_TYPE_INSTANCE_GET_PRIVATE (editor, E_TYPE_MAIL_TAG_EDITOR, EMailTagEditorPrivate); + editor->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + editor, E_TYPE_MAIL_TAG_EDITOR, EMailTagEditorPrivate); dialog = GTK_DIALOG (editor); window = GTK_WINDOW (editor); diff --git a/mail/e-mail-view.c b/mail/e-mail-view.c index 0db537bd02..d1a3503329 100644 --- a/mail/e-mail-view.c +++ b/mail/e-mail-view.c @@ -319,7 +319,8 @@ e_mail_view_class_init (EMailViewClass *class) static void e_mail_view_init (EMailView *view) { - view->priv = G_TYPE_INSTANCE_GET_PRIVATE (view, E_TYPE_MAIL_VIEW, EMailViewPrivate); + view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + view, E_TYPE_MAIL_VIEW, EMailViewPrivate); } EShellView * diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 0c2e2744c0..d4a892efde 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -429,7 +429,8 @@ emae_class_init (GObjectClass *class) static void emae_init (EMAccountEditor *emae) { - emae->priv = G_TYPE_INSTANCE_GET_PRIVATE (emae, EM_TYPE_ACCOUNT_EDITOR, EMAccountEditorPrivate); + emae->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + emae, EM_TYPE_ACCOUNT_EDITOR, EMAccountEditorPrivate); emae->priv->selected_server = NULL; emae->emae_check_servers = emae_check_servers; diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 40609f0f24..752a78af07 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -69,7 +69,8 @@ #define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0) #endif -#define GCONF_KEY_TEMPLATE_PLACEHOLDERS "/apps/evolution/mail/template_placeholders" +#define GCONF_KEY_TEMPLATE_PLACEHOLDERS \ + "/apps/evolution/mail/template_placeholders" typedef struct _AsyncContext AsyncContext; typedef struct _ForwardData ForwardData; @@ -126,13 +127,14 @@ forward_data_free (ForwardData *data) } static gboolean -ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EDestination **recipients) +ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, + EDestination **recipients) { gboolean res; GString *str; gint i; - str = g_string_new(""); + str = g_string_new (""); for (i = 0; recipients[i] != NULL; ++i) { if (!e_destination_get_html_mail_pref (recipients[i])) { const gchar *name; @@ -144,8 +146,10 @@ ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EDestination **recip } if (str->len) - res = em_utils_prompt_user((GtkWindow *)composer,"/apps/evolution/mail/prompts/unwanted_html", - "mail:ask-send-html", str->str, NULL); + res = em_utils_prompt_user ( + GTK_WINDOW (composer), + "/apps/evolution/mail/prompts/unwanted_html", + "mail:ask-send-html", str->str, NULL); else res = TRUE; @@ -157,12 +161,15 @@ ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, EDestination **recip static gboolean ask_confirm_for_empty_subject (EMsgComposer *composer) { - return em_utils_prompt_user((GtkWindow *)composer, "/apps/evolution/mail/prompts/empty_subject", - "mail:ask-send-no-subject", NULL); + return em_utils_prompt_user ( + GTK_WINDOW (composer), + "/apps/evolution/mail/prompts/empty_subject", + "mail:ask-send-no-subject", NULL); } static gboolean -ask_confirm_for_only_bcc (EMsgComposer *composer, gboolean hidden_list_case) +ask_confirm_for_only_bcc (EMsgComposer *composer, + gboolean hidden_list_case) { /* If the user is mailing a hidden contact list, it is possible for them to create a message with only Bcc recipients without really @@ -170,8 +177,12 @@ ask_confirm_for_only_bcc (EMsgComposer *composer, gboolean hidden_list_case) this dialog to provide slightly different text in that case, to better explain what the hell is going on. */ - return em_utils_prompt_user((GtkWindow *)composer, "/apps/evolution/mail/prompts/only_bcc", - hidden_list_case?"mail:ask-send-only-bcc-contact":"mail:ask-send-only-bcc", NULL); + return em_utils_prompt_user ( + GTK_WINDOW (composer), + "/apps/evolution/mail/prompts/only_bcc", + hidden_list_case ? + "mail:ask-send-only-bcc-contact" : + "mail:ask-send-only-bcc", NULL); } static gboolean @@ -1112,10 +1123,14 @@ edit_message (EShell *shell, gconf = gconf_client_get_default (); /* Get the list from gconf */ - clue_list = gconf_client_get_list ( gconf, GCONF_KEY_TEMPLATE_PLACEHOLDERS, GCONF_VALUE_STRING, NULL ); + clue_list = gconf_client_get_list ( + gconf, GCONF_KEY_TEMPLATE_PLACEHOLDERS, + GCONF_VALUE_STRING, NULL ); g_object_unref (gconf); - traverse_parts (clue_list, message, camel_medium_get_content (CAMEL_MEDIUM (message))); + traverse_parts ( + clue_list, message, + camel_medium_get_content (CAMEL_MEDIUM (message))); g_slist_foreach (clue_list, (GFunc) g_free, NULL); g_slist_free (clue_list); @@ -1140,7 +1155,11 @@ edit_message (EShell *shell, return (GtkWidget *)composer; } -typedef enum { QUOTING_ATTRIBUTION, QUOTING_FORWARD, QUOTING_ORIGINAL } QuotingTextEnum; +typedef enum { + QUOTING_ATTRIBUTION, + QUOTING_FORWARD, + QUOTING_ORIGINAL +} QuotingTextEnum; static struct { const gchar * gconf_key; @@ -1151,7 +1170,8 @@ static struct { /* Note to translators: this is the attribution string used when quoting messages. * each ${Variable} gets replaced with a value. To see a full list of available * variables, see mail/em-composer-utils.c:attribvars array */ - N_("On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:") + N_("On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at " + "${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:") }, [QUOTING_FORWARD] = @@ -1421,7 +1441,8 @@ forward_non_attached (EShell *shell, subject = mail_tool_generate_forward_subject (message); forward = quoting_text (QUOTING_FORWARD); - text = em_utils_message_to_html (message, forward, flags, NULL, NULL, &validity_found); + text = em_utils_message_to_html ( + message, forward, flags, NULL, NULL, &validity_found); if (text) { composer = create_new_composer (shell, subject, from_uri); @@ -1773,15 +1794,23 @@ em_utils_send_receipt (EMailSession *session, CamelStream *stream; CamelFolder *out_folder; CamelMessageInfo *info; - const gchar *message_id = camel_medium_get_header (CAMEL_MEDIUM (message), "Message-ID"); - const gchar *message_date = camel_medium_get_header (CAMEL_MEDIUM (message), "Date"); - const gchar *message_subject = camel_mime_message_get_subject (message); - const gchar *receipt_address = camel_medium_get_header (CAMEL_MEDIUM (message), "Disposition-Notification-To"); + const gchar *message_id; + const gchar *message_date; + const gchar *message_subject; + const gchar *receipt_address; gchar *fake_msgid; gchar *hostname; gchar *self_address, *receipt_subject; gchar *ua, *recipient; + message_id = camel_medium_get_header ( + CAMEL_MEDIUM (message), "Message-ID"); + message_date = camel_medium_get_header ( + CAMEL_MEDIUM (message), "Date"); + message_subject = camel_mime_message_get_subject (message); + receipt_address = camel_medium_get_header ( + CAMEL_MEDIUM (message), "Disposition-Notification-To"); + if (!receipt_address) return; @@ -1817,16 +1846,18 @@ em_utils_send_receipt (EMailSession *session, camel_content_type_unref (type); stream = camel_stream_mem_new (); camel_stream_printf (stream, - /* Translators: First %s is an email address, second %s is the subject of the email, third %s is the date */ - _("Your message to %s about \"%s\" on %s has been read."), - self_address, message_subject, message_date); + /* Translators: First %s is an email address, second %s + * is the subject of the email, third %s is the date. */ + _("Your message to %s about \"%s\" on %s has been read."), + self_address, message_subject, message_date); camel_data_wrapper_construct_from_stream_sync ( receipt_text, stream, NULL, NULL); g_object_unref (stream); part = camel_mime_part_new (); camel_medium_set_content (CAMEL_MEDIUM (part), receipt_text); - camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE); + camel_mime_part_set_encoding ( + part, CAMEL_TRANSFER_ENCODING_QUOTEDPRINTABLE); g_object_unref (receipt_text); camel_multipart_add_part (body, part); g_object_unref (part); @@ -1835,7 +1866,9 @@ em_utils_send_receipt (EMailSession *session, receipt_data = camel_data_wrapper_new (); part = camel_mime_part_new (); - ua = g_strdup_printf ("%s; %s", hostname, "Evolution " VERSION SUB_VERSION " " VERSION_COMMENT); + ua = g_strdup_printf ( + "%s; %s", hostname, "Evolution " + VERSION SUB_VERSION " " VERSION_COMMENT); recipient = g_strdup_printf ("rfc822; %s", self_address); type = camel_content_type_new ("message", "disposition-notification"); @@ -1868,7 +1901,8 @@ em_utils_send_receipt (EMailSession *session, g_object_unref (body); /* Translators: %s is the subject of the email message */ - receipt_subject = g_strdup_printf (_("Delivery Notification for: \"%s\""), message_subject); + receipt_subject = g_strdup_printf ( + _("Delivery Notification for: \"%s\""), message_subject); camel_mime_message_set_subject (receipt, receipt_subject); g_free (receipt_subject); @@ -1882,10 +1916,21 @@ em_utils_send_receipt (EMailSession *session, camel_mime_message_set_recipients (receipt, CAMEL_RECIPIENT_TYPE_TO, addr); g_object_unref (addr); - camel_medium_set_header (CAMEL_MEDIUM (receipt), "Return-Path", "<>"); - camel_medium_set_header (CAMEL_MEDIUM (receipt), "X-Evolution-Account", account->uid); - camel_medium_set_header (CAMEL_MEDIUM (receipt), "X-Evolution-Transport", account->transport->url); - camel_medium_set_header (CAMEL_MEDIUM (receipt), "X-Evolution-Fcc", account->sent_folder_uri); + camel_medium_set_header ( + CAMEL_MEDIUM (receipt), + "Return-Path", "<>"); + camel_medium_set_header ( + CAMEL_MEDIUM (receipt), + "X-Evolution-Account", + account->uid); + camel_medium_set_header ( + CAMEL_MEDIUM (receipt), + "X-Evolution-Transport", + account->transport->url); + camel_medium_set_header ( + CAMEL_MEDIUM (receipt), + "X-Evolution-Fcc", + account->sent_folder_uri); /* Send the receipt */ info = camel_message_info_new (NULL); @@ -1966,7 +2011,8 @@ reply_get_composer (EShell *shell, /* Set the subject of the new message. */ if ((subject = (gchar *) camel_mime_message_get_subject (message))) { - if (g_ascii_strncasecmp (subject, "Re: ", 4) != 0 && g_ascii_strncasecmp (subject, "Re : ", 5) != 0) + if (g_ascii_strncasecmp (subject, "Re: ", 4) != 0 && + g_ascii_strncasecmp (subject, "Re : ", 5) != 0) subject = g_strdup_printf ("Re: %s", subject); else if (g_ascii_strncasecmp (subject, "Re : ", 5) == 0) subject = g_strdup_printf ("Re: %s", subject + 5); @@ -2085,7 +2131,8 @@ em_utils_is_munged_list_message (CamelMimeMessage *message) list = camel_internet_address_new (); if (get_reply_list (message, list) && - camel_address_length (CAMEL_ADDRESS (list)) == camel_address_length (CAMEL_ADDRESS (reply_to))) { + camel_address_length (CAMEL_ADDRESS (list)) == + camel_address_length (CAMEL_ADDRESS (reply_to))) { gint i; const gchar *r_name, *r_addr; const gchar *l_name, *l_addr; @@ -2132,7 +2179,9 @@ get_reply_to (CamelMimeMessage *message) } static void -get_reply_sender (CamelMimeMessage *message, CamelInternetAddress *to, CamelNNTPAddress *postto) +get_reply_sender (CamelMimeMessage *message, + CamelInternetAddress *to, + CamelNNTPAddress *postto) { CamelInternetAddress *reply_to; const gchar *name, *addr, *posthdr; @@ -2155,13 +2204,17 @@ get_reply_sender (CamelMimeMessage *message, CamelInternetAddress *to, CamelNNTP } void -em_utils_get_reply_sender (CamelMimeMessage *message, CamelInternetAddress *to, CamelNNTPAddress *postto) +em_utils_get_reply_sender (CamelMimeMessage *message, + CamelInternetAddress *to, + CamelNNTPAddress *postto) { get_reply_sender (message, to, postto); } static void -get_reply_from (CamelMimeMessage *message, CamelInternetAddress *to, CamelNNTPAddress *postto) +get_reply_from (CamelMimeMessage *message, + CamelInternetAddress *to, + CamelNNTPAddress *postto) { CamelInternetAddress *from; const gchar *name, *addr, *posthdr; @@ -2184,7 +2237,9 @@ get_reply_from (CamelMimeMessage *message, CamelInternetAddress *to, CamelNNTPAd } static void -concat_unique_addrs (CamelInternetAddress *dest, CamelInternetAddress *src, GHashTable *rcpt_hash) +concat_unique_addrs (CamelInternetAddress *dest, + CamelInternetAddress *src, + GHashTable *rcpt_hash) { const gchar *name, *addr; gint i; @@ -2198,7 +2253,10 @@ concat_unique_addrs (CamelInternetAddress *dest, CamelInternetAddress *src, GHas } static void -get_reply_all (CamelMimeMessage *message, CamelInternetAddress *to, CamelInternetAddress *cc, CamelNNTPAddress *postto) +get_reply_all (CamelMimeMessage *message, + CamelInternetAddress *to, + CamelInternetAddress *cc, + CamelNNTPAddress *postto) { CamelInternetAddress *reply_to, *to_addrs, *cc_addrs; const gchar *name, *addr, *posthdr; @@ -2236,14 +2294,16 @@ get_reply_all (CamelMimeMessage *message, CamelInternetAddress *to, CamelInterne concat_unique_addrs (cc, to_addrs, rcpt_hash); concat_unique_addrs (cc, cc_addrs, rcpt_hash); - /* promote the first Cc: address to To: if To: is empty */ - if (camel_address_length ((CamelAddress *) to) == 0 && camel_address_length ((CamelAddress *)cc) > 0) { + /* Promote the first Cc: address to To: if To: is empty. */ + if (camel_address_length ((CamelAddress *) to) == 0 && + camel_address_length ((CamelAddress *)cc) > 0) { camel_internet_address_get (cc, 0, &name, &addr); camel_internet_address_add (to, name, addr); camel_address_remove ((CamelAddress *)cc, 0); } - /* if To: is still empty, may we removed duplicates (i.e. ourself), so add the original To if it was set */ + /* If To: is still empty, may we removed duplicates (i.e. ourself), + * so add the original To if it was set. */ if (camel_address_length ((CamelAddress *)to) == 0 && (camel_internet_address_get (to_addrs, 0, &name, &addr) || camel_internet_address_get (cc_addrs, 0, &name, &addr))) { @@ -2254,7 +2314,10 @@ get_reply_all (CamelMimeMessage *message, CamelInternetAddress *to, CamelInterne } void -em_utils_get_reply_all (CamelMimeMessage *message, CamelInternetAddress *to, CamelInternetAddress *cc, CamelNNTPAddress *postto) +em_utils_get_reply_all (CamelMimeMessage *message, + CamelInternetAddress *to, + CamelInternetAddress *cc, + CamelNNTPAddress *postto) { get_reply_all (message, to, cc, postto); } @@ -2276,7 +2339,9 @@ enum { ATTRIB_TM_YDAY }; -typedef void (* AttribFormatter) (GString *str, const gchar *attr, CamelMimeMessage *message); +typedef void (*AttribFormatter) (GString *str, + const gchar *attr, + CamelMimeMessage *message); static void format_sender (GString *str, const gchar *attr, CamelMimeMessage *message) @@ -2310,26 +2375,26 @@ static struct { AttribFormatter formatter; /* custom formatter */ } v; } attribvars[] = { - { "{Sender}", ATTRIB_CUSTOM, { NULL, format_sender } }, - { "{SenderName}", ATTRIB_CUSTOM, { NULL, format_sender } }, - { "{SenderEMail}", ATTRIB_CUSTOM, { NULL, format_sender } }, - { "{AbbrevWeekdayName}", ATTRIB_STRFTIME, { "%a", NULL } }, - { "{WeekdayName}", ATTRIB_STRFTIME, { "%A", NULL } }, - { "{AbbrevMonthName}", ATTRIB_STRFTIME, { "%b", NULL } }, - { "{MonthName}", ATTRIB_STRFTIME, { "%B", NULL } }, - { "{AmPmUpper}", ATTRIB_STRFTIME, { "%p", NULL } }, - { "{AmPmLower}", ATTRIB_STRFTIME, { "%P", NULL } }, - { "{Day}", ATTRIB_TM_MDAY, { "%02d", NULL } }, /* %d 01-31 */ - { "{ Day}", ATTRIB_TM_MDAY, { "% 2d", NULL } }, /* %e 1-31 */ - { "{24Hour}", ATTRIB_TM_24HOUR, { "%02d", NULL } }, /* %H 00-23 */ - { "{12Hour}", ATTRIB_TM_12HOUR, { "%02d", NULL } }, /* %I 00-12 */ - { "{DayOfYear}", ATTRIB_TM_YDAY, { "%d", NULL } }, /* %j 1-366 */ - { "{Month}", ATTRIB_TM_MON, { "%02d", NULL } }, /* %m 01-12 */ - { "{Minute}", ATTRIB_TM_MIN, { "%02d", NULL } }, /* %M 00-59 */ - { "{Seconds}", ATTRIB_TM_SEC, { "%02d", NULL } }, /* %S 00-61 */ - { "{2DigitYear}", ATTRIB_TM_2YEAR, { "%02d", NULL } }, /* %y */ - { "{Year}", ATTRIB_TM_YEAR, { "%04d", NULL } }, /* %Y */ - { "{TimeZone}", ATTRIB_TIMEZONE, { "%+05d", NULL } } + { "{Sender}", ATTRIB_CUSTOM, { NULL, format_sender } }, + { "{SenderName}", ATTRIB_CUSTOM, { NULL, format_sender } }, + { "{SenderEMail}", ATTRIB_CUSTOM, { NULL, format_sender } }, + { "{AbbrevWeekdayName}", ATTRIB_STRFTIME, { "%a", NULL } }, + { "{WeekdayName}", ATTRIB_STRFTIME, { "%A", NULL } }, + { "{AbbrevMonthName}", ATTRIB_STRFTIME, { "%b", NULL } }, + { "{MonthName}", ATTRIB_STRFTIME, { "%B", NULL } }, + { "{AmPmUpper}", ATTRIB_STRFTIME, { "%p", NULL } }, + { "{AmPmLower}", ATTRIB_STRFTIME, { "%P", NULL } }, + { "{Day}", ATTRIB_TM_MDAY, { "%02d", NULL } }, /* %d 01-31 */ + { "{ Day}", ATTRIB_TM_MDAY, { "% 2d", NULL } }, /* %e 1-31 */ + { "{24Hour}", ATTRIB_TM_24HOUR, { "%02d", NULL } }, /* %H 00-23 */ + { "{12Hour}", ATTRIB_TM_12HOUR, { "%02d", NULL } }, /* %I 00-12 */ + { "{DayOfYear}", ATTRIB_TM_YDAY, { "%d", NULL } }, /* %j 1-366 */ + { "{Month}", ATTRIB_TM_MON, { "%02d", NULL } }, /* %m 01-12 */ + { "{Minute}", ATTRIB_TM_MIN, { "%02d", NULL } }, /* %M 00-59 */ + { "{Seconds}", ATTRIB_TM_SEC, { "%02d", NULL } }, /* %S 00-61 */ + { "{2DigitYear}", ATTRIB_TM_2YEAR, { "%02d", NULL } }, /* %y */ + { "{Year}", ATTRIB_TM_YEAR, { "%04d", NULL } }, /* %Y */ + { "{TimeZone}", ATTRIB_TIMEZONE, { "%+05d", NULL } } }; static gchar * @@ -2482,7 +2547,9 @@ composer_set_body (EMsgComposer *composer, break; case E_MAIL_REPLY_STYLE_OUTLOOK: original = quoting_text (QUOTING_ORIGINAL); - text = em_utils_message_to_html (message, original, EM_FORMAT_QUOTE_HEADERS, source, start_bottom ? "<BR>" : NULL, &validity_found); + text = em_utils_message_to_html ( + message, original, EM_FORMAT_QUOTE_HEADERS, source, + start_bottom ? "<BR>" : NULL, &validity_found); e_msg_composer_set_body_text (composer, text, TRUE); has_body_text = text && *text; g_free (text); @@ -2494,7 +2561,9 @@ composer_set_body (EMsgComposer *composer, default: /* do what any sane user would want when replying... */ credits = attribution_format (message); - text = em_utils_message_to_html (message, credits, EM_FORMAT_QUOTE_CITE, source, start_bottom ? "<BR>" : NULL, &validity_found); + text = em_utils_message_to_html ( + message, credits, EM_FORMAT_QUOTE_CITE, source, + start_bottom ? "<BR>" : NULL, &validity_found); g_free (credits); e_msg_composer_set_body_text (composer, text, TRUE); has_body_text = text && *text; @@ -2511,7 +2580,8 @@ composer_set_body (EMsgComposer *composer, before the signature. We added there an empty line already. */ gtkhtml_editor_run_command (editor, "block-selection"); gtkhtml_editor_run_command (editor, "cursor-bod"); - if (gconf_client_get_bool (client, "/apps/evolution/mail/composer/top_signature", NULL) + if (gconf_client_get_bool ( + client, "/apps/evolution/mail/composer/top_signature", NULL) || !gtkhtml_editor_search_by_data (editor, 1, "ClueFlow", "signature", "1")) gtkhtml_editor_run_command (editor, "cursor-eod"); else @@ -2536,7 +2606,9 @@ em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source) gboolean start_bottom = 0; credits = attribution_format (message); - text = em_utils_message_to_html (message, credits, EM_FORMAT_QUOTE_CITE, source, start_bottom ? "<BR>" : NULL, NULL); + text = em_utils_message_to_html ( + message, credits, EM_FORMAT_QUOTE_CITE, source, + start_bottom ? "<BR>" : NULL, NULL); g_free (credits); return text; diff --git a/mail/em-filter-context.c b/mail/em-filter-context.c index f7756960ec..57d182a4eb 100644 --- a/mail/em-filter-context.c +++ b/mail/em-filter-context.c @@ -280,7 +280,8 @@ em_filter_context_class_init (EMFilterContextClass *class) static void em_filter_context_init (EMFilterContext *context) { - context->priv = G_TYPE_INSTANCE_GET_PRIVATE (context, EM_TYPE_FILTER_CONTEXT, EMFilterContextPrivate); + context->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + context, EM_TYPE_FILTER_CONTEXT, EMFilterContextPrivate); e_rule_context_add_part_set ( E_RULE_CONTEXT (context), diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c index 70c9da6aa6..59a44f1813 100644 --- a/mail/em-filter-folder-element.c +++ b/mail/em-filter-folder-element.c @@ -181,7 +181,9 @@ em_filter_folder_element_class_init (EMFilterFolderElementClass *class) static void em_filter_folder_element_init (EMFilterFolderElement *element) { - element->priv = G_TYPE_INSTANCE_GET_PRIVATE (element, EM_TYPE_FILTER_FOLDER_ELEMENT, EMFilterFolderElementPrivate); + element->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + element, EM_TYPE_FILTER_FOLDER_ELEMENT, + EMFilterFolderElementPrivate); } EFilterElement * diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c index e6b11c278f..d122868fc0 100644 --- a/mail/em-folder-selection-button.c +++ b/mail/em-folder-selection-button.c @@ -361,7 +361,9 @@ em_folder_selection_button_init (EMFolderSelectionButton *emfsb) { GtkWidget *box; - emfsb->priv = G_TYPE_INSTANCE_GET_PRIVATE (emfsb, EM_TYPE_FOLDER_SELECTION_BUTTON, EMFolderSelectionButtonPrivate); + emfsb->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + emfsb, EM_TYPE_FOLDER_SELECTION_BUTTON, + EMFolderSelectionButtonPrivate); emfsb->priv->multiple_select = FALSE; diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 6668eae77d..d95b7db5ef 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -529,7 +529,8 @@ em_folder_tree_model_init (EMFolderTreeModel *model) (GDestroyNotify) g_free, (GDestroyNotify) gtk_tree_row_reference_free); - model->priv = G_TYPE_INSTANCE_GET_PRIVATE (model, EM_TYPE_FOLDER_TREE_MODEL, EMFolderTreeModelPrivate); + model->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + model, EM_TYPE_FOLDER_TREE_MODEL, EMFolderTreeModelPrivate); model->priv->store_index = store_index; model->priv->uri_index = uri_index; diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index ee853331bf..81803b53a3 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1453,7 +1453,8 @@ folder_tree_init (EMFolderTree *folder_tree) select_uris_table = g_hash_table_new (g_str_hash, g_str_equal); - folder_tree->priv = G_TYPE_INSTANCE_GET_PRIVATE (folder_tree, EM_TYPE_FOLDER_TREE, EMFolderTreePrivate); + folder_tree->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + folder_tree, EM_TYPE_FOLDER_TREE, EMFolderTreePrivate); folder_tree->priv->select_uris_table = select_uris_table; tree_view = GTK_TREE_VIEW (folder_tree); @@ -2423,28 +2424,33 @@ tree_autoscroll (EMFolderTree *folder_tree) GtkTreeView *tree_view; GdkRectangle rect; GdkWindow *window; + gdouble value; gint offset, y; - /* get the y pointer position relative to the treeview */ + /* Get the y pointer position relative to the treeview. */ tree_view = GTK_TREE_VIEW (folder_tree); window = gtk_tree_view_get_bin_window (tree_view); gdk_window_get_pointer (window, NULL, &y, NULL); - /* rect is in coorinates relative to the scrolled window relative to the treeview */ + /* Rect is in coorinates relative to the scrolled window, + * relative to the treeview. */ gtk_tree_view_get_visible_rect (tree_view, &rect); - /* move y into the same coordinate system as rect */ + /* Move y into the same coordinate system as rect. */ y += rect.y; - /* see if we are near the top edge */ - if ((offset = y - (rect.y + 2 * SCROLL_EDGE_SIZE)) > 0) { - /* see if we are near the bottom edge */ - if ((offset = y - (rect.y + rect.height - 2 * SCROLL_EDGE_SIZE)) < 0) + /* See if we are near the top edge. */ + offset = y - (rect.y + 2 * SCROLL_EDGE_SIZE); + if (offset > 0) { + /* See if we are near the bottom edge. */ + offset = y - (rect.y + rect.height - 2 * SCROLL_EDGE_SIZE); + if (offset < 0) return TRUE; } adjustment = gtk_tree_view_get_vadjustment (tree_view); - gtk_adjustment_set_value (adjustment, MAX (gtk_adjustment_get_value (adjustment) + offset, 0.0)); + value = gtk_adjustment_get_value (adjustment); + gtk_adjustment_set_value (adjustment, MAX (value + offset, 0.0)); return TRUE; } diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 9d4ff55897..b0cb833c5f 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -679,7 +679,8 @@ efhd_init (EMFormatHTMLDisplay *efhd) web_view = em_format_html_get_web_view (EM_FORMAT_HTML (efhd)); - efhd->priv = G_TYPE_INSTANCE_GET_PRIVATE (efhd, EM_TYPE_FORMAT_HTML_DISPLAY, EMFormatHTMLDisplayPrivate); + efhd->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + efhd, EM_TYPE_FORMAT_HTML_DISPLAY, EMFormatHTMLDisplayPrivate); efhd->priv->attachment_views = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); e_mail_display_set_formatter ( diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 780a02a17a..a5f485eef7 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -938,7 +938,8 @@ efh_init (EMFormatHTML *efh, EWebView *web_view; GdkColor *color; - efh->priv = G_TYPE_INSTANCE_GET_PRIVATE (efh, EM_TYPE_FORMAT_HTML, EMFormatHTMLPrivate); + efh->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + efh, EM_TYPE_FORMAT_HTML, EMFormatHTMLPrivate); g_queue_init (&efh->pending_object_list); g_queue_init (&efh->priv->pending_jobs); diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c index 8b0400ffe0..99aa6f5247 100644 --- a/mail/em-subscription-editor.c +++ b/mail/em-subscription-editor.c @@ -1095,7 +1095,9 @@ em_subscription_editor_init (EMSubscriptionEditor *editor) GtkWidget *box; const gchar *tooltip; - editor->priv = G_TYPE_INSTANCE_GET_PRIVATE (editor, EM_TYPE_SUBSCRIPTION_EDITOR, EMSubscriptionEditorPrivate); + editor->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + editor, EM_TYPE_SUBSCRIPTION_EDITOR, + EMSubscriptionEditorPrivate); editor->priv->stores = g_ptr_array_new_with_free_func ( (GDestroyNotify) store_data_free); diff --git a/mail/em-utils.c b/mail/em-utils.c index 09692f0b1b..15008abd51 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -317,21 +317,28 @@ em_utils_edit_filters (GtkWidget *parent, em_filter_source_element_names[1].name = _("Outgoing"); } - filter_editor = (GtkWidget *) em_filter_editor_new (fc, em_filter_source_element_names); + filter_editor = (GtkWidget *) em_filter_editor_new ( + fc, em_filter_source_element_names); if (parent != NULL) gtk_window_set_transient_for ( GTK_WINDOW (filter_editor), GTK_WINDOW (parent)); - gtk_window_set_title (GTK_WINDOW (filter_editor), _("Message Filters")); - g_object_set_data_full ((GObject *) filter_editor, "context", fc, (GDestroyNotify) g_object_unref); - g_signal_connect (filter_editor, "response", G_CALLBACK (em_filter_editor_response), NULL); + gtk_window_set_title ( + GTK_WINDOW (filter_editor), _("Message Filters")); + g_object_set_data_full ( + G_OBJECT (filter_editor), "context", fc, + (GDestroyNotify) g_object_unref); + g_signal_connect ( + filter_editor, "response", + G_CALLBACK (em_filter_editor_response), NULL); gtk_widget_show (GTK_WIDGET (filter_editor)); } /* * Picked this from e-d-s/libedataserver/e-data. - * But it allows more characters to occur in filenames, especially when saving attachment. + * But it allows more characters to occur in filenames, especially + * when saving attachment. */ void em_filename_make_safe (gchar *string) @@ -491,7 +498,9 @@ exit: * @folder and @uids. **/ void -em_utils_flag_for_followup_clear (GtkWindow *parent, CamelFolder *folder, GPtrArray *uids) +em_utils_flag_for_followup_clear (GtkWindow *parent, + CamelFolder *folder, + GPtrArray *uids) { gint i; @@ -527,7 +536,9 @@ em_utils_flag_for_followup_clear (GtkWindow *parent, CamelFolder *folder, GPtrAr * Flag-for-Followup. **/ void -em_utils_flag_for_followup_completed (GtkWindow *parent, CamelFolder *folder, GPtrArray *uids) +em_utils_flag_for_followup_completed (GtkWindow *parent, + CamelFolder *folder, + GPtrArray *uids) { gchar *now; gint i; @@ -558,10 +569,13 @@ em_utils_flag_for_followup_completed (GtkWindow *parent, CamelFolder *folder, GP em_utils_uids_free (uids); } -/* This kind of sucks, because for various reasons most callers need to run synchronously - in the gui thread, however this could take a long, blocking time, to run */ +/* This kind of sucks, because for various reasons most callers need to run + * synchronously in the gui thread, however this could take a long, blocking + * time to run. */ static gint -em_utils_write_messages_to_stream (CamelFolder *folder, GPtrArray *uids, CamelStream *stream) +em_utils_write_messages_to_stream (CamelFolder *folder, + GPtrArray *uids, + CamelStream *stream) { CamelStream *filtered_stream; CamelMimeFilter *from_filter; @@ -585,13 +599,17 @@ em_utils_write_messages_to_stream (CamelFolder *folder, GPtrArray *uids, CamelSt break; } - /* we need to flush after each stream write since we are writing to the same stream */ + /* We need to flush after each stream write since we are + * writing to the same stream. */ from = camel_mime_message_build_mbox_from (message); if (camel_stream_write_string (stream, from, NULL, NULL) == -1 || camel_stream_flush (stream, NULL, NULL) == -1 - || camel_data_wrapper_write_to_stream_sync ((CamelDataWrapper *)message, (CamelStream *)filtered_stream, NULL, NULL) == -1 - || camel_stream_flush ((CamelStream *)filtered_stream, NULL, NULL) == -1) + || camel_data_wrapper_write_to_stream_sync ( + (CamelDataWrapper *) message, (CamelStream *) + filtered_stream, NULL, NULL) == -1 + || camel_stream_flush ( + (CamelStream *) filtered_stream, NULL, NULL) == -1) res = -1; g_free (from); @@ -606,10 +624,12 @@ em_utils_write_messages_to_stream (CamelFolder *folder, GPtrArray *uids, CamelSt return res; } -/* This kind of sucks, because for various reasons most callers need to run synchronously - in the gui thread, however this could take a long, blocking time, to run */ +/* This kind of sucks, because for various reasons most callers need to run + * synchronously in the gui thread, however this could take a long, blocking + * time to run. */ static gint -em_utils_read_messages_from_stream (CamelFolder *folder, CamelStream *stream) +em_utils_read_messages_from_stream (CamelFolder *folder, + CamelStream *stream) { CamelMimeParser *mp = camel_mime_parser_new (); gboolean success = TRUE; @@ -854,7 +874,9 @@ em_utils_selection_get_uidlist (GtkSelectionData *selection_data, * up when the application quits. **/ void -em_utils_selection_set_urilist (GtkSelectionData *data, CamelFolder *folder, GPtrArray *uids) +em_utils_selection_set_urilist (GtkSelectionData *data, + CamelFolder *folder, + GPtrArray *uids) { gchar *tmpdir; CamelStream *fstream; @@ -1301,7 +1323,8 @@ em_utils_message_to_html (CamelMimeMessage *message, /* FIXME: we should be getting this from the current view, not the global setting. */ gconf = gconf_client_get_default (); - charset = gconf_client_get_string (gconf, "/apps/evolution/mail/display/charset", NULL); + charset = gconf_client_get_string ( + gconf, "/apps/evolution/mail/display/charset", NULL); em_format_set_default_charset ((EMFormat *) emfq, charset); g_object_unref (gconf); g_free (charset); @@ -1367,7 +1390,9 @@ em_utils_empty_trash (GtkWidget *parent, g_return_if_fail (E_IS_MAIL_SESSION (session)); - if (!em_utils_prompt_user((GtkWindow *) parent, "/apps/evolution/mail/prompts/empty_trash", "mail:ask-empty-trash", NULL)) + if (!em_utils_prompt_user ((GtkWindow *) parent, + "/apps/evolution/mail/prompts/empty_trash", + "mail:ask-empty-trash", NULL)) return; accounts = e_get_account_list (); @@ -1647,11 +1672,15 @@ try_open_e_book (EBook *book, gboolean only_if_exists, GError **error) if (!e_book_open_async (book, only_if_exists, try_open_e_book_cb, &data)) { e_flag_free (flag); g_clear_error (error); - g_set_error (error, E_BOOK_ERROR, E_BOOK_ERROR_OTHER_ERROR, "Failed to call e_book_open_async."); + g_set_error ( + error, E_BOOK_ERROR, + E_BOOK_ERROR_OTHER_ERROR, + "Failed to call e_book_open_async."); return FALSE; } - while (canceled = camel_operation_cancel_check (NULL), !canceled && !e_flag_is_set (flag)) { + while (canceled = camel_operation_cancel_check (NULL), + !canceled && !e_flag_is_set (flag)) { GTimeVal wait; g_get_current_time (&wait); @@ -1662,9 +1691,13 @@ try_open_e_book (EBook *book, gboolean only_if_exists, GError **error) if (canceled) { g_clear_error (error); - g_set_error (error, E_BOOK_ERROR, E_BOOK_ERROR_CANCELLED, "Operation has been canceled."); - /* if the operation is cancelled sucessfully set the flag else wait. file, groupwise,.. backend's operations - are not cancellable */ + g_set_error ( + error, E_BOOK_ERROR, + E_BOOK_ERROR_CANCELLED, + "Operation has been canceled."); + /* if the operation is cancelled sucessfully set the flag + * else wait. file, groupwise,.. backend's operations + * are not cancellable */ if (e_book_cancel_async_op (book, NULL)) e_flag_set (flag); } @@ -1678,13 +1711,26 @@ try_open_e_book (EBook *book, gboolean only_if_exists, GError **error) #define NOT_FOUND_BOOK (GINT_TO_POINTER (1)) G_LOCK_DEFINE_STATIC (contact_cache); -static GHashTable *contact_cache = NULL; /* key is lowercased contact email; value is EBook pointer (just for comparison) where it comes from */ -static GHashTable *emu_books_hash = NULL; /* key is source ID; value is pointer to EBook */ -static GHashTable *emu_broken_books_hash = NULL; /* key is source ID; value is same pointer as key; this is hash of broken books, which failed to open for some reason */ + +/* key is lowercased contact email; value is EBook pointer + * (just for comparison) where it comes from */ +static GHashTable *contact_cache = NULL; + +/* key is source ID; value is pointer to EBook */ +static GHashTable *emu_books_hash = NULL; + +/* key is source ID; value is same pointer as key; this is hash of + * broken books, which failed to open for some reason */ +static GHashTable *emu_broken_books_hash = NULL; + static ESourceList *emu_books_source_list = NULL; static gboolean -search_address_in_addressbooks (const gchar *address, gboolean local_only, gboolean (*check_contact) (EContact *contact, gpointer user_data), gpointer user_data) +search_address_in_addressbooks (const gchar *address, + gboolean local_only, + gboolean (*check_contact) (EContact *contact, + gpointer user_data), + gpointer user_data) { gboolean found = FALSE, stop = FALSE, found_any = FALSE; gchar *lowercase_addr; @@ -1698,10 +1744,15 @@ search_address_in_addressbooks (const gchar *address, gboolean local_only, gbool G_LOCK (contact_cache); if (!emu_books_source_list) { - mail_call_main (MAIL_CALL_p_p, (MailMainFunc)emu_addr_setup, &emu_books_source_list); - emu_books_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); - emu_broken_books_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - contact_cache = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + mail_call_main ( + MAIL_CALL_p_p, (MailMainFunc) + emu_addr_setup, &emu_books_source_list); + emu_books_hash = g_hash_table_new_full ( + g_str_hash, g_str_equal, g_free, g_object_unref); + emu_broken_books_hash = g_hash_table_new_full ( + g_str_hash, g_str_equal, g_free, NULL); + contact_cache = g_hash_table_new_full ( + g_str_hash, g_str_equal, g_free, NULL); } if (!emu_books_source_list) { @@ -1725,7 +1776,9 @@ search_address_in_addressbooks (const gchar *address, gboolean local_only, gbool if (!group) continue; - if (local_only && !(e_source_group_peek_base_uri (group) && g_str_has_prefix (e_source_group_peek_base_uri (group), "local:"))) + if (local_only && !(e_source_group_peek_base_uri (group) && + g_str_has_prefix ( + e_source_group_peek_base_uri (group), "local:"))) continue; for (s = e_source_group_peek_sources (group); s; s = g_slist_next (s)) { @@ -1747,8 +1800,10 @@ search_address_in_addressbooks (const gchar *address, gboolean local_only, gbool GError *err = NULL; /* failed to load this book last time, skip it now */ - if (g_hash_table_lookup (emu_broken_books_hash, e_source_peek_uid (source)) != NULL) { - d(printf ("%s: skipping broken book '%s'\n", G_STRFUNC, e_source_peek_name (source))); + if (g_hash_table_lookup (emu_broken_books_hash, + e_source_peek_uid (source)) != NULL) { + d(printf ("%s: skipping broken book '%s'\n", + G_STRFUNC, e_source_peek_name (source))); continue; } @@ -1769,7 +1824,10 @@ search_address_in_addressbooks (const gchar *address, gboolean local_only, gbool g_hash_table_insert (emu_broken_books_hash, source_uid, source_uid); - g_warning ("%s: Unable to create addressbook '%s': %s", G_STRFUNC, e_source_peek_name (source), err->message); + g_warning ( + "%s: Unable to create addressbook '%s': %s", + G_STRFUNC, e_source_peek_name (source), + err->message); } g_clear_error (&err); } else if (!stop && !try_open_e_book (book, TRUE, &err)) { @@ -1783,7 +1841,10 @@ search_address_in_addressbooks (const gchar *address, gboolean local_only, gbool g_hash_table_insert (emu_broken_books_hash, source_uid, source_uid); - g_warning ("%s: Unable to open addressbook '%s': %s", G_STRFUNC, e_source_peek_name (source), err->message); + g_warning ( + "%s: Unable to open addressbook '%s': %s", + G_STRFUNC, e_source_peek_name (source), + err->message); } g_clear_error (&err); } @@ -1820,7 +1881,10 @@ search_address_in_addressbooks (const gchar *address, gboolean local_only, gbool g_hash_table_insert (emu_broken_books_hash, source_uid, source_uid); - g_warning ("%s: Can't get contacts from '%s': %s", G_STRFUNC, e_source_peek_name (source), err->message); + g_warning ( + "%s: Can't get contacts from '%s': %s", + G_STRFUNC, e_source_peek_name (source), + err->message); } g_clear_error (&err); } @@ -1937,7 +2001,8 @@ em_utils_contact_photo (CamelInternetAddress *cia, gboolean local_only) } /* !p means the address had not been found in the cache */ - if (!p && search_address_in_addressbooks (addr, local_only, extract_photo_data, &photo)) { + if (!p && search_address_in_addressbooks ( + addr, local_only, extract_photo_data, &photo)) { PhotoInfo *pi; if (photo && photo->type != E_CONTACT_PHOTO_TYPE_INLINED) { @@ -2034,7 +2099,8 @@ emu_remove_from_mail_cache_1 (const gchar *address) g_slist_free (l); } -/* frees all data created by call of em_utils_in_addressbook or em_utils_contact_photo */ +/* frees all data created by call of em_utils_in_addressbook() or + * em_utils_contact_photo() */ void emu_free_mail_cache (void) { @@ -2190,7 +2256,10 @@ em_utils_generate_account_hash (void) } if (!acnt) - g_hash_table_insert (account_hash, (gchar *) account->id->address, (gpointer) account); + g_hash_table_insert ( + account_hash, (gchar *) + account->id->address, + (gpointer) account); } e_iterator_next (iter); diff --git a/mail/em-vfolder-context.c b/mail/em-vfolder-context.c index d59715b78d..5f78da434a 100644 --- a/mail/em-vfolder-context.c +++ b/mail/em-vfolder-context.c @@ -171,7 +171,8 @@ em_vfolder_context_class_init (EMVFolderContextClass *class) static void em_vfolder_context_init (EMVFolderContext *context) { - context->priv = G_TYPE_INSTANCE_GET_PRIVATE (context, EM_TYPE_VFOLDER_CONTEXT, EMVFolderContextPrivate); + context->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + context, EM_TYPE_VFOLDER_CONTEXT, EMVFolderContextPrivate); e_rule_context_add_part_set ( E_RULE_CONTEXT (context), "partset", E_TYPE_FILTER_PART, diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index a1b7f53be7..22c0690c79 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -193,7 +193,8 @@ em_vfolder_rule_class_init (EMVFolderRuleClass *class) static void em_vfolder_rule_init (EMVFolderRule *rule) { - rule->priv = G_TYPE_INSTANCE_GET_PRIVATE (rule, EM_TYPE_VFOLDER_RULE, EMVFolderRulePrivate); + rule->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + rule, EM_TYPE_VFOLDER_RULE, EMVFolderRulePrivate); rule->with = EM_VFOLDER_RULE_WITH_SPECIFIC; rule->rule.source = g_strdup ("incoming"); diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index e7563ced8b..06acae76ec 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -1050,7 +1050,8 @@ mail_folder_cache_init (MailFolderCache *self) const gchar *buf; guint timeout; - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, MAIL_TYPE_FOLDER_CACHE, MailFolderCachePrivate); + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + self, MAIL_TYPE_FOLDER_CACHE, MailFolderCachePrivate); /* initialize values */ self->priv->stores = g_hash_table_new (NULL, NULL); diff --git a/mail/message-list.c b/mail/message-list.c index 64b530d798..7aad12b6c8 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -2464,7 +2464,8 @@ message_list_init (MessageList *message_list) GtkTargetList *target_list; GdkAtom matom; - message_list->priv = G_TYPE_INSTANCE_GET_PRIVATE (message_list, MESSAGE_LIST_TYPE, MessageListPrivate); + message_list->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + message_list, MESSAGE_LIST_TYPE, MessageListPrivate); #if HAVE_CLUTTER message_list->priv->timeline = NULL; diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c index cf9011a021..4de5d1ecf9 100644 --- a/modules/addressbook/e-book-shell-backend.c +++ b/modules/addressbook/e-book-shell-backend.c @@ -551,7 +551,9 @@ book_shell_backend_class_init (EBookShellBackendClass *class) static void book_shell_backend_init (EBookShellBackend *book_shell_backend) { - book_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (book_shell_backend, E_TYPE_BOOK_SHELL_BACKEND, EBookShellBackendPrivate); + book_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + book_shell_backend, E_TYPE_BOOK_SHELL_BACKEND, + EBookShellBackendPrivate); } GType diff --git a/modules/addressbook/e-book-shell-content.c b/modules/addressbook/e-book-shell-content.c index 2077510056..4f3905181e 100644 --- a/modules/addressbook/e-book-shell-content.c +++ b/modules/addressbook/e-book-shell-content.c @@ -452,7 +452,9 @@ book_shell_content_class_init (EBookShellContentClass *class) static void book_shell_content_init (EBookShellContent *book_shell_content) { - book_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (book_shell_content, E_TYPE_BOOK_SHELL_CONTENT, EBookShellContentPrivate); + book_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + book_shell_content, E_TYPE_BOOK_SHELL_CONTENT, + EBookShellContentPrivate); /* Postpone widget construction until we have a shell view. */ } diff --git a/modules/addressbook/e-book-shell-sidebar.c b/modules/addressbook/e-book-shell-sidebar.c index 57f3b288df..55055638c7 100644 --- a/modules/addressbook/e-book-shell-sidebar.c +++ b/modules/addressbook/e-book-shell-sidebar.c @@ -200,7 +200,9 @@ book_shell_sidebar_class_init (EBookShellSidebarClass *class) static void book_shell_sidebar_init (EBookShellSidebar *book_shell_sidebar) { - book_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (book_shell_sidebar, E_TYPE_BOOK_SHELL_SIDEBAR, EBookShellSidebarPrivate); + book_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + book_shell_sidebar, E_TYPE_BOOK_SHELL_SIDEBAR, + EBookShellSidebarPrivate); /* Postpone widget construction until we have a shell view. */ } diff --git a/modules/addressbook/e-book-shell-view.c b/modules/addressbook/e-book-shell-view.c index 777793ad45..4f0d349ba6 100644 --- a/modules/addressbook/e-book-shell-view.c +++ b/modules/addressbook/e-book-shell-view.c @@ -414,7 +414,9 @@ static void book_shell_view_init (EBookShellView *book_shell_view, EShellViewClass *shell_view_class) { - book_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (book_shell_view, E_TYPE_BOOK_SHELL_VIEW, EBookShellViewPrivate); + book_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + book_shell_view, E_TYPE_BOOK_SHELL_VIEW, + EBookShellViewPrivate); e_book_shell_view_private_init (book_shell_view, shell_view_class); } diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c index 25677877fc..14c9efbe4d 100644 --- a/modules/calendar/e-cal-attachment-handler.c +++ b/modules/calendar/e-cal-attachment-handler.c @@ -488,7 +488,9 @@ cal_attachment_handler_class_init (ECalAttachmentHandlerClass *class) static void cal_attachment_handler_init (ECalAttachmentHandler *handler) { - handler->priv = G_TYPE_INSTANCE_GET_PRIVATE (handler, E_TYPE_CAL_ATTACHMENT_HANDLER, ECalAttachmentHandlerPrivate); + handler->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + handler, E_TYPE_CAL_ATTACHMENT_HANDLER, + ECalAttachmentHandlerPrivate); } GType diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index b9cb894c50..d0f97caae2 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -796,7 +796,9 @@ cal_shell_backend_init (ECalShellBackend *cal_shell_backend) icalarray *builtin_timezones; gint ii; - cal_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (cal_shell_backend, E_TYPE_CAL_SHELL_BACKEND, ECalShellBackendPrivate); + cal_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + cal_shell_backend, E_TYPE_CAL_SHELL_BACKEND, + ECalShellBackendPrivate); /* XXX Pre-load all built-in timezones in libical. * diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c index 1fbedd22b1..e35057bacb 100644 --- a/modules/calendar/e-cal-shell-content.c +++ b/modules/calendar/e-cal-shell-content.c @@ -620,7 +620,9 @@ cal_shell_content_class_init (ECalShellContentClass *class) static void cal_shell_content_init (ECalShellContent *cal_shell_content) { - cal_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (cal_shell_content, E_TYPE_CAL_SHELL_CONTENT, ECalShellContentPrivate); + cal_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + cal_shell_content, E_TYPE_CAL_SHELL_CONTENT, + ECalShellContentPrivate); /* Postpone widget construction until we have a shell view. */ } diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c index 21c630b549..9f9bc454e1 100644 --- a/modules/calendar/e-cal-shell-sidebar.c +++ b/modules/calendar/e-cal-shell-sidebar.c @@ -845,7 +845,9 @@ cal_shell_sidebar_init (ECalShellSidebar *cal_shell_sidebar) (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref); - cal_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (cal_shell_sidebar, E_TYPE_CAL_SHELL_SIDEBAR, ECalShellSidebarPrivate); + cal_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + cal_shell_sidebar, E_TYPE_CAL_SHELL_SIDEBAR, + ECalShellSidebarPrivate); cal_shell_sidebar->priv->client_table = client_table; diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c index 72ce261a6a..ce2e258441 100644 --- a/modules/calendar/e-cal-shell-view.c +++ b/modules/calendar/e-cal-shell-view.c @@ -517,7 +517,8 @@ static void cal_shell_view_init (ECalShellView *cal_shell_view, EShellViewClass *shell_view_class) { - cal_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (cal_shell_view, E_TYPE_CAL_SHELL_VIEW, ECalShellViewPrivate); + cal_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + cal_shell_view, E_TYPE_CAL_SHELL_VIEW, ECalShellViewPrivate); e_cal_shell_view_private_init (cal_shell_view, shell_view_class); } diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c index 5c02cdd98a..488f300340 100644 --- a/modules/calendar/e-memo-shell-backend.c +++ b/modules/calendar/e-memo-shell-backend.c @@ -559,7 +559,9 @@ memo_shell_backend_class_init (EMemoShellBackendClass *class) static void memo_shell_backend_init (EMemoShellBackend *memo_shell_backend) { - memo_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (memo_shell_backend, E_TYPE_MEMO_SHELL_BACKEND, EMemoShellBackendPrivate); + memo_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + memo_shell_backend, E_TYPE_MEMO_SHELL_BACKEND, + EMemoShellBackendPrivate); } GType diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c index 37e96fe47a..bbf12de7db 100644 --- a/modules/calendar/e-memo-shell-content.c +++ b/modules/calendar/e-memo-shell-content.c @@ -655,7 +655,9 @@ memo_shell_content_class_init (EMemoShellContentClass *class) static void memo_shell_content_init (EMemoShellContent *memo_shell_content) { - memo_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (memo_shell_content, E_TYPE_MEMO_SHELL_CONTENT, EMemoShellContentPrivate); + memo_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + memo_shell_content, E_TYPE_MEMO_SHELL_CONTENT, + EMemoShellContentPrivate); /* Postpone widget construction until we have a shell view. */ } diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c index 4c9e2544ba..4ad5d44ded 100644 --- a/modules/calendar/e-memo-shell-sidebar.c +++ b/modules/calendar/e-memo-shell-sidebar.c @@ -741,7 +741,9 @@ memo_shell_sidebar_init (EMemoShellSidebar *memo_shell_sidebar) (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref); - memo_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (memo_shell_sidebar, E_TYPE_MEMO_SHELL_SIDEBAR, EMemoShellSidebarPrivate); + memo_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + memo_shell_sidebar, E_TYPE_MEMO_SHELL_SIDEBAR, + EMemoShellSidebarPrivate); memo_shell_sidebar->priv->client_table = client_table; diff --git a/modules/calendar/e-memo-shell-view.c b/modules/calendar/e-memo-shell-view.c index 4cef169ae8..d0986e7a17 100644 --- a/modules/calendar/e-memo-shell-view.c +++ b/modules/calendar/e-memo-shell-view.c @@ -302,7 +302,9 @@ static void memo_shell_view_init (EMemoShellView *memo_shell_view, EShellViewClass *shell_view_class) { - memo_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (memo_shell_view, E_TYPE_MEMO_SHELL_VIEW, EMemoShellViewPrivate); + memo_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + memo_shell_view, E_TYPE_MEMO_SHELL_VIEW, + EMemoShellViewPrivate); e_memo_shell_view_private_init (memo_shell_view, shell_view_class); } diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c index 9d85dc87b8..193f3bea23 100644 --- a/modules/calendar/e-task-shell-backend.c +++ b/modules/calendar/e-task-shell-backend.c @@ -564,7 +564,9 @@ task_shell_backend_class_init (ETaskShellBackendClass *class) static void task_shell_backend_init (ETaskShellBackend *task_shell_backend) { - task_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (task_shell_backend, E_TYPE_TASK_SHELL_BACKEND, ETaskShellBackendPrivate); + task_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + task_shell_backend, E_TYPE_TASK_SHELL_BACKEND, + ETaskShellBackendPrivate); } GType diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c index 78680bc307..f2d10e4a4d 100644 --- a/modules/calendar/e-task-shell-content.c +++ b/modules/calendar/e-task-shell-content.c @@ -676,7 +676,9 @@ task_shell_content_class_init (ETaskShellContentClass *class) static void task_shell_content_init (ETaskShellContent *task_shell_content) { - task_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (task_shell_content, E_TYPE_TASK_SHELL_CONTENT, ETaskShellContentPrivate); + task_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + task_shell_content, E_TYPE_TASK_SHELL_CONTENT, + ETaskShellContentPrivate); /* Postpone widget construction until we have a shell view. */ } diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c index 99df3b6ab5..f152acf976 100644 --- a/modules/calendar/e-task-shell-sidebar.c +++ b/modules/calendar/e-task-shell-sidebar.c @@ -741,7 +741,9 @@ task_shell_sidebar_init (ETaskShellSidebar *task_shell_sidebar) (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref); - task_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (task_shell_sidebar, E_TYPE_TASK_SHELL_SIDEBAR, ETaskShellSidebarPrivate); + task_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + task_shell_sidebar, E_TYPE_TASK_SHELL_SIDEBAR, + ETaskShellSidebarPrivate); task_shell_sidebar->priv->client_table = client_table; diff --git a/modules/calendar/e-task-shell-view.c b/modules/calendar/e-task-shell-view.c index e4b5e03a5b..76410b3184 100644 --- a/modules/calendar/e-task-shell-view.c +++ b/modules/calendar/e-task-shell-view.c @@ -467,7 +467,9 @@ static void task_shell_view_init (ETaskShellView *task_shell_view, EShellViewClass *shell_view_class) { - task_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (task_shell_view, E_TYPE_TASK_SHELL_VIEW, ETaskShellViewPrivate); + task_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + task_shell_view, E_TYPE_TASK_SHELL_VIEW, + ETaskShellViewPrivate); e_task_shell_view_private_init (task_shell_view, shell_view_class); } diff --git a/modules/connman/evolution-connman.c b/modules/connman/evolution-connman.c index 30155c9ed3..184ad23fdd 100644 --- a/modules/connman/evolution-connman.c +++ b/modules/connman/evolution-connman.c @@ -60,7 +60,10 @@ extension_set_state (EConnMan *extension, const gchar *state) } static void -cm_connection_closed_cb (GDBusConnection *pconnection, gboolean remote_peer_vanished, GError *error, gpointer user_data) +cm_connection_closed_cb (GDBusConnection *pconnection, + gboolean remote_peer_vanished, + GError *error, + gpointer user_data) { EConnMan *extension = user_data; @@ -105,7 +108,8 @@ connman_check_initial_state (EConnMan *extension) /* XXX Assuming this should be safe to call synchronously. */ response = g_dbus_connection_send_message_with_reply_sync ( - extension->connection, message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, 100, NULL, NULL, &error); + extension->connection, message, + G_DBUS_SEND_MESSAGE_FLAGS_NONE, 100, NULL, NULL, &error); if (response != NULL) { gchar *state = NULL; @@ -162,7 +166,9 @@ network_manager_connect (EConnMan *extension) goto fail; } - g_signal_connect (extension->connection, "closed", G_CALLBACK (cm_connection_closed_cb), extension); + g_signal_connect ( + extension->connection, "closed", + G_CALLBACK (cm_connection_closed_cb), extension); connman_check_initial_state (extension); diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c index 7f51274a5c..70ef327aaf 100644 --- a/modules/mail/e-mail-attachment-handler.c +++ b/modules/mail/e-mail-attachment-handler.c @@ -565,7 +565,9 @@ mail_attachment_handler_class_init (EMailAttachmentHandlerClass *class) static void mail_attachment_handler_init (EMailAttachmentHandler *handler) { - handler->priv = G_TYPE_INSTANCE_GET_PRIVATE (handler, E_TYPE_MAIL_ATTACHMENT_HANDLER, EMailAttachmentHandlerPrivate); + handler->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + handler, E_TYPE_MAIL_ATTACHMENT_HANDLER, + EMailAttachmentHandlerPrivate); } GType diff --git a/modules/mail/e-mail-junk-hook.c b/modules/mail/e-mail-junk-hook.c index 5ee982f27f..ac5919597b 100644 --- a/modules/mail/e-mail-junk-hook.c +++ b/modules/mail/e-mail-junk-hook.c @@ -298,7 +298,8 @@ mail_junk_hook_init (EMailJunkHook *mail_junk_hook) { EMJunkInterface *interface; - mail_junk_hook->priv = G_TYPE_INSTANCE_GET_PRIVATE (mail_junk_hook, E_TYPE_MAIL_JUNK_HOOK, EMailJunkHookPrivate); + mail_junk_hook->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + mail_junk_hook, E_TYPE_MAIL_JUNK_HOOK, EMailJunkHookPrivate); interface = &mail_junk_hook->priv->interface; interface->camel.get_name = mail_junk_hook_get_name; diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index d30dd2efda..af4af565f7 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -702,7 +702,9 @@ mail_shell_backend_class_init (EMailShellBackendClass *class) static void mail_shell_backend_init (EMailShellBackend *mail_shell_backend) { - mail_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (mail_shell_backend, E_TYPE_MAIL_SHELL_BACKEND, EMailShellBackendPrivate); + mail_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + mail_shell_backend, E_TYPE_MAIL_SHELL_BACKEND, + EMailShellBackendPrivate); } GType diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c index d367994086..c3b6cf978b 100644 --- a/modules/mail/e-mail-shell-content.c +++ b/modules/mail/e-mail-shell-content.c @@ -440,7 +440,9 @@ mail_shell_content_class_init (EMailShellContentClass *class) static void mail_shell_content_init (EMailShellContent *mail_shell_content) { - mail_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (mail_shell_content, E_TYPE_MAIL_SHELL_CONTENT, EMailShellContentPrivate); + mail_shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + mail_shell_content, E_TYPE_MAIL_SHELL_CONTENT, + EMailShellContentPrivate); /* Postpone widget construction until we have a shell view. */ } diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c index 5e5e515a9a..c910310010 100644 --- a/modules/mail/e-mail-shell-sidebar.c +++ b/modules/mail/e-mail-shell-sidebar.c @@ -332,7 +332,9 @@ mail_shell_sidebar_class_init (EMailShellSidebarClass *class) static void mail_shell_sidebar_init (EMailShellSidebar *mail_shell_sidebar) { - mail_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (mail_shell_sidebar, E_TYPE_MAIL_SHELL_SIDEBAR, EMailShellSidebarPrivate); + mail_shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + mail_shell_sidebar, E_TYPE_MAIL_SHELL_SIDEBAR, + EMailShellSidebarPrivate); /* Postpone widget construction until we have a shell view. */ } diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index c808ea3d7a..0c7feba0cf 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -1059,7 +1059,9 @@ static void mail_shell_view_init (EMailShellView *mail_shell_view, EShellViewClass *shell_view_class) { - mail_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (mail_shell_view, E_TYPE_MAIL_SHELL_VIEW, EMailShellViewPrivate); + mail_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + mail_shell_view, E_TYPE_MAIL_SHELL_VIEW, + EMailShellViewPrivate); e_mail_shell_view_private_init (mail_shell_view, shell_view_class); } diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c index 378207c365..79d64eaf3e 100644 --- a/modules/mail/em-account-prefs.c +++ b/modules/mail/em-account-prefs.c @@ -360,7 +360,8 @@ em_account_prefs_init (EMAccountPrefs *prefs) EAccountManager *manager; EAccountTreeView *tree_view; - prefs->priv = G_TYPE_INSTANCE_GET_PRIVATE (prefs, EM_TYPE_ACCOUNT_PREFS, EMAccountPrefsPrivate); + prefs->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + prefs, EM_TYPE_ACCOUNT_PREFS, EMAccountPrefsPrivate); manager = E_ACCOUNT_MANAGER (prefs); tree_view = e_account_manager_get_tree_view (manager); diff --git a/modules/plugin-mono/e-plugin-mono.c b/modules/plugin-mono/e-plugin-mono.c index 8fc3fc02c1..d09cf1bb56 100644 --- a/modules/plugin-mono/e-plugin-mono.c +++ b/modules/plugin-mono/e-plugin-mono.c @@ -230,7 +230,8 @@ plugin_mono_init (EPluginMono *plugin_mono) (GDestroyNotify) g_free, (GDestroyNotify) NULL); - plugin_mono->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin_mono, E_TYPE_PLUGIN_MONO, EPluginMonoPrivate); + plugin_mono->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + plugin_mono, E_TYPE_PLUGIN_MONO, EPluginMonoPrivate); plugin_mono->priv->methods = methods; } diff --git a/modules/plugin-python/e-plugin-python.c b/modules/plugin-python/e-plugin-python.c index 2cbee6512f..c4bb9e6c13 100644 --- a/modules/plugin-python/e-plugin-python.c +++ b/modules/plugin-python/e-plugin-python.c @@ -193,7 +193,8 @@ plugin_python_init (EPluginPython *plugin_python) (GDestroyNotify) g_free, (GDestroyNotify) NULL); - plugin_python->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin_python, E_TYPE_PLUGIN_PYTHON, EPluginPythonPrivate); + plugin_python->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + plugin_python, E_TYPE_PLUGIN_PYTHON, EPluginPythonPrivate); plugin_python->priv->methods = methods; } diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c index ca6fc1fd99..f4dd0506d5 100644 --- a/plugins/dbx-import/dbx-importer.c +++ b/plugins/dbx-import/dbx-importer.c @@ -81,13 +81,26 @@ #define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0) #endif -gboolean org_gnome_evolution_readdbx_supported (EPlugin *epl, EImportTarget *target); -GtkWidget *org_gnome_evolution_readdbx_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im); -void org_gnome_evolution_readdbx_import (EImport *ei, EImportTarget *target, EImportImporter *im); -void org_gnome_evolution_readdbx_cancel (EImport *ei, EImportTarget *target, EImportImporter *im); -gint e_plugin_lib_enable (EPlugin *ep, gint enable); - -/* em-folder-selection-button.h is private, even though other internal evo plugins use it! +gboolean org_gnome_evolution_readdbx_supported + (EPlugin *epl, + EImportTarget *target); +GtkWidget * org_gnome_evolution_readdbx_getwidget + (EImport *ei, + EImportTarget *target, + EImportImporter *im); +void org_gnome_evolution_readdbx_import + (EImport *ei, + EImportTarget *target, + EImportImporter *im); +void org_gnome_evolution_readdbx_cancel + (EImport *ei, + EImportTarget *target, + EImportImporter *im); +gint e_plugin_lib_enable (EPlugin *ep, + gint enable); + +/* em-folder-selection-button.h is private, even though other internal + * evo plugins use it! so declare the functions here TODO: sort out whether this should really be private */ @@ -184,7 +197,9 @@ folder_selected (EMFolderSelectionButton *button, EImportTargetURI *target) } GtkWidget * -org_gnome_evolution_readdbx_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im) +org_gnome_evolution_readdbx_getwidget (EImport *ei, + EImportTarget *target, + EImportImporter *im) { EShell *shell; EShellBackend *shell_backend; @@ -330,7 +345,8 @@ static gboolean dbx_load_index_table (DbxImporter *m, guint32 pos, guint32 *inde return FALSE; } - d(printf("Index at %x: indexCount %x, anotherTablePtr %x\n", pos, tindex.indexCount, tindex.anotherTablePtr)); + d(printf("Index at %x: indexCount %x, anotherTablePtr %x\n", + pos, tindex.indexCount, tindex.anotherTablePtr)); if (tindex.indexCount > 0) { if (!dbx_load_index_table (m, tindex.anotherTablePtr, index_ofs)) @@ -454,7 +470,8 @@ dbx_read_mail_body (DbxImporter *m, guint32 offset, gint bodyfd) buffer = g_malloc (buflen); } d(printf("Reading %d bytes from %lx\n", hdr.blocksize, offset + sizeof(hdr))); - if (dbx_pread (m->dbx_fd, buffer, hdr.blocksize, offset + sizeof (hdr)) != hdr.blocksize) { + if (dbx_pread (m->dbx_fd, buffer, hdr.blocksize, + offset + sizeof (hdr)) != hdr.blocksize) { g_set_error ( &m->base.error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, @@ -560,7 +577,9 @@ dbx_import_file (DbxImporter *m) gint missing = 0; m->status_what = NULL; filename = g_filename_from_uri (((EImportTargetURI *)m->target)->uri_src, NULL, NULL); - m->parent_uri = g_strdup (((EImportTargetURI *)m->target)->uri_dest); /* Destination folder, was set in our widget */ + + /* Destination folder, was set in our widget */ + m->parent_uri = g_strdup (((EImportTargetURI *)m->target)->uri_dest); cancellable = e_activity_get_cancellable (m->base.activity); @@ -727,7 +746,9 @@ dbx_status_timeout (gpointer data) pc = importer->status_pc; g_mutex_unlock (importer->status_lock); - e_import_status (importer->target->import, (EImportTarget *)importer->target, what, pc); + e_import_status ( + importer->target->import, + (EImportTarget *) importer->target, what, pc); } return TRUE; @@ -747,7 +768,9 @@ dbx_status (CamelOperation *op, const gchar *what, gint pc, gpointer data) /* Start the main import operation */ void -org_gnome_evolution_readdbx_import (EImport *ei, EImportTarget *target, EImportImporter *im) +org_gnome_evolution_readdbx_import (EImport *ei, + EImportTarget *target, + EImportImporter *im) { DbxImporter *m; @@ -774,7 +797,9 @@ org_gnome_evolution_readdbx_import (EImport *ei, EImportTarget *target, EImportI } void -org_gnome_evolution_readdbx_cancel (EImport *ei, EImportTarget *target, EImportImporter *im) +org_gnome_evolution_readdbx_cancel (EImport *ei, + EImportTarget *target, + EImportImporter *im) { DbxImporter *m = g_datalist_get_data (&target->data, "dbx-msg"); diff --git a/shell/e-shell-backend.c b/shell/e-shell-backend.c index 03acc0ef04..b1dadce99d 100644 --- a/shell/e-shell-backend.c +++ b/shell/e-shell-backend.c @@ -290,7 +290,8 @@ e_shell_backend_class_init (EShellBackendClass *class) static void e_shell_backend_init (EShellBackend *shell_backend) { - shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_backend, E_TYPE_SHELL_BACKEND, EShellBackendPrivate); + shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + shell_backend, E_TYPE_SHELL_BACKEND, EShellBackendPrivate); shell_backend->priv->activities = g_queue_new (); } diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c index 96e56f75a9..91a6d1f69b 100644 --- a/shell/e-shell-content.c +++ b/shell/e-shell-content.c @@ -466,7 +466,8 @@ e_shell_content_alert_sink_init (EAlertSinkInterface *interface) static void e_shell_content_init (EShellContent *shell_content) { - shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_content, E_TYPE_SHELL_CONTENT, EShellContentPrivate); + shell_content->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + shell_content, E_TYPE_SHELL_CONTENT, EShellContentPrivate); gtk_widget_set_has_window (GTK_WIDGET (shell_content), FALSE); } diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c index 01b3f9f10e..fbcd701bea 100644 --- a/shell/e-shell-migrate.c +++ b/shell/e-shell-migrate.c @@ -819,14 +819,16 @@ merge_duplicate_local_sources (GConfClient *client, const gchar *gconf_key) } /* merging respective sources */ - for (sources = e_source_group_peek_sources (group); sources; sources = sources->next) { + for (sources = e_source_group_peek_sources (group); + sources != NULL; sources = sources->next) { GSList *liter; ESource *dupe_source = sources->data; if (!dupe_source) continue; - for (liter = e_source_group_peek_sources (first_local); liter != NULL; liter = liter->next) { + for (liter = e_source_group_peek_sources (first_local); + liter != NULL; liter = liter->next) { ESource *my_source = liter->data; const gchar *val1, *val2; diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c index 97349f9b89..7a0f3c7d42 100644 --- a/shell/e-shell-searchbar.c +++ b/shell/e-shell-searchbar.c @@ -909,7 +909,8 @@ e_shell_searchbar_init (EShellSearchbar *searchbar) GtkLabel *label; GtkWidget *widget; - searchbar->priv = G_TYPE_INSTANCE_GET_PRIVATE (searchbar, E_TYPE_SHELL_SEARCHBAR, EShellSearchbarPrivate); + searchbar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + searchbar, E_TYPE_SHELL_SEARCHBAR, EShellSearchbarPrivate); gtk_box_set_spacing (GTK_BOX (searchbar), 24); diff --git a/shell/e-shell-settings.c b/shell/e-shell-settings.c index c8a507e630..e43139acb4 100644 --- a/shell/e-shell-settings.c +++ b/shell/e-shell-settings.c @@ -256,7 +256,8 @@ shell_settings_init (EShellSettings *shell_settings, value_array = g_array_new (FALSE, TRUE, sizeof (GValue)); g_array_set_size (value_array, property_count); - shell_settings->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_settings, E_TYPE_SHELL_SETTINGS, EShellSettingsPrivate); + shell_settings->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + shell_settings, E_TYPE_SHELL_SETTINGS, EShellSettingsPrivate); shell_settings->priv->value_array = value_array; g_object_freeze_notify (G_OBJECT (shell_settings)); diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c index 1a9f7d7c22..d99e66ac61 100644 --- a/shell/e-shell-sidebar.c +++ b/shell/e-shell-sidebar.c @@ -397,7 +397,8 @@ e_shell_sidebar_init (EShellSidebar *shell_sidebar) const GdkColor *color; const gchar *icon_name; - shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_sidebar, E_TYPE_SHELL_SIDEBAR, EShellSidebarPrivate); + shell_sidebar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + shell_sidebar, E_TYPE_SHELL_SIDEBAR, EShellSidebarPrivate); gtk_widget_set_has_window (GTK_WIDGET (shell_sidebar), FALSE); diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c index b1d896dee0..594862df8a 100644 --- a/shell/e-shell-switcher.c +++ b/shell/e-shell-switcher.c @@ -547,7 +547,8 @@ e_shell_switcher_class_init (EShellSwitcherClass *class) static void e_shell_switcher_init (EShellSwitcher *switcher) { - switcher->priv = G_TYPE_INSTANCE_GET_PRIVATE (switcher, E_TYPE_SHELL_SWITCHER, EShellSwitcherPrivate); + switcher->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + switcher, E_TYPE_SHELL_SWITCHER, EShellSwitcherPrivate); gtk_widget_set_has_window (GTK_WIDGET (switcher), FALSE); diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c index f4621fc780..c424d504c8 100644 --- a/shell/e-shell-taskbar.c +++ b/shell/e-shell-taskbar.c @@ -326,7 +326,8 @@ e_shell_taskbar_init (EShellTaskbar *shell_taskbar) GtkWidget *widget; gint height; - shell_taskbar->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_taskbar, E_TYPE_SHELL_TASKBAR, EShellTaskbarPrivate); + shell_taskbar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + shell_taskbar, E_TYPE_SHELL_TASKBAR, EShellTaskbarPrivate); shell_taskbar->priv->proxy_table = g_hash_table_new (NULL, NULL); gtk_box_set_spacing (GTK_BOX (shell_taskbar), 12); diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 379b5ab528..43d843108d 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -1078,7 +1078,8 @@ e_shell_view_init (EShellView *shell_view, size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL); - shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_view, E_TYPE_SHELL_VIEW, EShellViewPrivate); + shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + shell_view, E_TYPE_SHELL_VIEW, EShellViewPrivate); shell_view->priv->state_key_file = g_key_file_new (); shell_view->priv->size_group = size_group; } diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index c62bd6411a..8c0258eb87 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -947,7 +947,8 @@ e_shell_window_alert_sink_init (EAlertSinkInterface *interface) static void e_shell_window_init (EShellWindow *shell_window) { - shell_window->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell_window, E_TYPE_SHELL_WINDOW, EShellWindowPrivate); + shell_window->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + shell_window, E_TYPE_SHELL_WINDOW, EShellWindowPrivate); e_shell_window_private_init (shell_window); } diff --git a/shell/e-shell.c b/shell/e-shell.c index 79ca26cb1c..f3402dd101 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -1169,7 +1169,8 @@ e_shell_init (EShell *shell) GtkIconTheme *icon_theme; EggSMClient *sm_client; - shell->priv = G_TYPE_INSTANCE_GET_PRIVATE (shell, E_TYPE_SHELL, EShellPrivate); + shell->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + shell, E_TYPE_SHELL, EShellPrivate); backends_by_name = g_hash_table_new (g_str_hash, g_str_equal); backends_by_scheme = g_hash_table_new (g_str_hash, g_str_equal); diff --git a/shell/test/e-test-shell-backend.c b/shell/test/e-test-shell-backend.c index 9e5f757490..a30cb8a7b5 100644 --- a/shell/test/e-test-shell-backend.c +++ b/shell/test/e-test-shell-backend.c @@ -178,7 +178,9 @@ test_shell_backend_class_init (ETestShellBackendClass *class) static void test_shell_backend_init (ETestShellBackend *test_shell_backend) { - test_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE (test_shell_backend, E_TYPE_TEST_SHELL_BACKEND, ETestShellBackendPrivate); + test_shell_backend->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + test_shell_backend, E_TYPE_TEST_SHELL_BACKEND, + ETestShellBackendPrivate); } GType diff --git a/shell/test/e-test-shell-view.c b/shell/test/e-test-shell-view.c index 7080009dd4..825e27fa37 100644 --- a/shell/test/e-test-shell-view.c +++ b/shell/test/e-test-shell-view.c @@ -123,7 +123,9 @@ test_shell_view_class_init (ETestShellViewClass *class, static void test_shell_view_init (ETestShellView *test_shell_view) { - test_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (test_shell_view, E_TYPE_TEST_SHELL_VIEW, ETestShellViewPrivate); + test_shell_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + test_shell_view, E_TYPE_TEST_SHELL_VIEW, + ETestShellViewPrivate); } GType diff --git a/smclient/eggsmclient.c b/smclient/eggsmclient.c index 738be4e9e5..fde05ed60a 100644 --- a/smclient/eggsmclient.c +++ b/smclient/eggsmclient.c @@ -52,7 +52,8 @@ static EggSMClientMode global_client_mode = EGG_SM_CLIENT_MODE_NORMAL; static void egg_sm_client_init (EggSMClient *client) { - client->priv = G_TYPE_INSTANCE_GET_PRIVATE (client, EGG_TYPE_SM_CLIENT, EggSMClientPrivate); + client->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + client, EGG_TYPE_SM_CLIENT, EggSMClientPrivate); } static void diff --git a/widgets/menus/gal-view-factory-etable.c b/widgets/menus/gal-view-factory-etable.c index 8c744e1051..054acb87f9 100644 --- a/widgets/menus/gal-view-factory-etable.c +++ b/widgets/menus/gal-view-factory-etable.c @@ -159,7 +159,9 @@ gal_view_factory_etable_class_init (GalViewFactoryEtableClass *class) static void gal_view_factory_etable_init (GalViewFactoryEtable *factory) { - factory->priv = G_TYPE_INSTANCE_GET_PRIVATE (factory, GAL_TYPE_VIEW_FACTORY_ETABLE, GalViewFactoryEtablePrivate); + factory->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + factory, GAL_TYPE_VIEW_FACTORY_ETABLE, + GalViewFactoryEtablePrivate); } /** diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c index ed3615a276..40504a0083 100644 --- a/widgets/misc/e-account-combo-box.c +++ b/widgets/misc/e-account-combo-box.c @@ -315,7 +315,8 @@ e_account_combo_box_init (EAccountComboBox *combo_box) (GDestroyNotify) g_object_unref, (GDestroyNotify) gtk_tree_row_reference_free); - combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (combo_box, E_TYPE_ACCOUNT_COMBO_BOX, EAccountComboBoxPrivate); + combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + combo_box, E_TYPE_ACCOUNT_COMBO_BOX, EAccountComboBoxPrivate); combo_box->priv->index = index; } diff --git a/widgets/misc/e-account-manager.c b/widgets/misc/e-account-manager.c index e4ab1e798d..b252690c06 100644 --- a/widgets/misc/e-account-manager.c +++ b/widgets/misc/e-account-manager.c @@ -256,7 +256,8 @@ e_account_manager_init (EAccountManager *manager) GtkWidget *container; GtkWidget *widget; - manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (manager, E_TYPE_ACCOUNT_MANAGER, EAccountManagerPrivate); + manager->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + manager, E_TYPE_ACCOUNT_MANAGER, EAccountManagerPrivate); gtk_table_resize (GTK_TABLE (manager), 1, 2); gtk_table_set_col_spacings (GTK_TABLE (manager), 6); diff --git a/widgets/misc/e-account-tree-view.c b/widgets/misc/e-account-tree-view.c index 5a0ace2403..7dba811977 100644 --- a/widgets/misc/e-account-tree-view.c +++ b/widgets/misc/e-account-tree-view.c @@ -478,7 +478,8 @@ e_account_tree_view_init (EAccountTreeView *tree_view) (GDestroyNotify) g_object_unref, (GDestroyNotify) gtk_tree_row_reference_free); - tree_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (tree_view, E_TYPE_ACCOUNT_TREE_VIEW, EAccountTreeViewPrivate); + tree_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + tree_view, E_TYPE_ACCOUNT_TREE_VIEW, EAccountTreeViewPrivate); tree_view->priv->index = index; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)); diff --git a/widgets/misc/e-action-combo-box.c b/widgets/misc/e-action-combo-box.c index 5c9c44267b..9554a59b77 100644 --- a/widgets/misc/e-action-combo-box.c +++ b/widgets/misc/e-action-combo-box.c @@ -427,7 +427,8 @@ e_action_combo_box_class_init (EActionComboBoxClass *class) static void e_action_combo_box_init (EActionComboBox *combo_box) { - combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (combo_box, E_TYPE_ACTION_COMBO_BOX, EActionComboBoxPrivate); + combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + combo_box, E_TYPE_ACTION_COMBO_BOX, EActionComboBoxPrivate); combo_box->priv->index = g_hash_table_new_full ( g_direct_hash, g_direct_equal, diff --git a/widgets/misc/e-activity-bar.c b/widgets/misc/e-activity-bar.c index e23e043b02..44e169ffc1 100644 --- a/widgets/misc/e-activity-bar.c +++ b/widgets/misc/e-activity-bar.c @@ -253,7 +253,8 @@ e_activity_bar_init (EActivityBar *bar) GtkWidget *container; GtkWidget *widget; - bar->priv = G_TYPE_INSTANCE_GET_PRIVATE (bar, E_TYPE_ACTIVITY_BAR, EActivityBarPrivate); + bar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + bar, E_TYPE_ACTIVITY_BAR, EActivityBarPrivate); container = gtk_info_bar_get_content_area (GTK_INFO_BAR (bar)); diff --git a/widgets/misc/e-activity-proxy.c b/widgets/misc/e-activity-proxy.c index b949c1caa4..d52451fa37 100644 --- a/widgets/misc/e-activity-proxy.c +++ b/widgets/misc/e-activity-proxy.c @@ -259,7 +259,8 @@ e_activity_proxy_init (EActivityProxy *proxy) GtkWidget *container; GtkWidget *widget; - proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, E_TYPE_ACTIVITY_PROXY, EActivityProxyPrivate); + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + proxy, E_TYPE_ACTIVITY_PROXY, EActivityProxyPrivate); container = GTK_WIDGET (proxy); diff --git a/widgets/misc/e-alert-bar.c b/widgets/misc/e-alert-bar.c index 8fa7eff6ba..2d3fb9fe72 100644 --- a/widgets/misc/e-alert-bar.c +++ b/widgets/misc/e-alert-bar.c @@ -180,7 +180,8 @@ e_alert_bar_init (EAlertBar *alert_bar) PangoAttribute *attr; PangoAttrList *attr_list; - alert_bar->priv = G_TYPE_INSTANCE_GET_PRIVATE (alert_bar, E_TYPE_ALERT_BAR, EAlertBarPrivate); + alert_bar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + alert_bar, E_TYPE_ALERT_BAR, EAlertBarPrivate); g_queue_init (&alert_bar->priv->alerts); diff --git a/widgets/misc/e-attachment-button.c b/widgets/misc/e-attachment-button.c index 8a9b135abd..f5ff2d0865 100644 --- a/widgets/misc/e-attachment-button.c +++ b/widgets/misc/e-attachment-button.c @@ -564,7 +564,8 @@ e_attachment_button_init (EAttachmentButton *button) GtkWidget *widget; gint n_targets; - button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button, E_TYPE_ATTACHMENT_BUTTON, EAttachmentButtonPrivate); + button->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + button, E_TYPE_ATTACHMENT_BUTTON, EAttachmentButtonPrivate); /* Configure Widgets */ diff --git a/widgets/misc/e-attachment-dialog.c b/widgets/misc/e-attachment-dialog.c index a85e0bef98..90641078df 100644 --- a/widgets/misc/e-attachment-dialog.c +++ b/widgets/misc/e-attachment-dialog.c @@ -291,7 +291,8 @@ e_attachment_dialog_init (EAttachmentDialog *dialog) GtkWidget *container; GtkWidget *widget; - dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog, E_TYPE_ATTACHMENT_DIALOG, EAttachmentDialogPrivate); + dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + dialog, E_TYPE_ATTACHMENT_DIALOG, EAttachmentDialogPrivate); gtk_dialog_add_button ( GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); diff --git a/widgets/misc/e-attachment-handler-image.c b/widgets/misc/e-attachment-handler-image.c index 1c850685be..e7e3658873 100644 --- a/widgets/misc/e-attachment-handler-image.c +++ b/widgets/misc/e-attachment-handler-image.c @@ -243,5 +243,7 @@ e_attachment_handler_image_class_init (EAttachmentHandlerImageClass *class) static void e_attachment_handler_image_init (EAttachmentHandlerImage *handler) { - handler->priv = G_TYPE_INSTANCE_GET_PRIVATE (handler, E_TYPE_ATTACHMENT_HANDLER_IMAGE, EAttachmentHandlerImagePrivate); + handler->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + handler, E_TYPE_ATTACHMENT_HANDLER_IMAGE, + EAttachmentHandlerImagePrivate); } diff --git a/widgets/misc/e-attachment-handler.c b/widgets/misc/e-attachment-handler.c index c125d29ea5..7f68331acb 100644 --- a/widgets/misc/e-attachment-handler.c +++ b/widgets/misc/e-attachment-handler.c @@ -73,7 +73,8 @@ e_attachment_handler_class_init (EAttachmentHandlerClass *class) static void e_attachment_handler_init (EAttachmentHandler *handler) { - handler->priv = G_TYPE_INSTANCE_GET_PRIVATE (handler, E_TYPE_ATTACHMENT_HANDLER, EAttachmentHandlerPrivate); + handler->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + handler, E_TYPE_ATTACHMENT_HANDLER, EAttachmentHandlerPrivate); } EAttachmentView * diff --git a/widgets/misc/e-attachment-icon-view.c b/widgets/misc/e-attachment-icon-view.c index 5677370f0b..d5dd557ce6 100644 --- a/widgets/misc/e-attachment-icon-view.c +++ b/widgets/misc/e-attachment-icon-view.c @@ -527,7 +527,9 @@ e_attachment_icon_view_class_init (EAttachmentIconViewClass *class) static void e_attachment_icon_view_init (EAttachmentIconView *icon_view) { - icon_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (icon_view, E_TYPE_ATTACHMENT_ICON_VIEW, EAttachmentIconViewPrivate); + icon_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + icon_view, E_TYPE_ATTACHMENT_ICON_VIEW, + EAttachmentIconViewPrivate); e_attachment_view_init (E_ATTACHMENT_VIEW (icon_view)); diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c index 73773f25a1..406e247eb2 100644 --- a/widgets/misc/e-attachment-paned.c +++ b/widgets/misc/e-attachment-paned.c @@ -519,7 +519,8 @@ e_attachment_paned_init (EAttachmentPaned *paned) GtkWidget *widget; GtkAction *action; - paned->priv = G_TYPE_INSTANCE_GET_PRIVATE (paned, E_TYPE_ATTACHMENT_PANED, EAttachmentPanedPrivate); + paned->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + paned, E_TYPE_ATTACHMENT_PANED, EAttachmentPanedPrivate); paned->priv->model = e_attachment_store_new (); /* Keep the expander label and combo box the same height. */ diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c index e1794d653c..696e092b1c 100644 --- a/widgets/misc/e-attachment-store.c +++ b/widgets/misc/e-attachment-store.c @@ -218,7 +218,8 @@ e_attachment_store_init (EAttachmentStore *store) (GDestroyNotify) g_object_unref, (GDestroyNotify) gtk_tree_row_reference_free); - store->priv = G_TYPE_INSTANCE_GET_PRIVATE (store, E_TYPE_ATTACHMENT_STORE, EAttachmentStorePrivate); + store->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + store, E_TYPE_ATTACHMENT_STORE, EAttachmentStorePrivate); store->priv->attachment_index = attachment_index; types[column++] = E_TYPE_ATTACHMENT; /* COLUMN_ATTACHMENT */ diff --git a/widgets/misc/e-attachment-tree-view.c b/widgets/misc/e-attachment-tree-view.c index d3c3e68262..7099a7eb5b 100644 --- a/widgets/misc/e-attachment-tree-view.c +++ b/widgets/misc/e-attachment-tree-view.c @@ -504,7 +504,9 @@ e_attachment_tree_view_init (EAttachmentTreeView *tree_view) GtkTreeViewColumn *column; GtkCellRenderer *renderer; - tree_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (tree_view, E_TYPE_ATTACHMENT_TREE_VIEW, EAttachmentTreeViewPrivate); + tree_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + tree_view, E_TYPE_ATTACHMENT_TREE_VIEW, + EAttachmentTreeViewPrivate); e_attachment_view_init (E_ATTACHMENT_VIEW (tree_view)); diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index 2c219a79ce..104ad5c002 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -877,7 +877,8 @@ e_attachment_class_init (EAttachmentClass *class) static void e_attachment_init (EAttachment *attachment) { - attachment->priv = G_TYPE_INSTANCE_GET_PRIVATE (attachment, E_TYPE_ATTACHMENT, EAttachmentPrivate); + attachment->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + attachment, E_TYPE_ATTACHMENT, EAttachmentPrivate); attachment->priv->cancellable = g_cancellable_new (); attachment->priv->encrypted = CAMEL_CIPHER_VALIDITY_ENCRYPT_NONE; attachment->priv->signed_ = CAMEL_CIPHER_VALIDITY_SIGN_NONE; diff --git a/widgets/misc/e-charset-combo-box.c b/widgets/misc/e-charset-combo-box.c index 57d958b082..aecee9b973 100644 --- a/widgets/misc/e-charset-combo-box.c +++ b/widgets/misc/e-charset-combo-box.c @@ -308,7 +308,8 @@ e_charset_combo_box_init (ECharsetComboBox *combo_box) (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref); - combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (combo_box, E_TYPE_CHARSET_COMBO_BOX, ECharsetComboBoxPrivate); + combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + combo_box, E_TYPE_CHARSET_COMBO_BOX, ECharsetComboBoxPrivate); combo_box->priv->action_group = action_group; combo_box->priv->charset_index = charset_index; diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index b57849c131..4e704bd39a 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -451,7 +451,8 @@ e_date_edit_class_init (EDateEditClass *class) static void e_date_edit_init (EDateEdit *dedit) { - dedit->priv = G_TYPE_INSTANCE_GET_PRIVATE (dedit, E_TYPE_DATE_EDIT, EDateEditPrivate); + dedit->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + dedit, E_TYPE_DATE_EDIT, EDateEditPrivate); dedit->priv->show_date = TRUE; dedit->priv->show_time = TRUE; diff --git a/widgets/misc/e-focus-tracker.c b/widgets/misc/e-focus-tracker.c index 91dc7be524..ac4eaf3d21 100644 --- a/widgets/misc/e-focus-tracker.c +++ b/widgets/misc/e-focus-tracker.c @@ -535,7 +535,8 @@ e_focus_tracker_init (EFocusTracker *focus_tracker) { GtkAction *action; - focus_tracker->priv = G_TYPE_INSTANCE_GET_PRIVATE (focus_tracker, E_TYPE_FOCUS_TRACKER, EFocusTrackerPrivate); + focus_tracker->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + focus_tracker, E_TYPE_FOCUS_TRACKER, EFocusTrackerPrivate); /* Define dummy actions. These will most likely be overridden, * but for cases where they're not it ensures ESelectable objects diff --git a/widgets/misc/e-hinted-entry.c b/widgets/misc/e-hinted-entry.c index a1679807a9..4885896762 100644 --- a/widgets/misc/e-hinted-entry.c +++ b/widgets/misc/e-hinted-entry.c @@ -210,7 +210,8 @@ e_hinted_entry_class_init (EHintedEntryClass *class) static void e_hinted_entry_init (EHintedEntry *entry) { - entry->priv = G_TYPE_INSTANCE_GET_PRIVATE (entry, E_TYPE_HINTED_ENTRY, EHintedEntryPrivate); + entry->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + entry, E_TYPE_HINTED_ENTRY, EHintedEntryPrivate); entry->priv->hint = g_strdup (""); /* hint must never be NULL */ hinted_entry_show_hint (entry); } diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c index 4da38be9a9..3e9a976c18 100644 --- a/widgets/misc/e-image-chooser.c +++ b/widgets/misc/e-image-chooser.c @@ -440,7 +440,8 @@ e_image_chooser_init (EImageChooser *chooser) GtkWidget *container; GtkWidget *widget; - chooser->priv = G_TYPE_INSTANCE_GET_PRIVATE (chooser, E_TYPE_IMAGE_CHOOSER, EImageChooserPrivate); + chooser->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + chooser, E_TYPE_IMAGE_CHOOSER, EImageChooserPrivate); container = GTK_WIDGET (chooser); diff --git a/widgets/misc/e-import-assistant.c b/widgets/misc/e-import-assistant.c index 11059ebf1a..99c49ea32e 100644 --- a/widgets/misc/e-import-assistant.c +++ b/widgets/misc/e-import-assistant.c @@ -1356,7 +1356,9 @@ import_assistant_construct (EImportAssistant *import_assistant) static void e_import_assistant_init (EImportAssistant *import_assistant) { - import_assistant->priv = G_TYPE_INSTANCE_GET_PRIVATE (import_assistant, E_TYPE_IMPORT_ASSISTANT, EImportAssistantPrivate); + import_assistant->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + import_assistant, E_TYPE_IMPORT_ASSISTANT, + EImportAssistantPrivate); } GtkWidget * diff --git a/widgets/misc/e-online-button.c b/widgets/misc/e-online-button.c index 643ebc418a..2b974f9d4c 100644 --- a/widgets/misc/e-online-button.c +++ b/widgets/misc/e-online-button.c @@ -137,7 +137,8 @@ e_online_button_init (EOnlineButton *button) { GtkWidget *widget; - button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button, E_TYPE_ONLINE_BUTTON, EOnlineButtonPrivate); + button->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + button, E_TYPE_ONLINE_BUTTON, EOnlineButtonPrivate); gtk_widget_set_can_focus (GTK_WIDGET (button), FALSE); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); diff --git a/widgets/misc/e-paned.c b/widgets/misc/e-paned.c index f184244203..6740d443b7 100644 --- a/widgets/misc/e-paned.c +++ b/widgets/misc/e-paned.c @@ -347,7 +347,8 @@ e_paned_class_init (EPanedClass *class) static void e_paned_init (EPaned *paned) { - paned->priv = G_TYPE_INSTANCE_GET_PRIVATE (paned, E_TYPE_PANED, EPanedPrivate); + paned->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + paned, E_TYPE_PANED, EPanedPrivate); paned->priv->proportion = 0.5; paned->priv->fixed_resize = TRUE; diff --git a/widgets/misc/e-picture-gallery.c b/widgets/misc/e-picture-gallery.c index dcbbe61c09..b4eabe48f3 100644 --- a/widgets/misc/e-picture-gallery.c +++ b/widgets/misc/e-picture-gallery.c @@ -402,7 +402,8 @@ e_picture_gallery_class_init (EPictureGalleryClass *class) static void e_picture_gallery_init (EPictureGallery *gallery) { - gallery->priv = G_TYPE_INSTANCE_GET_PRIVATE (gallery, E_TYPE_PICTURE_GALLERY, EPictureGalleryPrivate); + gallery->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + gallery, E_TYPE_PICTURE_GALLERY, EPictureGalleryPrivate); gallery->priv->initialized = FALSE; gallery->priv->monitor = NULL; picture_gallery_set_path (gallery, NULL); diff --git a/widgets/misc/e-popup-action.c b/widgets/misc/e-popup-action.c index a27137c289..334a5127eb 100644 --- a/widgets/misc/e-popup-action.c +++ b/widgets/misc/e-popup-action.c @@ -330,7 +330,8 @@ e_popup_action_class_init (EPopupActionClass *class) static void e_popup_action_init (EPopupAction *popup_action) { - popup_action->priv = G_TYPE_INSTANCE_GET_PRIVATE (popup_action, E_TYPE_POPUP_ACTION, EPopupActionPrivate); + popup_action->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + popup_action, E_TYPE_POPUP_ACTION, EPopupActionPrivate); popup_action->priv->use_action_appearance = TRUE; /* Remain invisible until we have a related action. */ diff --git a/widgets/misc/e-preferences-window.c b/widgets/misc/e-preferences-window.c index 7c58061642..49ce727cd2 100644 --- a/widgets/misc/e-preferences-window.c +++ b/widgets/misc/e-preferences-window.c @@ -254,7 +254,8 @@ e_preferences_window_init (EPreferencesWindow *window) (GDestroyNotify) g_free, (GDestroyNotify) gtk_tree_row_reference_free); - window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window, E_TYPE_PREFERENCES_WINDOW, EPreferencesWindowPrivate); + window->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + window, E_TYPE_PREFERENCES_WINDOW, EPreferencesWindowPrivate); window->priv->index = index; window->priv->filter_view = NULL; diff --git a/widgets/misc/e-preview-pane.c b/widgets/misc/e-preview-pane.c index b65d1a79ff..5ae99916de 100644 --- a/widgets/misc/e-preview-pane.c +++ b/widgets/misc/e-preview-pane.c @@ -211,7 +211,8 @@ e_preview_pane_class_init (EPreviewPaneClass *class) static void e_preview_pane_init (EPreviewPane *preview_pane) { - preview_pane->priv = G_TYPE_INSTANCE_GET_PRIVATE (preview_pane, E_TYPE_PREVIEW_PANE, EPreviewPanePrivate); + preview_pane->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + preview_pane, E_TYPE_PREVIEW_PANE, EPreviewPanePrivate); gtk_box_set_spacing (GTK_BOX (preview_pane), 1); } diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 0f83fd9683..f4709d1e76 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -531,7 +531,8 @@ e_search_bar_init (ESearchBar *search_bar) GtkWidget *widget; GtkWidget *container; - search_bar->priv = G_TYPE_INSTANCE_GET_PRIVATE (search_bar, E_TYPE_SEARCH_BAR, ESearchBarPrivate); + search_bar->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + search_bar, E_TYPE_SEARCH_BAR, ESearchBarPrivate); search_bar->priv->tokenizer = e_searching_tokenizer_new (); g_signal_connect_swapped ( diff --git a/widgets/misc/e-searching-tokenizer.c b/widgets/misc/e-searching-tokenizer.c index 087551fc76..3e7cb7f1dd 100644 --- a/widgets/misc/e-searching-tokenizer.c +++ b/widgets/misc/e-searching-tokenizer.c @@ -1080,7 +1080,9 @@ e_searching_tokenizer_class_init (ESearchingTokenizerClass *class) static void e_searching_tokenizer_init (ESearchingTokenizer *tokenizer) { - tokenizer->priv = G_TYPE_INSTANCE_GET_PRIVATE (tokenizer, E_TYPE_SEARCHING_TOKENIZER, ESearchingTokenizerPrivate); + tokenizer->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + tokenizer, E_TYPE_SEARCHING_TOKENIZER, + ESearchingTokenizerPrivate); tokenizer->priv->primary = search_info_new (); search_info_set_flags ( diff --git a/widgets/misc/e-signature-combo-box.c b/widgets/misc/e-signature-combo-box.c index 63d0b53a8a..9f3b6d9f99 100644 --- a/widgets/misc/e-signature-combo-box.c +++ b/widgets/misc/e-signature-combo-box.c @@ -219,7 +219,9 @@ e_signature_combo_box_init (ESignatureComboBox *combo_box) (GDestroyNotify) g_object_unref, (GDestroyNotify) gtk_tree_row_reference_free); - combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE (combo_box, E_TYPE_SIGNATURE_COMBO_BOX, ESignatureComboBoxPrivate); + combo_box->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + combo_box, E_TYPE_SIGNATURE_COMBO_BOX, + ESignatureComboBoxPrivate); combo_box->priv->index = index; } diff --git a/widgets/misc/e-signature-editor.c b/widgets/misc/e-signature-editor.c index 30f432d637..82d88ec7ae 100644 --- a/widgets/misc/e-signature-editor.c +++ b/widgets/misc/e-signature-editor.c @@ -396,7 +396,8 @@ e_signature_editor_init (ESignatureEditor *editor) GtkWidget *vbox; GError *error = NULL; - editor->priv = G_TYPE_INSTANCE_GET_PRIVATE (editor, E_TYPE_SIGNATURE_EDITOR, ESignatureEditorPrivate); + editor->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + editor, E_TYPE_SIGNATURE_EDITOR, ESignatureEditorPrivate); vbox = GTKHTML_EDITOR (editor)->vbox; gtkhtml_editor = GTKHTML_EDITOR (editor); diff --git a/widgets/misc/e-signature-manager.c b/widgets/misc/e-signature-manager.c index f5c7dd21fb..3da2312cec 100644 --- a/widgets/misc/e-signature-manager.c +++ b/widgets/misc/e-signature-manager.c @@ -501,7 +501,8 @@ e_signature_manager_init (ESignatureManager *manager) GtkWidget *container; GtkWidget *widget; - manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (manager, E_TYPE_SIGNATURE_MANAGER, ESignatureManagerPrivate); + manager->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + manager, E_TYPE_SIGNATURE_MANAGER, ESignatureManagerPrivate); gtk_table_resize (GTK_TABLE (manager), 1, 2); gtk_table_set_col_spacings (GTK_TABLE (manager), 6); diff --git a/widgets/misc/e-signature-preview.c b/widgets/misc/e-signature-preview.c index ec4370bbc3..2ccb14bbaa 100644 --- a/widgets/misc/e-signature-preview.c +++ b/widgets/misc/e-signature-preview.c @@ -211,7 +211,8 @@ e_signature_preview_class_init (ESignaturePreviewClass *class) static void e_signature_preview_init (ESignaturePreview *preview) { - preview->priv = G_TYPE_INSTANCE_GET_PRIVATE (preview, E_TYPE_SIGNATURE_PREVIEW, ESignaturePreviewPrivate); + preview->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + preview, E_TYPE_SIGNATURE_PREVIEW, ESignaturePreviewPrivate); } GtkWidget * diff --git a/widgets/misc/e-signature-script-dialog.c b/widgets/misc/e-signature-script-dialog.c index 1977526db1..367cc94e13 100644 --- a/widgets/misc/e-signature-script-dialog.c +++ b/widgets/misc/e-signature-script-dialog.c @@ -226,7 +226,9 @@ e_signature_script_dialog_init (ESignatureScriptDialog *dialog) GtkWidget *widget; gchar *markup; - dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog, E_TYPE_SIGNATURE_SCRIPT_DIALOG, ESignatureScriptDialogPrivate); + dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + dialog, E_TYPE_SIGNATURE_SCRIPT_DIALOG, + ESignatureScriptDialogPrivate); content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); diff --git a/widgets/misc/e-signature-tree-view.c b/widgets/misc/e-signature-tree-view.c index 0c8cd626f9..82346755d2 100644 --- a/widgets/misc/e-signature-tree-view.c +++ b/widgets/misc/e-signature-tree-view.c @@ -296,7 +296,9 @@ e_signature_tree_view_init (ESignatureTreeView *tree_view) (GDestroyNotify) g_object_unref, (GDestroyNotify) gtk_tree_row_reference_free); - tree_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (tree_view, E_TYPE_SIGNATURE_TREE_VIEW, ESignatureTreeViewPrivate); + tree_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + tree_view, E_TYPE_SIGNATURE_TREE_VIEW, + ESignatureTreeViewPrivate); tree_view->priv->index = index; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view)); diff --git a/widgets/misc/e-web-view-preview.c b/widgets/misc/e-web-view-preview.c index 8e44db729f..d53bdf47d2 100644 --- a/widgets/misc/e-web-view-preview.c +++ b/widgets/misc/e-web-view-preview.c @@ -169,7 +169,8 @@ e_web_view_preview_init (EWebViewPreview *preview) { GtkWidget *tree_view_sw, *web_view_sw; - preview->priv = G_TYPE_INSTANCE_GET_PRIVATE (preview, E_TYPE_WEB_VIEW_PREVIEW, EWebViewPreviewPrivate); + preview->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + preview, E_TYPE_WEB_VIEW_PREVIEW, EWebViewPreviewPrivate); preview->priv->escape_values = TRUE; tree_view_sw = in_scrolled_window (gtk_tree_view_new ()); diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c index 0e90d7dff9..7b46a63297 100644 --- a/widgets/misc/e-web-view.c +++ b/widgets/misc/e-web-view.c @@ -1374,7 +1374,8 @@ e_web_view_init (EWebView *web_view) const gchar *id; GError *error = NULL; - web_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (web_view, E_TYPE_WEB_VIEW, EWebViewPrivate); + web_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + web_view, E_TYPE_WEB_VIEW, EWebViewPrivate); ui_manager = gtk_ui_manager_new (); web_view->priv->ui_manager = ui_manager; diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index 3d514c40e4..3d4f453820 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -386,7 +386,8 @@ e_cell_toggle_class_init (ECellToggleClass *class) static void e_cell_toggle_init (ECellToggle *cell_toggle) { - cell_toggle->priv = G_TYPE_INSTANCE_GET_PRIVATE (cell_toggle, E_TYPE_CELL_TOGGLE, ECellTogglePrivate); + cell_toggle->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + cell_toggle, E_TYPE_CELL_TOGGLE, ECellTogglePrivate); cell_toggle->priv->empty = gdk_pixbuf_new_from_xpm_data (empty_xpm); diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c index c2fc291c3a..db18a8cf9e 100644 --- a/widgets/table/e-table-extras.c +++ b/widgets/table/e-table-extras.c @@ -230,7 +230,8 @@ ete_init (ETableExtras *extras) { ECell *cell, *sub_cell; - extras->priv = G_TYPE_INSTANCE_GET_PRIVATE (extras, E_TYPE_TABLE_EXTRAS, ETableExtrasPrivate); + extras->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + extras, E_TYPE_TABLE_EXTRAS, ETableExtrasPrivate); extras->priv->cells = g_hash_table_new_full ( g_str_hash, g_str_equal, diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c index 37816c8a18..4cfd97e41c 100644 --- a/widgets/table/e-table-memory-store.c +++ b/widgets/table/e-table-memory-store.c @@ -240,7 +240,8 @@ etms_finalize (GObject *object) static void e_table_memory_store_init (ETableMemoryStore *etms) { - etms->priv = G_TYPE_INSTANCE_GET_PRIVATE (etms, E_TYPE_TABLE_MEMORY_STORE, ETableMemoryStorePrivate); + etms->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + etms, E_TYPE_TABLE_MEMORY_STORE, ETableMemoryStorePrivate); } static void diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c index d55aa04b51..166cfdb1e1 100644 --- a/widgets/table/e-table-memory.c +++ b/widgets/table/e-table-memory.c @@ -84,7 +84,8 @@ e_table_memory_class_init (ETableMemoryClass *class) static void e_table_memory_init (ETableMemory *etmm) { - etmm->priv = G_TYPE_INSTANCE_GET_PRIVATE (etmm, E_TYPE_TABLE_MEMORY, ETableMemoryPrivate); + etmm->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + etmm, E_TYPE_TABLE_MEMORY, ETableMemoryPrivate); } /** diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c index 23e8cdf002..538dcc4f1a 100644 --- a/widgets/table/e-table-search.c +++ b/widgets/table/e-table-search.c @@ -153,7 +153,8 @@ e_table_search_class_init (ETableSearchClass *class) static void e_table_search_init (ETableSearch *ets) { - ets->priv = G_TYPE_INSTANCE_GET_PRIVATE (ets, E_TYPE_TABLE_SEARCH, ETableSearchPrivate); + ets->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + ets, E_TYPE_TABLE_SEARCH, ETableSearchPrivate); ets->priv->search_string = g_strdup (""); } diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c index 54e733fdad..8a180efab1 100644 --- a/widgets/table/e-table-without.c +++ b/widgets/table/e-table-without.c @@ -248,7 +248,8 @@ etw_class_init (ETableWithoutClass *class) static void etw_init (ETableWithout *etw) { - etw->priv = G_TYPE_INSTANCE_GET_PRIVATE (etw, E_TYPE_TABLE_WITHOUT, ETableWithoutPrivate); + etw->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + etw, E_TYPE_TABLE_WITHOUT, ETableWithoutPrivate); } ETableModel * diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c index 5c7b8f46d2..c32b7311bd 100644 --- a/widgets/table/e-tree-memory.c +++ b/widgets/table/e-tree-memory.c @@ -389,7 +389,8 @@ e_tree_memory_class_init (ETreeMemoryClass *class) static void e_tree_memory_init (ETreeMemory *etmm) { - etmm->priv = G_TYPE_INSTANCE_GET_PRIVATE (etmm, E_TYPE_TREE_MEMORY, ETreeMemoryPrivate); + etmm->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + etmm, E_TYPE_TREE_MEMORY, ETreeMemoryPrivate); } /** diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index 18ec388530..8644187b91 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -741,7 +741,8 @@ e_tree_selection_model_get_cursor (ETreeSelectionModel *etsm) static void e_tree_selection_model_init (ETreeSelectionModel *etsm) { - etsm->priv = G_TYPE_INSTANCE_GET_PRIVATE (etsm, E_TYPE_TREE_SELECTION_MODEL, ETreeSelectionModelPrivate); + etsm->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + etsm, E_TYPE_TREE_SELECTION_MODEL, ETreeSelectionModelPrivate); etsm->priv->paths = g_hash_table_new (NULL, NULL); etsm->priv->cursor_col = -1; diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c index 5b5bc80f24..9abb6772b2 100644 --- a/widgets/table/e-tree-sorted.c +++ b/widgets/table/e-tree-sorted.c @@ -1203,7 +1203,8 @@ e_tree_sorted_class_init (ETreeSortedClass *class) static void e_tree_sorted_init (ETreeSorted *ets) { - ets->priv = G_TYPE_INSTANCE_GET_PRIVATE (ets, E_TYPE_TREE_SORTED, ETreeSortedPrivate); + ets->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + ets, E_TYPE_TREE_SORTED, ETreeSortedPrivate); } /** diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index bbeed6ee38..fe8f90f536 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -743,7 +743,8 @@ etta_class_init (ETreeTableAdapterClass *class) static void etta_init (ETreeTableAdapter *etta) { - etta->priv = G_TYPE_INSTANCE_GET_PRIVATE (etta, E_TYPE_TREE_TABLE_ADAPTER, ETreeTableAdapterPrivate); + etta->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + etta, E_TYPE_TREE_TABLE_ADAPTER, ETreeTableAdapterPrivate); etta->priv->root_visible = TRUE; etta->priv->remap_needed = TRUE; diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index dfbc3ccdce..040881c857 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -581,7 +581,8 @@ e_tree_init (ETree *e_tree) gtk_table_set_homogeneous (GTK_TABLE (e_tree), FALSE); - e_tree->priv = G_TYPE_INSTANCE_GET_PRIVATE (e_tree, E_TYPE_TREE, ETreePrivate); + e_tree->priv = G_TYPE_INSTANCE_GET_PRIVATE ( + e_tree, E_TYPE_TREE, ETreePrivate); e_tree->priv->alternating_row_colors = 1; e_tree->priv->horizontal_draw_grid = 1; |