diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-02-24 11:24:05 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-02-24 11:24:59 +0800 |
| commit | 33bbdaa50b4911adcc937ff674466ea43ac8f45d (patch) | |
| tree | 197a8566f6d8a5a3dbef29cbf6f7e49e86bc4940 /modules | |
| parent | aac2cb58276cde2d079af3987ad798786862b931 (diff) | |
| download | gsoc2013-evolution-33bbdaa50b4911adcc937ff674466ea43ac8f45d.tar gsoc2013-evolution-33bbdaa50b4911adcc937ff674466ea43ac8f45d.tar.gz gsoc2013-evolution-33bbdaa50b4911adcc937ff674466ea43ac8f45d.tar.bz2 gsoc2013-evolution-33bbdaa50b4911adcc937ff674466ea43ac8f45d.tar.lz gsoc2013-evolution-33bbdaa50b4911adcc937ff674466ea43ac8f45d.tar.xz gsoc2013-evolution-33bbdaa50b4911adcc937ff674466ea43ac8f45d.tar.zst gsoc2013-evolution-33bbdaa50b4911adcc937ff674466ea43ac8f45d.zip | |
Coding style and whitespace cleanup.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/cal-config-caldav/e-caldav-chooser.c | 8 | ||||
| -rw-r--r-- | modules/mail/e-mail-attachment-handler.c | 4 | ||||
| -rw-r--r-- | modules/prefer-plain/e-mail-parser-prefer-plain.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/modules/cal-config-caldav/e-caldav-chooser.c b/modules/cal-config-caldav/e-caldav-chooser.c index dcb29f1d5c..99017b8120 100644 --- a/modules/cal-config-caldav/e-caldav-chooser.c +++ b/modules/cal-config-caldav/e-caldav-chooser.c @@ -183,8 +183,8 @@ context_free (Context *context) static ETrustPromptResponse trust_prompt_sync (const ENamedParameters *parameters, - GCancellable *cancellable, - GError **error) + GCancellable *cancellable, + GError **error) { EUserPrompter *prompter; gint response; @@ -386,7 +386,8 @@ caldav_chooser_configure_session (ECaldavChooser *chooser, g_object_unref (logger); } - g_object_set (session, + g_object_set ( + session, SOUP_SESSION_TIMEOUT, 90, SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE, SOUP_SESSION_SSL_STRICT, TRUE, @@ -1438,7 +1439,6 @@ caldav_chooser_try_password_sync (ESourceAuthenticator *auth, soup_session_send_message (session, message); } } - if (cancel_id > 0) g_cancellable_disconnect (cancellable, cancel_id); diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c index 4b9f5e1959..98680f8299 100644 --- a/modules/mail/e-mail-attachment-handler.c +++ b/modules/mail/e-mail-attachment-handler.c @@ -90,8 +90,8 @@ mail_attachment_handler_get_selected_message (EAttachmentHandler *handler) CamelStream *mem; /* Create a message copy in case the inner content-type doesn't match - the mime_part's content type, which can happen for multipart/digest, - where it confuses the formatter on reply, which skips all rfc822 subparts. + * the mime_part's content type, which can happen for multipart/digest, + * where it confuses the formatter on reply, which skips all rfc822 subparts. */ mem = camel_stream_mem_new (); camel_data_wrapper_write_to_stream_sync (CAMEL_DATA_WRAPPER (wrapper), mem, NULL, NULL); diff --git a/modules/prefer-plain/e-mail-parser-prefer-plain.c b/modules/prefer-plain/e-mail-parser-prefer-plain.c index 914b96952d..8282b024ad 100644 --- a/modules/prefer-plain/e-mail-parser-prefer-plain.c +++ b/modules/prefer-plain/e-mail-parser-prefer-plain.c @@ -313,7 +313,7 @@ empe_prefer_plain_parse (EMailParserExtension *extension, if (!g_queue_is_empty (&plain_text_parts) && !g_queue_is_empty (&work_queue) && nparts > 1) { /* a text/html part is hidden, but not marked as attachment, - thus do that now, when there exists a text/plain part */ + * thus do that now, when there exists a text/plain part */ GList *qiter; for (qiter = g_queue_peek_head_link (&work_queue); qiter; qiter = g_list_next (qiter)) { |