diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-05-08 00:22:36 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-05-08 06:48:38 +0800 |
| commit | 4cfb84c573f21ca7519e24cff1c5742b715355c4 (patch) | |
| tree | 92314a7c4ebb1b82f5bbe0e48856e23f06dcfc95 | |
| parent | c7b455de89487e606fc620420c1778f5e55afcac (diff) | |
| download | gsoc2013-evolution-4cfb84c573f21ca7519e24cff1c5742b715355c4.tar.gz gsoc2013-evolution-4cfb84c573f21ca7519e24cff1c5742b715355c4.tar.zst gsoc2013-evolution-4cfb84c573f21ca7519e24cff1c5742b715355c4.zip | |
Whitespace and coding style cleanups.
74 files changed, 446 insertions, 206 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index 15eddbd53f..dee1bd2630 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -58,7 +58,9 @@ e_contact_editor_fullname_set_property (GObject *object, e_contact_name_free (e_contact_editor_fullname->name); if (g_value_get_pointer (value) != NULL) { - e_contact_editor_fullname->name = e_contact_name_copy (g_value_get_pointer (value)); + e_contact_editor_fullname->name = + e_contact_name_copy ( + g_value_get_pointer (value)); fill_in_info (e_contact_editor_fullname); } else { diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 30f0068035..5de52f30a7 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -225,10 +225,10 @@ ce_have_contact (EBook *book, const GError *error, EContact *contact, gpointer c contact_editor = e_contact_editor_new ( shell, book, qa->contact, TRUE, TRUE /* XXX */); - /* mark it as changed so the Save buttons are enabled when we bring up the dialog. */ - g_object_set (contact_editor, - "changed", contact != NULL, - NULL); + /* Mark it as changed so the Save buttons are + * enabled when we bring up the dialog. */ + g_object_set ( + contact_editor, "changed", contact != NULL, NULL); /* We pass this via object data, so that we don't get a * dangling pointer referenced if both the "contact_added" diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 804fa10ccc..2ef59d17c0 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1396,7 +1396,9 @@ e_addressbook_view_delete_selection (EAddressbookView *view, gboolean is_delete) for (l=list;l;l=g_list_next (l)) { contact = l->data; - ids = g_list_prepend (ids, (gchar *)e_contact_get_const (contact, E_CONTACT_UID)); + ids = g_list_prepend ( + ids, (gchar *) e_contact_get_const ( + contact, E_CONTACT_UID)); } /* Remove the cards all at once. */ diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 31e2d35306..f6ac130a2f 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -616,7 +616,8 @@ e_minicard_view_get_type (void) (GInstanceInitFunc) e_minicard_view_init, }; - reflow_type = g_type_register_static (PARENT_TYPE, "EMinicardView", &reflow_info, 0); + reflow_type = g_type_register_static ( + PARENT_TYPE, "EMinicardView", &reflow_info, 0); } return reflow_type; diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c index 69e82957d6..122a0e40f0 100644 --- a/addressbook/importers/evolution-csv-importer.c +++ b/addressbook/importers/evolution-csv-importer.c @@ -559,11 +559,17 @@ parseLine (CSVImporter *gci, EContact *contact, gchar *buf) { break; case FLAG_DATE_BDAY: - e_contact_set (contact, E_CONTACT_BIRTH_DATE, date_from_string (value->str)); + e_contact_set ( + contact, + E_CONTACT_BIRTH_DATE, + date_from_string (value->str)); break; case FLAG_DATE_ANNIVERSARY: - e_contact_set (contact, E_CONTACT_ANNIVERSARY, date_from_string (value->str)); + e_contact_set ( + contact, + E_CONTACT_ANNIVERSARY, + date_from_string (value->str)); break; case FLAG_BIRTH_DAY: diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index d8d5e6e754..388d410611 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -287,10 +287,16 @@ parseLine (GHashTable *dn_contact_hash, EContact *contact, } else if (ldif_fields[i].flags & FLAG_BOOLEAN) { if (!g_ascii_strcasecmp (ldif_value->str, "true")) { - e_contact_set (contact, ldif_fields[i].contact_field, GINT_TO_POINTER (TRUE)); + e_contact_set ( + contact, + ldif_fields[i].contact_field, + GINT_TO_POINTER (TRUE)); } else { - e_contact_set (contact, ldif_fields[i].contact_field, GINT_TO_POINTER (FALSE)); + e_contact_set ( + contact, + ldif_fields[i].contact_field, + GINT_TO_POINTER (FALSE)); } g_message ("set %s to %s", ptr, ldif_value->str); } diff --git a/addressbook/tools/evolution-addressbook-export-list-folders.c b/addressbook/tools/evolution-addressbook-export-list-folders.c index 1f18686242..ec98354140 100644 --- a/addressbook/tools/evolution-addressbook-export-list-folders.c +++ b/addressbook/tools/evolution-addressbook-export-list-folders.c @@ -79,7 +79,9 @@ action_list_folders_init (ActionContext * p_actctx) name = e_source_peek_name (s); if (outputfile) - fprintf (outputfile, "\"%s\",\"%s\",%d\n", uri, name, g_list_length (contacts)); + fprintf ( + outputfile, "\"%s\",\"%s\",%d\n", + uri, name, g_list_length (contacts)); else printf ("\"%s\",\"%s\",%d\n", uri, name, g_list_length (contacts)); diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index 4f3233501c..f3421ef31a 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -749,8 +749,6 @@ query_objects_changed_async (struct _query_msg *msg) day_end = time_day_end_with_zone (time (NULL), zone); - debug (("Querying for object between %s to %s", e_ctime (&from), e_ctime (&day_end))); - for (l = objects; l != NULL; l = l->next) { ECalComponentId *id; GSList *sl; diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 1d6fa36653..1d4c74e43c 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -458,7 +458,8 @@ save_comp (CompEditor *editor) priv->comp = clone; e_cal_component_get_uid (priv->comp, &orig_uid); - /* make a copy of it, because call of e_cal_create_object rewrites the internal uid */ + /* Make a copy of it, because call of e_cal_create_object() + * rewrites the internal uid. */ orig_uid_copy = g_strdup (orig_uid); /* send timezones */ @@ -467,8 +468,8 @@ save_comp (CompEditor *editor) /* Attachments*/ - e_cal_component_set_attachment_list (priv->comp, - get_attachment_list (editor)); + e_cal_component_set_attachment_list ( + priv->comp, get_attachment_list (editor)); icalcomp = e_cal_component_get_icalcomponent (priv->comp); /* send the component to the server */ if (!cal_comp_is_on_server (priv->comp, priv->client)) { @@ -627,11 +628,15 @@ save_comp_with_send (CompEditor *editor) editor, E_CAL_COMPONENT_METHOD_REQUEST, strip_alarms); } else { - if (!comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REQUEST, strip_alarms)) + if (!comp_editor_send_comp ( + editor, E_CAL_COMPONENT_METHOD_REQUEST, + strip_alarms)) return FALSE; if (delegate) - return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REPLY, strip_alarms); + return comp_editor_send_comp ( + editor, E_CAL_COMPONENT_METHOD_REPLY, + strip_alarms); } } @@ -877,7 +882,8 @@ action_save_cb (GtkAction *action, return; if (!text.value) - if (!send_component_prompt_subject ((GtkWindow *) editor, priv->client, priv->comp)) + if (!send_component_prompt_subject ( + (GtkWindow *) editor, priv->client, priv->comp)) return; if (save_comp_with_send (editor)) { @@ -2091,7 +2097,8 @@ prompt_and_save_changes (CompEditor *editor, gboolean send) return FALSE; if (!text.value) - if (!send_component_prompt_subject ((GtkWindow *) editor, priv->client, priv->comp)) + if (!send_component_prompt_subject ( + (GtkWindow *) editor, priv->client, priv->comp)) return FALSE; if (e_cal_component_is_instance (priv->comp)) diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 110b66692a..30a5bbb9f9 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -406,7 +406,8 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp) ECalComponentAttendee *ca = l->data; EMeetingAttendee *ia; - ia = E_MEETING_ATTENDEE (e_meeting_attendee_new_from_e_cal_component_attendee (ca)); + ia = E_MEETING_ATTENDEE ( + e_meeting_attendee_new_from_e_cal_component_attendee (ca)); /* If we aren't the organizer or the attendee is just * delegating, don't allow editing. */ if (!comp_editor_get_user_org (editor) || diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index b0c658215c..c02eec9ecb 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -1592,7 +1592,8 @@ refresh_busy_periods (gpointer data) fbd->qdata = qdata; fbd->fb_uri = priv->fb_uri; fbd->store = store; - fbd->email = g_strdup (itip_strip_mailto (e_meeting_attendee_get_address (attendee))); + fbd->email = g_strdup (itip_strip_mailto ( + e_meeting_attendee_get_address (attendee))); /* Check the server for free busy data */ if (priv->client) { @@ -1816,7 +1817,9 @@ soup_authenticate (SoupSession *session, if (retrying && msg->reason_phrase && *msg->reason_phrase) { g_string_append (description, "\n"); - g_string_append_printf (description, _("Failure reason: %s"), msg->reason_phrase); + g_string_append_printf ( + description, _("Failure reason: %s"), + msg->reason_phrase); } password = e_passwords_ask_password ( diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c index 1ed0349892..e8ba961d7e 100644 --- a/calendar/gui/e-task-table.c +++ b/calendar/gui/e-task-table.c @@ -755,10 +755,12 @@ task_table_query_tooltip (GtkWidget *widget, if (ptr) { ptr++; - /* To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>" */ + /* To Translators: It will display + * "Organizer: NameOfTheUser <email@ofuser.com>" */ tmp = g_strdup_printf (_("Organizer: %s <%s>"), organizer.cn, ptr); } else { - /* With SunOne accounts, there may be no ':' in organiser.value */ + /* With SunOne accounts, there may be no ':' in + * organizer.value. */ tmp = g_strdup_printf (_("Organizer: %s"), organizer.cn); } diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c index b6c818516b..3b1b21849f 100644 --- a/calendar/gui/e-week-view-event-item.c +++ b/calendar/gui/e-week-view-event-item.c @@ -775,7 +775,8 @@ week_view_event_item_draw (GnomeCanvasItem *canvas_item, time_width = e_week_view_get_time_string_width (week_view); - one_day_event = e_week_view_is_one_day_event (week_view, event_item->priv->event_num); + one_day_event = e_week_view_is_one_day_event ( + week_view, event_item->priv->event_num); model = e_calendar_view_get_model (E_CALENDAR_VIEW (week_view)); diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c index b4b8aaa1b2..c381ea3b8d 100644 --- a/calendar/gui/e-week-view-layout.c +++ b/calendar/gui/e-week-view-layout.c @@ -328,7 +328,9 @@ e_week_view_layout_get_day_position (gint day, *day_x = col; } } else { - #define wk(x) ( ( working_days & (days [ ((x) + display_start_day) % 7 ]) ) ? 1 : 0) + #define wk(x) \ + ((working_days & \ + (days[((x) + display_start_day) % 7])) ? 1 : 0) CalWeekdays days[] = { CAL_MONDAY, CAL_TUESDAY, diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c index 066e2c4d45..f808e693b1 100644 --- a/calendar/gui/e-week-view-titles-item.c +++ b/calendar/gui/e-week-view-titles-item.c @@ -216,7 +216,9 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item, /* Draw the lines between each column. */ if (col != 0) { cairo_set_source_rgb (cr, 0, 0, 0); - cairo_rectangle (cr, week_view->col_offsets[col] - x, allocation.height - y, 1, 1); + cairo_rectangle ( + cr, week_view->col_offsets[col] - x, + allocation.height - y, 1, 1); cairo_fill (cr); } diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index e07e9f2545..eb7ed6e081 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -128,7 +128,8 @@ struct _GnomeCalendarPrivate { * else it uses the date range set in search bar. */ gboolean lview_select_daten_range; - /* used in update_todo_view, to prevent interleaving when called in separate thread */ + /* Used in update_todo_view, to prevent interleaving when + * called in separate thread. */ GMutex *todo_update_lock; }; @@ -1633,7 +1634,8 @@ gnome_calendar_update_view_times (GnomeCalendar *gcal, gcal, priv->current_view_type, &real_start_time, &end_time, &select_time); - if (priv->current_view_type == GNOME_CAL_LIST_VIEW && !priv->lview_select_daten_range) + if (priv->current_view_type == GNOME_CAL_LIST_VIEW && + !priv->lview_select_daten_range) return; e_cal_model_set_time_range (model, real_start_time, end_time); @@ -2082,7 +2084,8 @@ gnome_calendar_update_date_navigator (GnomeCalendar *gcal) if (!gtk_widget_get_visible (GTK_WIDGET (priv->date_navigator))) return; - if (priv->current_view_type == GNOME_CAL_LIST_VIEW && !priv->lview_select_daten_range) + if (priv->current_view_type == GNOME_CAL_LIST_VIEW && + !priv->lview_select_daten_range) return; model = gnome_calendar_get_model (gcal); diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c index 9df7686356..2d9197dc0c 100644 --- a/capplet/settings/mail-guess-servers.c +++ b/capplet/settings/mail-guess-servers.c @@ -215,7 +215,9 @@ parse_message (const gchar *msg, gint length, EmailProvider *provider) static gboolean parse_soup_message (SoupMessage *msg, EmailProvider *provider) { - return parse_message (msg->response_body->data, msg->response_body->length, provider); + return parse_message ( + msg->response_body->data, + msg->response_body->length, provider); } static gboolean diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 945f5cc22b..a27ee9528d 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1591,9 +1591,12 @@ get_signature_html (EMsgComposer *composer) * http://www.chemie.fu-berlin.de/outerspace/netnews/son-of-1036.html */ html = g_strdup_printf ( - "<!--+GtkHTML:<DATA class=\"ClueFlow\" key=\"signature\" value=\"1\">-->" - "<!--+GtkHTML:<DATA class=\"ClueFlow\" key=\"signature_name\" value=\"uid:%s\">-->" - "<TABLE WIDTH=\"100%%\" CELLSPACING=\"0\" CELLPADDING=\"0\"><TR><TD>" + "<!--+GtkHTML:<DATA class=\"ClueFlow\" " + " key=\"signature\" value=\"1\">-->" + "<!--+GtkHTML:<DATA class=\"ClueFlow\" " + " key=\"signature_name\" value=\"uid:%s\">-->" + "<TABLE WIDTH=\"100%%\" CELLSPACING=\"0\"" + " CELLPADDING=\"0\"><TR><TD>" "%s%s%s%s" "%s</TD></TR></TABLE>", encoded_uid ? encoded_uid : "", @@ -3335,7 +3338,8 @@ e_msg_composer_new_with_message (EShell *shell, camel_header_raw_clear (&xev); /* Check for receipt request */ - if (camel_medium_get_header (CAMEL_MEDIUM (message), "Disposition-Notification-To")) { + if (camel_medium_get_header ( + CAMEL_MEDIUM (message), "Disposition-Notification-To")) { action = GTK_TOGGLE_ACTION (ACTION (REQUEST_READ_RECEIPT)); gtk_toggle_action_set_active (action, TRUE); } diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c index e54ecf60ac..be07485e3b 100644 --- a/em-format/em-format-quote.c +++ b/em-format/em-format-quote.c @@ -73,7 +73,8 @@ emfq_format_clone (EMFormat *emf, gconf = gconf_client_get_default (); camel_stream_reset (emfq->stream, NULL); - if (gconf_client_get_bool(gconf, "/apps/evolution/mail/composer/top_signature", NULL)) + if (gconf_client_get_bool ( + gconf, "/apps/evolution/mail/composer/top_signature", NULL)) camel_stream_printf (emfq->stream, "<br>\n"); g_object_unref (gconf); handle = em_format_find_handler(emf, "x-evolution/message/prefix"); @@ -696,14 +697,19 @@ emfq_text_html (EMFormat *emf, filtered_stream = camel_stream_filter_new (stream); sig_strip = em_stripsig_filter_new (FALSE); - camel_stream_filter_add (CAMEL_STREAM_FILTER (filtered_stream), sig_strip); + camel_stream_filter_add ( + CAMEL_STREAM_FILTER (filtered_stream), sig_strip); g_object_unref (sig_strip); - em_format_format_text (emf, filtered_stream, (CamelDataWrapper *) part, cancellable); + em_format_format_text ( + emf, filtered_stream, + (CamelDataWrapper *) part, cancellable); camel_stream_flush (filtered_stream, cancellable, NULL); g_object_unref (filtered_stream); } else { - em_format_format_text (emf, stream, (CamelDataWrapper *)part, cancellable); + em_format_format_text ( + emf, stream, + (CamelDataWrapper *) part, cancellable); } } diff --git a/em-format/em-format.c b/em-format/em-format.c index 26f0897223..6f3d547081 100644 --- a/em-format/em-format.c +++ b/em-format/em-format.c @@ -484,9 +484,12 @@ em_format_class_remove_handler (EMFormatClass *emfc, if (current == info) { current = info->old; if (current) - g_hash_table_insert (emfc->type_handlers, (gpointer) current->mime_type, current); + g_hash_table_insert ( + emfc->type_handlers, + (gpointer) current->mime_type, current); else - g_hash_table_remove (emfc->type_handlers, info->mime_type); + g_hash_table_remove ( + emfc->type_handlers, info->mime_type); } else { while (current && current->old != info) current = current->old; @@ -1417,8 +1420,9 @@ em_format_format_text (EMFormat *emf, camel_stream_reset (mem_stream, NULL); if (max == -1 || size == -1 || size < (max * 1024) || emf->composer) { - camel_stream_write_to_stream (mem_stream, (CamelStream *)stream, cancellable, NULL); - camel_stream_flush ((CamelStream *)stream, cancellable, NULL); + camel_stream_write_to_stream ( + mem_stream, (CamelStream *) stream, cancellable, NULL); + camel_stream_flush ((CamelStream *) stream, cancellable, NULL); } else { EM_FORMAT_GET_CLASS (emf)->format_optional ( emf, stream, (CamelMimePart *)dw, @@ -1594,10 +1598,12 @@ emf_multipart_appledouble (EMFormat *emf, GCancellable *cancellable, gboolean is_fallback) { - CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)part); + CamelMultipart *mp; CamelMimePart *mime_part; gint len; + mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)part); + if (!CAMEL_IS_MULTIPART (mp)) { em_format_format_source (emf, stream, part, cancellable); return; @@ -1624,9 +1630,11 @@ emf_multipart_mixed (EMFormat *emf, GCancellable *cancellable, gboolean is_fallback) { - CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)part); + CamelMultipart *mp; gint i, nparts, len; + mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)part); + if (!CAMEL_IS_MULTIPART (mp)) { em_format_format_source (emf, stream, part, cancellable); return; @@ -1651,10 +1659,12 @@ emf_multipart_alternative (EMFormat *emf, GCancellable *cancellable, gboolean is_fallback) { - CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)part); + CamelMultipart *mp; gint i, nparts, bestid = 0; CamelMimePart *best = NULL; + mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)part); + if (!CAMEL_IS_MULTIPART (mp)) { em_format_format_source (emf, stream, part, cancellable); return; @@ -1753,7 +1763,8 @@ emf_multipart_encrypted (EMFormat *emf, } /* Currently we only handle RFC2015-style PGP encryption. */ - protocol = camel_content_type_param(((CamelDataWrapper *)mpe)->mime_type, "protocol"); + protocol = camel_content_type_param ( + ((CamelDataWrapper *)mpe)->mime_type, "protocol"); if (!protocol || g_ascii_strcasecmp (protocol, "application/pgp-encrypted") != 0) { em_format_format_error ( emf, stream, _("Unsupported encryption " @@ -1822,7 +1833,7 @@ emf_multipart_related (EMFormat *emf, GCancellable *cancellable, gboolean is_fallback) { - CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)part); + CamelMultipart *mp; CamelMimePart *body_part, *display_part = NULL; CamelContentType *content_type; const gchar *start; @@ -1830,6 +1841,8 @@ emf_multipart_related (EMFormat *emf, gchar *oldpartid; GList *link; + mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)part); + if (!CAMEL_IS_MULTIPART (mp)) { em_format_format_source (emf, stream, part, cancellable); return; @@ -2148,7 +2161,9 @@ emf_inlinepgp_signed (EMFormat *emf, return; } - emf->validity_found |= EM_FORMAT_VALIDITY_FOUND_SIGNED | EM_FORMAT_VALIDITY_FOUND_PGP; + emf->validity_found |= + EM_FORMAT_VALIDITY_FOUND_SIGNED | + EM_FORMAT_VALIDITY_FOUND_PGP; cipher = camel_gpg_context_new (emf->session); /* Verify the signature of the message */ diff --git a/em-format/em-stripsig-filter.c b/em-format/em-stripsig-filter.c index bbca2f6161..fe08383d5c 100644 --- a/em-format/em-stripsig-filter.c +++ b/em-format/em-stripsig-filter.c @@ -61,7 +61,9 @@ strip_signature (CamelMimeFilter *filter, if ((inend - inptr) >= 4 && !strncmp (inptr, "-- \n", 4)) { start = inptr; inptr += 4; - } else if (!stripsig->text_plain_only && (inend - inptr) >= 7 && !g_ascii_strncasecmp (inptr, "-- <BR>", 7)) { + } else if (!stripsig->text_plain_only && + (inend - inptr) >= 7 && + !g_ascii_strncasecmp (inptr, "-- <BR>", 7)) { start = inptr; inptr += 7; } else { diff --git a/filter/e-filter-option.c b/filter/e-filter-option.c index bc61e96c24..7eaa4324d5 100644 --- a/filter/e-filter-option.c +++ b/filter/e-filter-option.c @@ -92,7 +92,9 @@ filter_option_get_dynamic_options (EFilterOption *option) if (g_module_symbol (module, option->dynamic_func, (gpointer) &get_func)) { res = get_func (); } else { - g_warning ("optionlist dynamic fill function '%s' not found", option->dynamic_func); + g_warning ( + "optionlist dynamic fill function '%s' not found", + option->dynamic_func); } g_module_close (module); @@ -186,12 +188,15 @@ filter_option_xml_create (EFilterElement *element, "acceptable in the optionlist '%s'", element->name); } else { - /* Expecting only one <dynamic func="cb" /> in the option list, - The 'cb' should be of this prototype: - GSList *cb (void); - returning GSList of struct _filter_option, all newly allocated, because it'll - be freed with g_free and g_slist_free. 'is_dynamic' member is ignored here. - */ + /* Expecting only one <dynamic func="cb" /> + * in the option list, + * The 'cb' should be of this prototype: + * GSList *cb (void); + * returning GSList of struct _filter_option, + * all newly allocated, because it'll be + * freed with g_free and g_slist_free. + * 'is_dynamic' member is ignored here. + */ xmlChar *fn; fn = xmlGetProp (n, (xmlChar *)"func"); @@ -305,7 +310,8 @@ filter_option_get_widget (EFilterElement *element) gint index = 0, current = 0; if (option->dynamic_func) { - /* it is dynamically filled, thus remove all dynamics and put there the fresh ones */ + /* it is dynamically filled, thus remove all dynamics + * and put there the fresh ones */ GSList *items, *i; GList *old_ops; struct _filter_option *old_cur; diff --git a/filter/e-filter-rule.c b/filter/e-filter-rule.c index d10ae85dda..18fd63b850 100644 --- a/filter/e-filter-rule.c +++ b/filter/e-filter-rule.c @@ -1117,7 +1117,8 @@ e_filter_rule_find_list (GList * list, EFilterRule *rule = link->data; if (strcmp (rule->name, name) == 0) - if (source == NULL || (rule->source != NULL && strcmp (rule->source, source) == 0)) + if (source == NULL || (rule->source != NULL && + strcmp (rule->source, source) == 0)) return rule; } diff --git a/filter/e-rule-context.c b/filter/e-rule-context.c index edfa9e41ea..fac44fa8b9 100644 --- a/filter/e-rule-context.c +++ b/filter/e-rule-context.c @@ -240,7 +240,9 @@ rule_context_load (ERuleContext *context, rule = set->children; while (rule) { if (!strcmp ((gchar *)rule->name, "part")) { - EFilterPart *part = E_FILTER_PART (g_object_new (part_map->type, NULL, NULL)); + EFilterPart *part = + E_FILTER_PART (g_object_new ( + part_map->type, NULL, NULL)); if (e_filter_part_xml_create (part, rule, context) == 0) { part_map->append (context, part); @@ -255,7 +257,9 @@ rule_context_load (ERuleContext *context, rule = set->children; while (rule) { if (!strcmp ((gchar *)rule->name, "rule")) { - EFilterRule *part = E_FILTER_RULE (g_object_new (rule_map->type, NULL, NULL)); + EFilterRule *part = + E_FILTER_RULE (g_object_new ( + rule_map->type, NULL, NULL)); if (e_filter_rule_xml_decode (part, rule, context) == 0) { part->system = TRUE; @@ -281,7 +285,9 @@ rule_context_load (ERuleContext *context, rule = set->children; while (rule) { if (!strcmp ((gchar *)rule->name, "rule")) { - EFilterRule *part = E_FILTER_RULE (g_object_new (rule_map->type, NULL, NULL)); + EFilterRule *part = + E_FILTER_RULE (g_object_new ( + rule_map->type, NULL, NULL)); if (e_filter_rule_xml_decode (part, rule, context) == 0) { rule_map->append (context, part); @@ -384,7 +390,9 @@ rule_context_revert (ERuleContext *context, rule = set->children; while (rule) { if (!strcmp ((gchar *)rule->name, "rule")) { - EFilterRule *part = E_FILTER_RULE (g_object_new (rule_map->type, NULL, NULL)); + EFilterRule *part = + E_FILTER_RULE (g_object_new ( + rule_map->type, NULL, NULL)); if (e_filter_rule_xml_decode (part, rule, context) == 0) { /* use the revert data to keep track of the right rank of this rule part */ @@ -400,7 +408,10 @@ rule_context_revert (ERuleContext *context, e_filter_rule_copy (frule, part); g_object_unref (part); - e_rule_context_rank_rule (context, frule, frule->source, rest_data->rank); + e_rule_context_rank_rule ( + context, frule, + frule->source, + rest_data->rank); g_hash_table_remove (rest_data->rules, frule->name); } else { e_rule_context_add_rule (context, part); diff --git a/libgnomecanvas/gnome-canvas-rich-text.c b/libgnomecanvas/gnome-canvas-rich-text.c index a3ef6447ab..2bd4c779b9 100644 --- a/libgnomecanvas/gnome-canvas-rich-text.c +++ b/libgnomecanvas/gnome-canvas-rich-text.c @@ -2072,7 +2072,9 @@ gnome_canvas_rich_text_add_tag (GnomeCanvasRichText *text, gchar *tag_name, GtkTextTagTable *tag_table; tag_table = gtk_text_buffer_get_tag_table (get_buffer (text)); - g_return_val_if_fail (gtk_text_tag_table_lookup (tag_table, tag_name) == NULL, NULL); + g_return_val_if_fail ( + gtk_text_tag_table_lookup ( + tag_table, tag_name) == NULL, NULL); } tag = gtk_text_buffer_create_tag ( diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c index d21c9b9c97..393d42216e 100644 --- a/libgnomecanvas/gnome-canvas-text.c +++ b/libgnomecanvas/gnome-canvas-text.c @@ -323,7 +323,8 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class) PROP_RISE, g_param_spec_int ("rise", "Rise", - "Offset of text above the baseline (below the baseline if rise is negative)", + "Offset of text above the baseline " + "(below the baseline if rise is negative)", -G_MAXINT, G_MAXINT, 0, diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c index 8be48a95a7..5ad73e7e62 100644 --- a/libgnomecanvas/gnome-canvas.c +++ b/libgnomecanvas/gnome-canvas.c @@ -2546,7 +2546,8 @@ pick_current_item (GnomeCanvas *canvas, GdkEvent *event) canvas->in_repick = FALSE; } - /* new_current_item may have been set to NULL during the call to emit_event() above */ + /* new_current_item may have been set to NULL during the + * call to emit_event() above */ if ((canvas->new_current_item != canvas->current_item) && button_down) { canvas->left_grabbed_item = TRUE; @@ -2907,8 +2908,8 @@ gnome_canvas_set_scroll_region (GnomeCanvas *canvas, vadjustment_value = gtk_adjustment_get_value (vadjustment); /* - * Set the new scrolling region. If possible, do not move the visible contents of the - * canvas. + * Set the new scrolling region. If possible, do not move the + * visible contents of the canvas. */ gnome_canvas_c2w (canvas, diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c index 86ffc92ef0..3addb64011 100644 --- a/mail/e-mail-backend.c +++ b/mail/e-mail-backend.c @@ -125,7 +125,8 @@ mail_backend_prepare_for_offline_cb (EShell *shell, window = e_shell_get_active_window (shell); session = e_mail_backend_get_session (backend); - if (e_shell_get_network_available (shell) && e_shell_backend_is_started (E_SHELL_BACKEND (backend))) + if (e_shell_get_network_available (shell) && + e_shell_backend_is_started (E_SHELL_BACKEND (backend))) synchronize = em_utils_prompt_user ( window, NULL, "mail:ask-quick-offline", NULL); diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index 55f31c7156..78a63248bc 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -290,10 +290,18 @@ mail_display_link_clicked (GtkHTML *html, else flags &= ~EM_FORMAT_HTML_HEADER_BCC; } else if (strcmp (uri, "##HEADERS##") == 0) { - if (em_format_html_get_headers_state (priv->formatter) == EM_FORMAT_HTML_HEADERS_STATE_COLLAPSED) - em_format_html_set_headers_state (priv->formatter, EM_FORMAT_HTML_HEADERS_STATE_EXPANDED); + EMFormatHTMLHeadersState state; + + state = em_format_html_get_headers_state ( + priv->formatter); + + if (state == EM_FORMAT_HTML_HEADERS_STATE_COLLAPSED) + state = EM_FORMAT_HTML_HEADERS_STATE_EXPANDED; else - em_format_html_set_headers_state (priv->formatter, EM_FORMAT_HTML_HEADERS_STATE_COLLAPSED); + state = EM_FORMAT_HTML_HEADERS_STATE_COLLAPSED; + + em_format_html_set_headers_state ( + priv->formatter, state); } priv->formatter->header_wrap_flags = flags; diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c index 589b522603..8c79a824df 100644 --- a/mail/e-mail-paned-view.c +++ b/mail/e-mail-paned-view.c @@ -795,7 +795,9 @@ mail_paned_view_update_view_instance (EMailView *view) em_utils_folder_is_sent (folder); if (e_shell_settings_get_boolean (shell_settings, "mail-global-view-setting")) - view_instance = e_shell_view_new_view_instance (shell_view, outgoing_folder ? "global_view_sent_setting" : "global_view_setting"); + view_instance = e_shell_view_new_view_instance ( + shell_view, outgoing_folder ? + "global_view_sent_setting" : "global_view_setting"); else view_instance = e_shell_view_new_view_instance (shell_view, view_id); diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 6ef8ec2e29..dc163bda06 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -627,6 +627,7 @@ static void check_close_browser_reader (EMailReader *reader) { GConfClient *client; + const gchar *key; gchar *value; gboolean close_it = FALSE; @@ -636,8 +637,8 @@ check_close_browser_reader (EMailReader *reader) client = gconf_client_get_default (); - value = gconf_client_get_string ( - client, "/apps/evolution/mail/prompts/reply_close_browser", NULL); + key = "/apps/evolution/mail/prompts/reply_close_browser"; + value = gconf_client_get_string (client, key, NULL); if (value && g_str_equal (value, "always")) { close_it = TRUE; @@ -665,10 +666,10 @@ check_close_browser_reader (EMailReader *reader) close_it = response == GTK_RESPONSE_YES || response == GTK_RESPONSE_OK; - if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_CANCEL) - gconf_client_set_string ( - client, "/apps/evolution/mail/prompts/reply_close_browser", - response == GTK_RESPONSE_OK ? "always" : "never", NULL); + if (response == GTK_RESPONSE_OK) + gconf_client_set_string (client, key, "always", NULL); + else if (response == GTK_RESPONSE_CANCEL) + gconf_client_set_string (client, key, "never", NULL); } g_free (value); @@ -1441,7 +1442,8 @@ action_mail_reply_sender_check (CamelFolder *folder, type = E_MAIL_REPLY_TO_ALL; else if (response == GTK_RESPONSE_OK) type = E_MAIL_REPLY_TO_LIST; - else if (response == GTK_RESPONSE_CANCEL || response == GTK_RESPONSE_DELETE_EVENT) { + else if (response == GTK_RESPONSE_CANCEL || + response == GTK_RESPONSE_DELETE_EVENT) { g_object_unref (message); goto exit; } diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c index f8ca413c08..43670a3e93 100644 --- a/mail/e-mail-session.c +++ b/mail/e-mail-session.c @@ -638,20 +638,27 @@ mail_session_get_password (CamelSession *session, remember = config_service?config_service->save_passwd:FALSE; - if (!config_service || (config_service && !config_service->get_password_canceled)) { + if (!config_service || (config_service && + !config_service->get_password_canceled)) { guint32 eflags; gchar *title; if (flags & CAMEL_SESSION_PASSPHRASE) { if (account) - title = g_strdup_printf (_("Enter Passphrase for %s"), account->name); + title = g_strdup_printf ( + _("Enter Passphrase for %s"), + account->name); else - title = g_strdup (_("Enter Passphrase")); + title = g_strdup ( + _("Enter Passphrase")); } else { if (account) - title = g_strdup_printf (_("Enter Password for %s"), account->name); + title = g_strdup_printf ( + _("Enter Password for %s"), + account->name); else - title = g_strdup (_("Enter Password")); + title = g_strdup ( + _("Enter Password")); } if ((flags & CAMEL_SESSION_PASSWORD_STATIC) != 0) eflags = E_PASSWORDS_REMEMBER_NEVER; diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c index 6313640f93..214efb0bb3 100644 --- a/mail/e-mail-store.c +++ b/mail/e-mail-store.c @@ -248,7 +248,8 @@ mail_store_load_accounts (EMailSession *session, if (!account->enabled) continue; - /* Do not add local-delivery files, but make them ready for later use. */ + /* Do not add local-delivery files, + * but make them ready for later use. */ url = camel_url_new (account->source->url, NULL); if (url != NULL) { skip = em_utils_is_local_delivery_mbox_file (url); @@ -258,10 +259,17 @@ mail_store_load_accounts (EMailSession *session, if (skip) { GError *error = NULL; - if (!camel_session_add_service (CAMEL_SESSION (session), account->uid, account->source->url, CAMEL_PROVIDER_STORE, &error)) { - g_warning ("%s: Failed to add '%s' as store: %s", G_STRFUNC, account->source->url, error ? error->message : "Unknown error"); - if (error) - g_error_free (error); + camel_session_add_service ( + CAMEL_SESSION (session), + account->uid, account->source->url, + CAMEL_PROVIDER_STORE, &error); + + if (error != NULL) { + g_warning ( + "Failed to add '%s' as store: %s", + account->source->url, + error->message); + g_error_free (error); } } else { e_mail_store_add_by_account (session, account); diff --git a/mail/em-config.c b/mail/em-config.c index e6ed1d5b3b..53728b8e66 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -84,7 +84,7 @@ em_config_set_target (EConfig *ep, config->priv->account_changed_id = g_signal_connect ( s->modified_account, "changed", - G_CALLBACK(emp_account_changed), ep); + G_CALLBACK (emp_account_changed), ep); break; } } } diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c index 44da01f912..9ca3267e4c 100644 --- a/mail/em-folder-selection-button.c +++ b/mail/em-folder-selection-button.c @@ -249,7 +249,6 @@ folder_selection_button_clicked (GtkButton *button) if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK) goto exit; - uri = em_folder_selector_get_selected_uri ( EM_FOLDER_SELECTOR (dialog)); em_folder_selection_button_set_selection ( diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 95aa6b81c6..794586399c 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1826,7 +1826,8 @@ tree_drag_data_get (GtkWidget *widget, CamelStore *store; GtkTreeIter iter; - if (!priv->drag_row || !(src_path = gtk_tree_row_reference_get_path (priv->drag_row))) + if (!priv->drag_row || !(src_path = + gtk_tree_row_reference_get_path (priv->drag_row))) return; model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_tree)); diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index c64972d57f..89f382da9b 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -68,7 +68,11 @@ static gboolean emfu_is_special_local_folder (const gchar *name) { - return (!strcmp (name, "Drafts") || !strcmp (name, "Inbox") || !strcmp (name, "Outbox") || !strcmp (name, "Sent") || !strcmp (name, "Templates")); + return (!strcmp (name, "Drafts") || + !strcmp (name, "Inbox") || + !strcmp (name, "Outbox") || + !strcmp (name, "Sent") || + !strcmp (name, "Templates")); } struct _EMCopyFolders { @@ -153,8 +157,10 @@ emft_copy_folders__exec (struct _EMCopyFolders *m, d(printf ("Copying from '%s' to '%s'\n", info->full_name, toname->str)); - /* This makes sure we create the same tree, e.g. from a nonselectable source */ - /* Not sure if this is really the 'right thing', e.g. for spool stores, but it makes the ui work */ + /* This makes sure we create the same tree, + * e.g. from a nonselectable source. */ + /* Not sure if this is really the 'right thing', + * e.g. for spool stores, but it makes the ui work. */ if ((info->flags & CAMEL_FOLDER_NOSELECT) == 0) { d(printf ("this folder is selectable\n")); if (m->tostore == m->fromstore && m->delete) { @@ -218,7 +224,8 @@ emft_copy_folders__exec (struct _EMCopyFolders *m, } } - /* delete the folders in reverse order from how we copyied them, if we are deleting any */ + /* Delete the folders in reverse order from how we copied them, + * if we are deleting any. */ l = deleting; while (l) { CamelFolderInfo *info = l->data; @@ -265,7 +272,11 @@ static MailMsgInfo copy_folders_info = { }; gint -em_folder_utils_copy_folders (CamelStore *fromstore, const gchar *frombase, CamelStore *tostore, const gchar *tobase, gint delete) +em_folder_utils_copy_folders (CamelStore *fromstore, + const gchar *frombase, + CamelStore *tostore, + const gchar *tobase, + gint delete) { struct _EMCopyFolders *m; gint seq; @@ -541,7 +552,9 @@ em_folder_utils_delete_folder (EMailBackend *backend, return; } - if (mail_folder_cache_get_folder_info_flags (folder_cache, folder, &flags) && (flags & CAMEL_FOLDER_SYSTEM)) { + if (mail_folder_cache_get_folder_info_flags ( + folder_cache, folder, &flags) && + (flags & CAMEL_FOLDER_SYSTEM)) { e_mail_backend_submit_alert ( backend, "mail:no-delete-special-folder", camel_folder_get_display_name (folder), NULL); @@ -550,7 +563,9 @@ em_folder_utils_delete_folder (EMailBackend *backend, g_object_ref (folder); - if (mail_folder_cache_get_folder_info_flags (folder_cache, folder, &flags) && (flags & CAMEL_FOLDER_CHILDREN)) { + if (mail_folder_cache_get_folder_info_flags ( + folder_cache, folder, &flags) && + (flags & CAMEL_FOLDER_CHILDREN)) { if (parent_store && CAMEL_IS_VEE_STORE (parent_store)) dialog = e_alert_dialog_new_for_args ( parent, "mail:ask-delete-vfolder", @@ -559,8 +574,7 @@ em_folder_utils_delete_folder (EMailBackend *backend, dialog = e_alert_dialog_new_for_args ( parent, "mail:ask-delete-folder", full_name, NULL); - } - else { + } else { if (parent_store && CAMEL_IS_VEE_STORE (parent_store)) dialog = e_alert_dialog_new_for_args ( parent, "mail:ask-delete-vfolder-nochild", @@ -658,7 +672,11 @@ static MailMsgInfo create_folder_info = { }; static gint -emfu_create_folder_real (CamelStore *store, const gchar *full_name, void (* done) (CamelFolderInfo *fi, gpointer user_data), gpointer user_data) +emfu_create_folder_real (CamelStore *store, + const gchar *full_name, + void (*done) (CamelFolderInfo *fi, + gpointer user_data), + gpointer user_data) { gchar *name, *namebuf = NULL; struct _EMCreateFolder *m; @@ -692,13 +710,18 @@ emfu_create_folder_real (CamelStore *store, const gchar *full_name, void (* done } static void -new_folder_created_cb (CamelFolderInfo *fi, gpointer user_data) +new_folder_created_cb (CamelFolderInfo *fi, + gpointer user_data) { struct _EMCreateFolderTempData *emcftd=user_data; if (fi) { /* Exapnding newly created folder */ if (emcftd->emft) - em_folder_tree_set_selected ((EMFolderTree *) emcftd->emft, emcftd->uri, GPOINTER_TO_INT(g_object_get_data ((GObject *)emcftd->emft, "select")) ? FALSE : TRUE); + em_folder_tree_set_selected ( + EM_FOLDER_TREE (emcftd->emft), + emcftd->uri, GPOINTER_TO_INT ( + g_object_get_data (G_OBJECT (emcftd->emft), + "select")) ? FALSE : TRUE); gtk_widget_destroy ((GtkWidget *) emcftd->emfs); } @@ -759,7 +782,8 @@ emfu_popup_new_folder_response (EMFolderSelector *emfs, gtk_widget_destroy ((GtkWidget *)emfs); } else { /* Temp data to pass to create_folder_real function */ - emcftd = (struct _EMCreateFolderTempData *) g_malloc (sizeof (struct _EMCreateFolderTempData)); + emcftd = (struct _EMCreateFolderTempData *) + g_malloc (sizeof (struct _EMCreateFolderTempData)); emcftd->emfs = emfs; emcftd->uri = g_strdup (uri); emcftd->emft = folder_tree; @@ -770,7 +794,6 @@ emfu_popup_new_folder_response (EMFolderSelector *emfs, } } - /* FIXME: these functions must be documented */ void em_folder_utils_create_folder (GtkWindow *parent, diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 363be9afe7..6103f25e40 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -2817,9 +2817,9 @@ efh_format_headers (EMFormatHTML *efh, g_string_free (tmp, TRUE); } else if (!g_ascii_strcasecmp (header->name, "Subject")) { gchar *buf = NULL; - buf = camel_header_unfold (header->value); - subject = camel_header_decode_string (buf, hdr_charset); - g_free (buf); + buf = camel_header_unfold (header->value); + subject = camel_header_decode_string (buf, hdr_charset); + g_free (buf); } header = header->next; } @@ -2909,12 +2909,12 @@ efh_format_headers (EMFormatHTML *efh, } else { if (efh->priv->headers_collapsable) camel_stream_printf (stream, "<tr><td valign=\"top\" width=\"20\"><a href=\"##HEADERS##\"><img src=\"%s/minus.png\"></a></td><td><table border=0 cellpadding=\"0\">\n", - evolution_imagesdir); - else + evolution_imagesdir); + else camel_stream_printf (stream, "<tr><td><table border=0 cellpadding=\"0\">\n"); - } + } - g_free (evolution_imagesdir); + g_free (evolution_imagesdir); /* dump selected headers */ if (emf->mode == EM_FORMAT_MODE_ALLHEADERS) { diff --git a/mail/em-format-html.h b/mail/em-format-html.h index 4e62cb7e37..37eace367f 100644 --- a/mail/em-format-html.h +++ b/mail/em-format-html.h @@ -133,7 +133,10 @@ struct _EMFormatHTMLJob { /* Pending object (classid: url) */ typedef struct _EMFormatHTMLPObject EMFormatHTMLPObject; -typedef gboolean (*EMFormatHTMLPObjectFunc)(EMFormatHTML *md, GtkHTMLEmbedded *eb, EMFormatHTMLPObject *pobject); +typedef gboolean + (*EMFormatHTMLPObjectFunc) (EMFormatHTML *md, + GtkHTMLEmbedded *eb, + EMFormatHTMLPObject *pobject); /** * struct _EMFormatHTMLPObject - Pending object. @@ -162,11 +165,16 @@ struct _EMFormatHTMLPObject { }; #define EM_FORMAT_HTML_HEADER_NOCOLUMNS (EM_FORMAT_HEADER_LAST) -#define EM_FORMAT_HTML_HEADER_HTML (EM_FORMAT_HEADER_LAST<<1) /* header already in html format */ -#define EM_FORMAT_HTML_HEADER_NODEC (EM_FORMAT_HEADER_LAST<<2) /* header already in html format */ + +/* header already in html format */ +#define EM_FORMAT_HTML_HEADER_HTML (EM_FORMAT_HEADER_LAST<<1) +#define EM_FORMAT_HTML_HEADER_NODEC (EM_FORMAT_HEADER_LAST<<2) + #define EM_FORMAT_HTML_HEADER_LAST (EM_FORMAT_HEADER_LAST<<8) -#define EM_FORMAT_HTML_VPAD "<table cellspacing=0 cellpadding=3><tr><td><a name=\"padding\"></a></td></tr></table>\n" +#define EM_FORMAT_HTML_VPAD \ + "<table cellspacing=0 cellpadding=3><tr><td>" \ + "<a name=\"padding\"></a></td></tr></table>\n" /** * struct _EMFormatHTML - HTML formatter object. diff --git a/mail/em-utils.c b/mail/em-utils.c index 2bc8831ad4..aef894a9e1 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -1325,7 +1325,8 @@ em_utils_message_to_html (CamelMimeMessage *message, GConfClient *gconf; gchar *charset; - /* FIXME: we should be getting this from the current view, not the global setting. */ + /* 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); @@ -1633,7 +1634,8 @@ search_address_in_addressbooks (const gchar *address, query = e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_IS, address); - for (g = e_source_list_peek_groups (emu_books_source_list); g; g = g_slist_next (g)) { + for (g = e_source_list_peek_groups (emu_books_source_list); + g; g = g_slist_next (g)) { ESourceGroup *group = g->data; if (!group) @@ -1738,7 +1740,8 @@ search_address_in_addressbooks (const gchar *address, g_list_free (contacts); } } else if (book) { - stop = stop || (err && g_error_matches (err, E_BOOK_ERROR, E_BOOK_ERROR_CANCELLED)); + stop = stop || (err && g_error_matches ( + err, E_BOOK_ERROR, E_BOOK_ERROR_CANCELLED)); if (err && !stop) { gchar *source_uid = g_strdup (e_source_peek_uid (source)); @@ -1760,7 +1763,9 @@ search_address_in_addressbooks (const gchar *address, if (stop && !cached_book && book) { g_object_unref (book); } else if (!stop && book && !cached_book) { - g_hash_table_insert (emu_books_hash, g_strdup (e_source_peek_uid (source)), book); + g_hash_table_insert ( + emu_books_hash, g_strdup ( + e_source_peek_uid (source)), book); } } diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index 2abd99ef9e..c144cbd799 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -648,7 +648,9 @@ source_remove (GtkWidget *widget, struct _source_data *data) gtk_tree_path_free (path); gtk_tree_selection_select_iter (selection, &iter); - gtk_tree_model_get (GTK_TREE_MODEL (data->model), &iter, 0, &data->current, -1); + gtk_tree_model_get ( + GTK_TREE_MODEL (data->model), &iter, + 0, &data->current, -1); } else { data->current = NULL; } @@ -691,7 +693,8 @@ get_widget (EFilterRule *fr, ERuleContext *rc) g_object_set_data_full((GObject *)frame, "data", data, g_free); for (i = 0; i < BUTTON_LAST; i++) { - data->buttons[i] =(GtkButton *)e_builder_get_widget (builder, edit_buttons[i].name); + data->buttons[i] =(GtkButton *) + e_builder_get_widget (builder, edit_buttons[i].name); g_signal_connect(data->buttons[i], "clicked", edit_buttons[i].func, data); } diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index f6cbbbb82c..f8edee6dac 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -118,7 +118,9 @@ import_mbox_exec (struct _import_mbox_msg *m, CamelMessageInfo *info; if (g_stat (m->path, &st) == -1) { - g_warning("cannot find source file to import '%s': %s", m->path, g_strerror(errno)); + g_warning ( + "cannot find source file to import '%s': %s", + m->path, g_strerror (errno)); return; } @@ -135,7 +137,9 @@ import_mbox_exec (struct _import_mbox_msg *m, if (S_ISREG (st.st_mode)) { fd = g_open (m->path, O_RDONLY|O_BINARY, 0); if (fd == -1) { - g_warning("cannot find source file to import '%s': %s", m->path, g_strerror(errno)); + g_warning ( + "cannot find source file to import '%s': %s", + m->path, g_strerror (errno)); goto fail1; } @@ -157,7 +161,9 @@ import_mbox_exec (struct _import_mbox_msg *m, guint32 flags = 0; if (st.st_size > 0) - pc = (gint)(100.0 * ((double)camel_mime_parser_tell (mp) / (double)st.st_size)); + pc = (gint) (100.0 * ((gdouble) + camel_mime_parser_tell (mp) / + (gdouble) st.st_size)); camel_operation_progress (cancellable, pc); msg = camel_mime_message_new (); diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index 7edefd3782..1068f3600f 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -153,16 +153,24 @@ flush_updates_idle_cb (MailFolderCache *self) if (up->remove) { if (up->delete) { - g_signal_emit (self, signals[FOLDER_DELETED], 0, up->store, up->full_name); + g_signal_emit ( + self, signals[FOLDER_DELETED], 0, + up->store, up->full_name); } else - g_signal_emit (self, signals[FOLDER_UNAVAILABLE], 0, up->store, up->full_name); + g_signal_emit ( + self, signals[FOLDER_UNAVAILABLE], 0, + up->store, up->full_name); } else { if (up->oldfull && up->add) { - g_signal_emit (self, signals[FOLDER_RENAMED], 0, up->store, up->oldfull, up->full_name); + g_signal_emit ( + self, signals[FOLDER_RENAMED], 0, + up->store, up->oldfull, up->full_name); } if (!up->oldfull && up->add) - g_signal_emit (self, signals[FOLDER_AVAILABLE], 0, up->store, up->full_name); + g_signal_emit ( + self, signals[FOLDER_AVAILABLE], 0, + up->store, up->full_name); } /* update unread counts */ @@ -588,8 +596,6 @@ rename_folders (MailFolderCache *self, old = g_strdup_printf("%s%s", oldbase, fi->full_name + strlen(newbase)); mfi = g_hash_table_lookup (si->folders, old); if (mfi) { - d(printf("Found old folder '%s' renaming to '%s'\n", mfi->full_name, fi->full_name)); - up->oldfull = mfi->full_name; /* Its a rename op */ diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 7bc8384802..71037cb5b2 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -69,7 +69,10 @@ struct _folder_info { gchar *uri; CamelFolder *folder; time_t update; - gint count; /* how many times updated, to slow it down as we go, if we have lots */ + + /* How many times updated, to slow it + * down as we go, if we have lots. */ + gint count; }; struct _send_data { @@ -78,7 +81,9 @@ struct _send_data { GtkDialog *gd; gint cancelled; - CamelFolder *inbox; /* since we're never asked to update this one, do it ourselves */ + /* Since we're never asked to update + * this one, do it ourselves. */ + CamelFolder *inbox; time_t inbox_update; GMutex *lock; @@ -544,7 +549,8 @@ build_dialog (GtkWindow *parent, info->keep_on_server = source->keep_on_server; info->cancellable = camel_operation_new (); info->state = allow_send ? SEND_ACTIVE : SEND_COMPLETE; - info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); + info->timeout_id = g_timeout_add ( + STATUS_TIMEOUT, operation_status_timeout, info); g_signal_connect ( info->cancellable, "status", @@ -558,7 +564,8 @@ build_dialog (GtkWindow *parent, e_iterator_next (iter); continue; } else if (info->timeout_id == 0) - info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); + info->timeout_id = g_timeout_add ( + STATUS_TIMEOUT, operation_status_timeout, info); recv_icon = gtk_image_new_from_icon_name ( "mail-inbox", GTK_ICON_SIZE_LARGE_TOOLBAR); @@ -640,7 +647,8 @@ build_dialog (GtkWindow *parent, info->keep_on_server = FALSE; info->cancellable = camel_operation_new (); info->state = SEND_ACTIVE; - info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); + info->timeout_id = g_timeout_add ( + STATUS_TIMEOUT, operation_status_timeout, info); g_free (transport_uid); @@ -651,7 +659,8 @@ build_dialog (GtkWindow *parent, g_hash_table_insert (data->active, (gpointer) SEND_URI_KEY, info); list = g_list_prepend (list, info); } else if (info->timeout_id == 0) - info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); + info->timeout_id = g_timeout_add ( + STATUS_TIMEOUT, operation_status_timeout, info); send_icon = gtk_image_new_from_icon_name ( "mail-outbox", GTK_ICON_SIZE_LARGE_TOOLBAR); diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index b867bf485b..67e3d0752a 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -501,9 +501,12 @@ mail_vfolder_add_folder (EMailSession *session, * they must be explictly listed as a source. */ if (rule->source && !is_ignore - && ((((EMVFolderRule *)rule)->with == EM_VFOLDER_RULE_WITH_LOCAL && !remote) - || (((EMVFolderRule *)rule)->with == EM_VFOLDER_RULE_WITH_REMOTE_ACTIVE && remote) - || (((EMVFolderRule *)rule)->with == EM_VFOLDER_RULE_WITH_LOCAL_REMOTE_ACTIVE))) + && ((((EMVFolderRule *)rule)->with == + EM_VFOLDER_RULE_WITH_LOCAL && !remote) + || (((EMVFolderRule *)rule)->with == + EM_VFOLDER_RULE_WITH_REMOTE_ACTIVE && remote) + || (((EMVFolderRule *)rule)->with == + EM_VFOLDER_RULE_WITH_LOCAL_REMOTE_ACTIVE))) found = TRUE; source = NULL; @@ -938,7 +941,9 @@ store_folder_deleted_cb (CamelStore *store, 0, 0, NULL, context_rule_removed, context); e_rule_context_remove_rule ((ERuleContext *)context, rule); g_object_unref (rule); - g_signal_connect(context, "rule_removed", G_CALLBACK(context_rule_removed), context); + g_signal_connect ( + context, "rule_removed", + G_CALLBACK (context_rule_removed), context); config_dir = mail_session_get_config_dir (); user = g_build_filename (config_dir, "vfolders.xml", NULL); diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c index 61aff5aa5c..412e5a2521 100644 --- a/modules/calendar/e-cal-shell-view-private.c +++ b/modules/calendar/e-cal-shell-view-private.c @@ -532,8 +532,10 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view) /* Give GnomeCalendar a handle to the date navigator, memo and task table. */ gnome_calendar_set_date_navigator (calendar, date_navigator); - gnome_calendar_set_memo_table (calendar, memo_table ? GTK_WIDGET (memo_table) : NULL); - gnome_calendar_set_task_table (calendar, task_table ? GTK_WIDGET (task_table) : NULL); + gnome_calendar_set_memo_table ( + calendar, memo_table ? GTK_WIDGET (memo_table) : NULL); + gnome_calendar_set_task_table ( + calendar, task_table ? GTK_WIDGET (task_table) : NULL); e_calendar_item_set_get_time_callback ( date_navigator->calitem, (ECalendarItemGetTimeCallback) diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index 22feb95728..c651cdee77 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -185,7 +185,7 @@ jh_add_cb (GtkWidget *widget, gpointer user_data) GtkWidget *dialog; GtkWidget *entry; EMMailerPrefs *prefs = (EMMailerPrefs *) user_data; - GtkBuilder *builder = gtk_builder_new(); + GtkBuilder *builder = gtk_builder_new (); gchar *tok; const gchar *name, *value; GSList *list; diff --git a/modules/plugin-mono/e-plugin-mono.c b/modules/plugin-mono/e-plugin-mono.c index d09cf1bb56..e2d6756af4 100644 --- a/modules/plugin-mono/e-plugin-mono.c +++ b/modules/plugin-mono/e-plugin-mono.c @@ -177,7 +177,8 @@ plugin_mono_invoke (EPlugin *plugin, return NULL; } - m = mono_method_desc_search_in_image (d, mono_assembly_get_image (priv->assembly)); + m = mono_method_desc_search_in_image ( + d, mono_assembly_get_image (priv->assembly)); if (m == NULL) { g_warning ("Can't find method callback '%s'", name); return NULL; diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c index 294b466263..47e4139cda 100644 --- a/plugins/dbx-import/dbx-importer.c +++ b/plugins/dbx-import/dbx-importer.c @@ -576,7 +576,8 @@ dbx_import_file (DbxImporter *m) gint i; gint missing = 0; m->status_what = NULL; - filename = g_filename_from_uri (((EImportTargetURI *)m->target)->uri_src, NULL, NULL); + filename = g_filename_from_uri ( + ((EImportTargetURI *)m->target)->uri_src, NULL, NULL); /* Destination folder, was set in our widget */ m->parent_uri = g_strdup (((EImportTargetURI *)m->target)->uri_dest); @@ -600,7 +601,8 @@ dbx_import_file (DbxImporter *m) camel_folder_freeze (folder); - filename = g_filename_from_uri (((EImportTargetURI *)m->target)->uri_src, NULL, NULL); + filename = g_filename_from_uri ( + ((EImportTargetURI *)m->target)->uri_src, NULL, NULL); m->dbx_fd = g_open (filename, O_RDONLY, 0); g_free (filename); diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index a91c813799..8bfec0df55 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -490,7 +490,8 @@ do_save_calendar_csv (FormatHandler *handler, * if (temp_time) e_cal_component_free_icaltimetype (temp_time); * * Please uncomment and fix documentation if untrue - * http://www.gnome.org/projects/evolution/developer-doc/libecal/ECalComponent.html + * http://www.gnome.org/projects/evolution/ + * developer-doc/libecal/ECalComponent.html * #e-cal-component-get-last-modified */ g_output_stream_write_all (stream, line->str, line->len, NULL, NULL, &error); diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index aa43d4921b..b97926adfe 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -471,7 +471,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) /* Case insensitive version of strstr */ static gchar * -strstr_nocase (const gchar* haystack, const gchar *needle) +strstr_nocase (const gchar * haystack, const gchar *needle) { /* When _GNU_SOURCE is available, use the nonstandard extension of libc */ #ifdef _GNU_SOURCE @@ -606,7 +606,7 @@ fill_template (CamelMimeMessage *message, CamelMimePart *template) } } } else - message_part = CAMEL_MIME_PART (message); + message_part = CAMEL_MIME_PART (message); /* Get content of the template */ stream = camel_stream_mem_new (); @@ -655,7 +655,7 @@ fill_template (CamelMimeMessage *message, CamelMimePart *template) camel_data_wrapper_decode_to_stream_sync (camel_medium_get_content (CAMEL_MEDIUM (message_part)), stream, NULL, NULL); camel_stream_flush (stream, NULL, NULL); byte_array = camel_stream_mem_get_byte_array (CAMEL_STREAM_MEM (stream)); - message_body = g_string_new_len ((gchar*)byte_array->data, byte_array->len); + message_body = g_string_new_len ((gchar *)byte_array->data, byte_array->len); g_object_unref (stream); if (template_html && !message_html) { @@ -742,7 +742,7 @@ create_new_message (CamelFolder *folder, const gchar *uid, CamelMimeMessage *mes if (ct && (camel_content_type_is (ct, "text", "html") || camel_content_type_is (ct, "text", "plain"))) { - template_part = CAMEL_MIME_PART (template); + template_part = CAMEL_MIME_PART (template); new_content_type = ct; } } @@ -1144,8 +1144,8 @@ rebuild_template_menu (EShellWindow *shell_window) static void templates_folder_msg_changed_cb (CamelFolder *folder, - CamelFolderChangeInfo *change_info, - EShellWindow *shell_window) + CamelFolderChangeInfo *change_info, + EShellWindow *shell_window) { rebuild_template_menu (shell_window); } diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c index 41d829b9e6..6874c2e304 100644 --- a/shell/e-shell-migrate.c +++ b/shell/e-shell-migrate.c @@ -809,8 +809,9 @@ merge_duplicate_local_sources (GConfClient *client, const gchar *gconf_key) GSList *sources; ESourceGroup *group = iter->data; - if (!group || !e_source_group_peek_base_uri (group) - || g_ascii_strncasecmp (e_source_group_peek_base_uri (group), "local:", 6) != 0) + if (!group || !e_source_group_peek_base_uri (group) || + g_ascii_strncasecmp ( + e_source_group_peek_base_uri (group), "local:", 6) != 0) continue; if (!first_local) { @@ -819,14 +820,16 @@ merge_duplicate_local_sources (GConfClient *client, const gchar *gconf_key) } /* merging respective sources */ - for (sources = e_source_group_peek_sources (group); sources != NULL; 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; @@ -862,7 +865,8 @@ merge_duplicate_local_sources (GConfClient *client, const gchar *gconf_key) if (first_local) { GSList *sources; - for (sources = e_source_group_peek_sources (first_local); sources != NULL; sources = sources->next) { + for (sources = e_source_group_peek_sources (first_local); + sources != NULL; sources = sources->next) { ESource *source = sources->data; const gchar *relative_uri; diff --git a/shell/es-event.c b/shell/es-event.c index c260faebee..6fc6751d3a 100644 --- a/shell/es-event.c +++ b/shell/es-event.c @@ -220,8 +220,12 @@ es_event_hook_get_type (void) if (!type) { static const GTypeInfo info = { - sizeof (ESEventHookClass), NULL, NULL, (GClassInitFunc) emeh_class_init, NULL, NULL, - sizeof (ESEventHook), 0, (GInstanceInitFunc) NULL, + sizeof (ESEventHookClass), + NULL, NULL, + (GClassInitFunc) emeh_class_init, + NULL, NULL, + sizeof (ESEventHook), + 0, (GInstanceInitFunc) NULL }; emeh_parent_class = g_type_class_ref (e_event_hook_get_type ()); diff --git a/shell/main.c b/shell/main.c index 001d6bd843..62d19259aa 100644 --- a/shell/main.c +++ b/shell/main.c @@ -350,16 +350,16 @@ setup_quit_signal (void) static GOptionEntry entries[] = { #ifdef G_OS_WIN32 - { "register-handlers", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, ®ister_handlers, - NULL, NULL }, + { "register-handlers", '\0', G_OPTION_FLAG_HIDDEN, + G_OPTION_ARG_NONE, ®ister_handlers, NULL, NULL }, { "reinstall", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &reinstall, NULL, NULL }, { "show-icons", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &show_icons, NULL, NULL }, { "hide-icons", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &hide_icons, NULL, NULL }, - { "unregister-handlers", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &unregister_handlers, - NULL, NULL }, + { "unregister-handlers", '\0', G_OPTION_FLAG_HIDDEN, + G_OPTION_ARG_NONE, &unregister_handlers, NULL, NULL }, #endif /* G_OS_WIN32 */ { "component", 'c', 0, G_OPTION_ARG_STRING, &requested_view, /* Translators: Do NOT translate the five component diff --git a/smime/lib/e-asn1-object.c b/smime/lib/e-asn1-object.c index 22788c4bba..d858a53579 100644 --- a/smime/lib/e-asn1-object.c +++ b/smime/lib/e-asn1-object.c @@ -344,7 +344,8 @@ e_asn1_object_get_children (EASN1Object *obj) void e_asn1_object_append_child (EASN1Object *parent, EASN1Object *child) { - parent->priv->children = g_list_append (parent->priv->children, g_object_ref (child)); + parent->priv->children = g_list_append ( + parent->priv->children, g_object_ref (child)); } void diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index ca77c5af5c..26cfdea4ec 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -772,7 +772,8 @@ on_combo_changed (GtkComboBox *combo_box, ETimezoneDialog *etd) priv = etd->priv; - timezone_combo_get_active_text (GTK_COMBO_BOX (priv->timezone_combo), &new_zone_name); + timezone_combo_get_active_text ( + GTK_COMBO_BOX (priv->timezone_combo), &new_zone_name); if (!*new_zone_name) priv->zone = NULL; diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index c76a9fa62e..aa666f5267 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -3211,7 +3211,8 @@ e_calendar_item_ensure_days_visible (ECalendarItem *calitem, ¤t_end_month); /* Try to ensure that the end month is shown. */ - if ((end_year == current_end_year + 1 && current_end_month == 11 && end_month == 0) || + if ((end_year == current_end_year + 1 && + current_end_month == 11 && end_month == 0) || (end_year == current_end_year && end_month == current_end_month + 1)) { /* See if the end of the selection will fit in the leftover days of the month after the last one shown. */ diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c index 4e704bd39a..881f1f332c 100644 --- a/widgets/misc/e-dateedit.c +++ b/widgets/misc/e-dateedit.c @@ -1978,7 +1978,8 @@ e_date_edit_update_time_entry (EDateEdit *dedit) /* This is a strftime() format. %H = hour (0-23), %M = minute. */ e_time_format_time (&tmp_tm, 1, 0, buffer, sizeof (buffer)); else - /* This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string. */ + /* This is a strftime() format. %I = hour (1-12), + * %M = minute, %p = am/pm string. */ e_time_format_time (&tmp_tm, 0, 0, buffer, sizeof (buffer)); /* For 12-hour am/pm format, we want space padding, not zero padding. This diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index 405a55d686..6b90887ffc 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -973,7 +973,9 @@ e_map_zoom_out (EMap *map) e_map_set_zoom (map, E_MAP_ZOOMED_OUT); center_at (map, longitude, latitude); - e_map_tween_new_from (map, E_MAP_TWEEN_DURATION_MSECS, longitude, latitude, prevzoom); + e_map_tween_new_from ( + map, E_MAP_TWEEN_DURATION_MSECS, + longitude, latitude, prevzoom); } void diff --git a/widgets/misc/ea-calendar-cell.c b/widgets/misc/ea-calendar-cell.c index 2915a6cd04..cff30af4d8 100644 --- a/widgets/misc/ea-calendar-cell.c +++ b/widgets/misc/ea-calendar-cell.c @@ -377,7 +377,8 @@ component_interface_grab_focus (AtkComponent *component) atk_selection_add_selection (ATK_SELECTION (ea_calitem), index); gtk_widget_grab_focus (GTK_WIDGET (GNOME_CANVAS_ITEM (calitem)->canvas)); - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (GNOME_CANVAS_ITEM (calitem)->canvas)); + toplevel = gtk_widget_get_toplevel ( + GTK_WIDGET (GNOME_CANVAS_ITEM (calitem)->canvas)); if (toplevel && gtk_widget_is_toplevel (toplevel)) gtk_window_present (GTK_WINDOW (toplevel)); diff --git a/widgets/misc/ea-calendar-item.c b/widgets/misc/ea-calendar-item.c index e9977bf01e..6179d45551 100644 --- a/widgets/misc/ea-calendar-item.c +++ b/widgets/misc/ea-calendar-item.c @@ -1306,7 +1306,8 @@ ea_calendar_set_focus_object (EaCalendarItem *ea_calitem, AtkObject *item_cell) AtkStateSet *state_set, *old_state_set; AtkObject *old_cell; - old_cell = (AtkObject *)g_object_get_data (G_OBJECT(ea_calitem), "gail-focus-object"); + old_cell = (AtkObject *)g_object_get_data ( + G_OBJECT(ea_calitem), "gail-focus-object"); if (old_cell && EA_IS_CALENDAR_CELL (old_cell)) { old_state_set = atk_object_ref_state_set (old_cell); atk_state_set_remove_state (old_state_set, ATK_STATE_FOCUSED); diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c index c4a4cf3103..9040f80ccd 100644 --- a/widgets/table/e-cell-date.c +++ b/widgets/table/e-cell-date.c @@ -51,7 +51,9 @@ ecd_get_text (ECellText *cell, ETableModel *model, gint col, gint row) fmt_component = "Default"; else fmt_part = "table"; - return e_datetime_format_format (fmt_component, fmt_part, DTFormatKindDateTime, date); + + return e_datetime_format_format ( + fmt_component, fmt_part, DTFormatKindDateTime, date); } static void diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 62db1d32b1..490072cf80 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -621,8 +621,11 @@ create_store (ETableConfig *config) if (config->source_spec->columns[i]->disabled) continue; - text = g_strdup (dgettext (config->domain, config->source_spec->columns[i]->title)); - e_table_memory_store_insert_adopt (E_TABLE_MEMORY_STORE (store), -1, NULL, text, i); + text = g_strdup (dgettext ( + config->domain, + config->source_spec->columns[i]->title)); + e_table_memory_store_insert_adopt ( + E_TABLE_MEMORY_STORE (store), -1, NULL, text, i); } return store; diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index 51ab6c1139..6afde43911 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -135,7 +135,8 @@ etfci_rebuild_combined (ETableFieldChooserItem *etfci) ETableCol *ecol = e_table_header_get_column (etfci->full_header, i); if (ecol->disabled) continue; - if (!(GPOINTER_TO_INT (g_hash_table_lookup (hash, GINT_TO_POINTER (ecol->col_idx))))) + if (!(GPOINTER_TO_INT (g_hash_table_lookup ( + hash, GINT_TO_POINTER (ecol->col_idx))))) e_table_header_add_column (etfci->combined_header, ecol, -1); } diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 2bbd5c83d2..346ffed2d3 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -873,7 +873,8 @@ ethi_drag_drop (GtkWidget *canvas, ethi->drop_col = col; if (col != -1) { - gchar *target = g_strdup_printf ("%s-%s", TARGET_ETABLE_COL_TYPE, ethi->dnd_code); + gchar *target = g_strdup_printf ( + "%s-%s", TARGET_ETABLE_COL_TYPE, ethi->dnd_code); d(g_print ("ethi - %s\n", target)); gtk_drag_get_data (canvas, context, gdk_atom_intern (target, FALSE), time); g_free (target); @@ -986,7 +987,9 @@ ethi_draw (GnomeCanvasItem *item, gint length = e_table_sort_info_grouping_get_count (ethi->sort_info); gint i; for (i = 0; i < length; i++) { - ETableSortColumn column = e_table_sort_info_grouping_get_nth (ethi->sort_info, i); + ETableSortColumn column = + e_table_sort_info_grouping_get_nth ( + ethi->sort_info, i); g_hash_table_insert (arrows, GINT_TO_POINTER ((gint) column.column), GINT_TO_POINTER (column.ascending ? @@ -1925,7 +1928,8 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e) ecol = e_table_header_get_column (ethi->eth, ethi->selected_col); ethi_change_sort_state (ethi, ecol); - } else if ((e->key.keyval == GDK_KEY_Right) || (e->key.keyval == GDK_KEY_KP_Right)) { + } else if ((e->key.keyval == GDK_KEY_Right) || + (e->key.keyval == GDK_KEY_KP_Right)) { ETableCol *ecol; if ((ethi->selected_col < 0) || (ethi->selected_col >= ethi->eth->col_count - 1)) diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c index 2fe6a56089..8911867652 100644 --- a/widgets/table/e-table-header-utils.c +++ b/widgets/table/e-table-header-utils.c @@ -124,7 +124,9 @@ make_composite_pixmap (GdkDrawable *drawable, GdkGC *gc, pheight = gdk_pixbuf_get_height (pixbuf); g_return_val_if_fail (width <= pwidth && height <= pheight, NULL); - color = ((bg->red & 0xff00) << 8) | (bg->green & 0xff00) | ((bg->blue & 0xff00) >> 8); + color = ((bg->red & 0xff00) << 8) | + (bg->green & 0xff00) | + ((bg->blue & 0xff00) >> 8); if (width >= pwidth && height >= pheight) { tmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height); diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c index f648a8d765..ef1b573346 100644 --- a/widgets/table/e-table-header.c +++ b/widgets/table/e-table-header.c @@ -121,7 +121,9 @@ enqueue (ETableHeader *eth, gint column, gint width) eth->change_queue = eth->change_tail; if (!eth->idle) { - eth->idle = g_idle_add_full (G_PRIORITY_LOW, (GSourceFunc) dequeue_idle, eth, NULL); + eth->idle = g_idle_add_full ( + G_PRIORITY_LOW, (GSourceFunc) + dequeue_idle, eth, NULL); } } @@ -714,7 +716,8 @@ eth_set_size (ETableHeader *eth, gint idx, gint size) usable_width = eth->width - left_width - 1; if (eth->sort_info) - usable_width -= e_table_sort_info_grouping_get_count (eth->sort_info) * GROUP_INDENT; + usable_width -= e_table_sort_info_grouping_get_count ( + eth->sort_info) * GROUP_INDENT; /* Calculate minimum_width of stuff on the right as well as * total usable expansion on the right. diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c index 538dcc4f1a..cf7edf3592 100644 --- a/widgets/table/e-table-search.c +++ b/widgets/table/e-table-search.c @@ -183,8 +183,10 @@ e_table_search_input_character (ETableSearch *ets, gunichar character) character_utf8[g_unichar_to_utf8 (character, character_utf8)] = 0; temp_string = g_strdup_printf ("%s%s", ets->priv->search_string, character_utf8); - if (e_table_search_search (ets, temp_string, - ets->priv->last_character != 0 ? E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST : 0)) { + if (e_table_search_search ( + ets, temp_string, + ets->priv->last_character != 0 ? + E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST : 0)) { g_free (ets->priv->search_string); ets->priv->search_string = temp_string; add_timeout (ets); diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 70b973c5b3..38ede4dd80 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -1962,7 +1962,8 @@ et_build_grouping_spec (ETable *e_table) node = grouping; for (i = 0; i < group_count; i++) { - ETableSortColumn column = e_table_sort_info_grouping_get_nth (e_table->sort_info, i); + ETableSortColumn column = + e_table_sort_info_grouping_get_nth (e_table->sort_info, i); xmlNode *new_node = xmlNewChild(node, NULL, "group", NULL); e_xml_set_integer_prop_by_name (new_node, "column", column.column); @@ -1971,7 +1972,8 @@ et_build_grouping_spec (ETable *e_table) } for (i = 0; i < sort_count; i++) { - ETableSortColumn column = e_table_sort_info_sorting_get_nth (e_table->sort_info, i); + ETableSortColumn column = + e_table_sort_info_sorting_get_nth (e_table->sort_info, i); xmlNode *new_node = xmlNewChild(node, NULL, "leaf", NULL); e_xml_set_integer_prop_by_name (new_node, "column", column.column); diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 040881c857..d9b6ce4035 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -2967,7 +2967,8 @@ scroll_timeout (gpointer data) static void scroll_on (ETree *et, guint scroll_direction) { - if (et->priv->scroll_idle_id == 0 || scroll_direction != et->priv->scroll_direction) { + if (et->priv->scroll_idle_id == 0 || + scroll_direction != et->priv->scroll_direction) { if (et->priv->scroll_idle_id != 0) g_source_remove (et->priv->scroll_idle_id); et->priv->scroll_direction = scroll_direction; @@ -3041,7 +3042,8 @@ collapse_drag (ETree *et, ETreePath drop) { GList *list; - /* We only want to leave open parents of the node dropped in. Not the node itself. */ + /* We only want to leave open parents of the node dropped in. + * Not the node itself. */ if (drop) { drop = e_tree_model_node_get_parent (et->priv->model, drop); } @@ -3097,7 +3099,9 @@ context_connect (ETree *et, GdkDragContext *context) return; if (et->priv->last_drop_context) - g_object_weak_unref (G_OBJECT (et->priv->last_drop_context), context_destroyed, et); + g_object_weak_unref ( + G_OBJECT (et->priv->last_drop_context), + context_destroyed, et); else g_object_ref (et); diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c index f35eeb1a69..92716e68bc 100644 --- a/widgets/table/gal-a11y-e-table-item.c +++ b/widgets/table/gal-a11y-e-table-item.c @@ -188,7 +188,8 @@ eti_a11y_reset_focus_object (GalA11yETableItem *a11y, old_cell = (AtkObject *)g_object_get_data (G_OBJECT (a11y), "gail-focus-object"); if (old_cell && GAL_A11Y_IS_E_CELL (old_cell)) - gal_a11y_e_cell_remove_state (GAL_A11Y_E_CELL (old_cell), ATK_STATE_FOCUSED, FALSE); + gal_a11y_e_cell_remove_state ( + GAL_A11Y_E_CELL (old_cell), ATK_STATE_FOCUSED, FALSE); if (old_cell) g_object_unref (old_cell); @@ -196,7 +197,8 @@ eti_a11y_reset_focus_object (GalA11yETableItem *a11y, if (cell != NULL) { g_object_set_data (G_OBJECT (a11y), "gail-focus-object", cell); - gal_a11y_e_cell_add_state (GAL_A11Y_E_CELL (cell), ATK_STATE_FOCUSED, FALSE); + gal_a11y_e_cell_add_state ( + GAL_A11Y_E_CELL (cell), ATK_STATE_FOCUSED, FALSE); } else g_object_set_data (G_OBJECT (a11y), "gail-focus-object", NULL); diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c index 8641bf1527..bb8669d9e8 100644 --- a/widgets/text/e-text-model.c +++ b/widgets/text/e-text-model.c @@ -208,7 +208,8 @@ e_text_model_real_set_text (ETextModel *model, const gchar *text) g_string_set_size (model->priv->text, 0); - } else if (*model->priv->text->str == '\0' || strcmp (model->priv->text->str, text)) { + } else if (*model->priv->text->str == '\0' || + strcmp (model->priv->text->str, text)) { g_string_assign (model->priv->text, text); diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 9801132684..0b9f7f149f 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -360,8 +360,10 @@ reset_layout_attrs (EText *text) e_text_model_get_nth_object_bounds (text->model, i, &start_pos, &end_pos); - attr->start_index = g_utf8_offset_to_pointer (text->text, start_pos) - text->text; - attr->end_index = g_utf8_offset_to_pointer (text->text, end_pos) - text->text; + attr->start_index = g_utf8_offset_to_pointer ( + text->text, start_pos) - text->text; + attr->end_index = g_utf8_offset_to_pointer ( + text->text, end_pos) - text->text; pango_attr_list_insert (attrs, attr); } @@ -401,7 +403,8 @@ create_layout (EText *text) if (text->layout) return; - text->layout = gtk_widget_create_pango_layout (GTK_WIDGET (item->canvas), text->text); + text->layout = gtk_widget_create_pango_layout ( + GTK_WIDGET (item->canvas), text->text); if (text->line_wrap) pango_layout_set_width ( text->layout, text->clip_width < 0 @@ -1693,7 +1696,9 @@ _blink_scroll_timeout (gpointer data) e_tep_event.type = GDK_MOTION_NOTIFY; e_tep_event.motion.state = text->last_state; e_tep_event.motion.time = 0; - e_tep_event.motion.position = get_position_from_xy (text, text->lastx, text->lasty); + e_tep_event.motion.position = + get_position_from_xy ( + text, text->lastx, text->lasty); _get_tep (text); e_text_event_processor_handle_event (text->tep, &e_tep_event); @@ -1864,7 +1869,8 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event) && (event->key.state & GDK_SHIFT_MASK) && text->handle_popup ) { - /* Simulate a GdkEventButton here, so that we can call e_text_do_popup directly */ + /* Simulate a GdkEventButton here, so that we can + * call e_text_do_popup directly */ GdkEventButton *button = (GdkEventButton *) gdk_event_new (GDK_BUTTON_PRESS); button->time = event->key.time; @@ -2466,7 +2472,8 @@ _get_updated_position (EText *text, gboolean direction) /* if is_cursor_position is set, cursor can appear in front of character. i.e. this is a grapheme boundary AND make some sanity checks */ - if ((new_pos >=0) && (new_pos < n_attrs) && (log_attrs[new_pos].is_cursor_position)) + if ((new_pos >=0) && (new_pos < n_attrs) && + (log_attrs[new_pos].is_cursor_position)) break; else if ((new_pos < 0) || (new_pos >= n_attrs)) { diff --git a/widgets/text/gal-a11y-e-text.c b/widgets/text/gal-a11y-e-text.c index 75e3307373..dcc96d1d69 100644 --- a/widgets/text/gal-a11y-e-text.c +++ b/widgets/text/gal-a11y-e-text.c @@ -1105,9 +1105,12 @@ gal_a11y_e_text_get_type (void) PARENT_TYPE, "GalA11yEText", &info, 0, sizeof (GalA11yETextPrivate), &priv_offset); - g_type_add_interface_static (type, ATK_TYPE_COMPONENT, &atk_component_info); - g_type_add_interface_static (type, ATK_TYPE_TEXT, &atk_text_info); - g_type_add_interface_static (type, ATK_TYPE_EDITABLE_TEXT, &atk_editable_text_info); + g_type_add_interface_static ( + type, ATK_TYPE_COMPONENT, &atk_component_info); + g_type_add_interface_static ( + type, ATK_TYPE_TEXT, &atk_text_info); + g_type_add_interface_static ( + type, ATK_TYPE_EDITABLE_TEXT, &atk_editable_text_info); } return type; |