[evolution] Coding style and whitespace cleanup.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Coding style and whitespace cleanup.
- Date: Sun, 24 Feb 2013 03:25:02 +0000 (UTC)
commit 33bbdaa50b4911adcc937ff674466ea43ac8f45d
Author: Matthew Barnes <mbarnes redhat com>
Date: Sat Feb 23 22:24:05 2013 -0500
Coding style and whitespace cleanup.
.../contact-list-editor/e-contact-list-editor.c | 2 +-
addressbook/printing/e-contact-print.c | 2 +-
e-util/e-mail-signature-editor.c | 6 +++---
e-util/e-mail-signature-preview.c | 6 +++---
e-util/e-name-selector-entry.c | 15 +++++++++------
e-util/e-source-config.c | 8 ++++----
em-format/e-mail-inline-filter.c | 4 ++--
em-format/e-mail-parser-inlinepgp-encrypted.c | 2 +-
em-format/e-mail-parser-inlinepgp-signed.c | 2 +-
em-format/e-mail-parser-multipart-related.c | 2 +-
em-format/e-mail-part-utils.c | 2 +-
mail/e-mail-printer.c | 4 ++--
mail/e-mail-reader-utils.c | 3 ++-
modules/cal-config-caldav/e-caldav-chooser.c | 8 ++++----
modules/mail/e-mail-attachment-handler.c | 4 ++--
modules/prefer-plain/e-mail-parser-prefer-plain.c | 2 +-
16 files changed, 38 insertions(+), 34 deletions(-)
---
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 d160563..08c92d7 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -515,7 +515,7 @@ contact_list_editor_selection_changed_cb (GtkTreeSelection *selection,
static void
contact_list_editor_add_from_email_entry (EContactListEditor *editor,
- ENameSelectorEntry *entry)
+ ENameSelectorEntry *entry)
{
EDestinationStore *store;
GList *dests, *diter;
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 06d3cdf..c91d77a 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -230,7 +230,7 @@ e_contact_start_new_column (EContactPrintContext *ctxt)
static gchar *
get_contact_string_value (EContact *contact,
- gint field)
+ gint field)
{
const gchar *value;
diff --git a/e-util/e-mail-signature-editor.c b/e-util/e-mail-signature-editor.c
index bb1fc95..da5e338 100644
--- a/e-util/e-mail-signature-editor.c
+++ b/e-util/e-mail-signature-editor.c
@@ -286,9 +286,9 @@ action_save_and_close_cb (GtkAction *action,
registry = e_mail_signature_editor_get_registry (editor);
/* Only make sure that the 'source-changed' is called,
- thus the preview of the signature is updated on save.
- It is not called when only signature body is changed
- (and ESource properties are left unchanged).
+ * thus the preview of the signature is updated on save.
+ * It is not called when only signature body is changed
+ * (and ESource properties are left unchanged).
*/
g_signal_emit_by_name (registry, "source-changed", source);
diff --git a/e-util/e-mail-signature-preview.c b/e-util/e-mail-signature-preview.c
index d4b57f4..2ccfa55 100644
--- a/e-util/e-mail-signature-preview.c
+++ b/e-util/e-mail-signature-preview.c
@@ -72,7 +72,7 @@ replace_local_image_links (WebKitDOMElement *element)
gchar *new_src;
/* this forms "evo-file://", which can be loaded,
- while "file://" cannot be, due to webkit policy */
+ * while "file://" cannot be, due to webkit policy */
new_src = g_strconcat ("evo-", src, NULL);
webkit_dom_html_image_element_set_src (img, new_src);
g_free (new_src);
@@ -99,8 +99,8 @@ replace_local_image_links (WebKitDOMElement *element)
static void
signature_preview_document_loaded_cb (WebKitWebView *web_view,
- WebKitWebFrame *web_frame,
- gpointer user_data)
+ WebKitWebFrame *web_frame,
+ gpointer user_data)
{
WebKitDOMDocument *document;
WebKitDOMNode *node;
diff --git a/e-util/e-name-selector-entry.c b/e-util/e-name-selector-entry.c
index 089e440..a8a1b23 100644
--- a/e-util/e-name-selector-entry.c
+++ b/e-util/e-name-selector-entry.c
@@ -1512,9 +1512,11 @@ user_insert_text (ENameSelectorEntry *name_selector_entry,
if (chars_inserted >= 1) {
/* If the user inserted one character, kick off completion */
- re_set_timeout (name_selector_entry->priv->update_completions_cb_id,
+ re_set_timeout (
+ name_selector_entry->priv->update_completions_cb_id,
update_completions_on_timeout_cb, name_selector_entry, AUTOCOMPLETE_TIMEOUT);
- re_set_timeout (name_selector_entry->priv->type_ahead_complete_cb_id,
+ re_set_timeout (
+ name_selector_entry->priv->type_ahead_complete_cb_id,
type_ahead_complete_on_timeout_cb, name_selector_entry, AUTOCOMPLETE_TIMEOUT);
}
@@ -1558,7 +1560,8 @@ user_delete_text (ENameSelectorEntry *name_selector_entry,
if (end_pos - start_pos == 1) {
/* Might be backspace; update completion model so dropdown is accurate */
- re_set_timeout (name_selector_entry->priv->update_completions_cb_id,
+ re_set_timeout (
+ name_selector_entry->priv->update_completions_cb_id,
update_completions_on_timeout_cb, name_selector_entry, AUTOCOMPLETE_TIMEOUT);
}
@@ -2169,8 +2172,8 @@ static void
ensure_type_ahead_complete_on_timeout (ENameSelectorEntry *name_selector_entry)
{
/* this is called whenever a new item is added to the model,
- thus, to not starve when there are many matches, do not
- postpone on each add, but show results as soon as possible */
+ * thus, to not starve when there are many matches, do not
+ * postpone on each add, but show results as soon as possible */
if (!name_selector_entry->priv->type_ahead_complete_cb_id) {
re_set_timeout (
name_selector_entry->priv->type_ahead_complete_cb_id,
@@ -3077,7 +3080,7 @@ populate_popup (ENameSelectorEntry *name_selector_entry,
static gint
compare_gint_ptr_cb (gconstpointer a,
- gconstpointer b)
+ gconstpointer b)
{
return GPOINTER_TO_INT (a) - GPOINTER_TO_INT (b);
}
diff --git a/e-util/e-source-config.c b/e-util/e-source-config.c
index 747cd3b..3d9303a 100644
--- a/e-util/e-source-config.c
+++ b/e-util/e-source-config.c
@@ -1354,9 +1354,9 @@ secure_to_port_cb (GBinding *binding,
static gboolean
webdav_source_ssl_trust_to_sensitive_cb (GBinding *binding,
- const GValue *source_value,
- GValue *target_value,
- gpointer user_data)
+ const GValue *source_value,
+ GValue *target_value,
+ gpointer user_data)
{
const gchar *ssl_trust = g_value_get_string (source_value);
@@ -1367,7 +1367,7 @@ webdav_source_ssl_trust_to_sensitive_cb (GBinding *binding,
static void
webdav_unset_ssl_trust_clicked_cb (GtkWidget *button,
- ESourceWebdav *extension)
+ ESourceWebdav *extension)
{
e_source_webdav_set_ssl_trust (extension, NULL);
}
diff --git a/em-format/e-mail-inline-filter.c b/em-format/e-mail-inline-filter.c
index f922dc9..538e884 100644
--- a/em-format/e-mail-inline-filter.c
+++ b/em-format/e-mail-inline-filter.c
@@ -201,8 +201,8 @@ inline_filter_add_part (EMailInlineFilter *emif,
static gboolean
newline_or_whitespace_follows (const gchar *str,
- guint len,
- guint skip_first)
+ guint len,
+ guint skip_first)
{
if (len <= skip_first)
return len == skip_first;
diff --git a/em-format/e-mail-parser-inlinepgp-encrypted.c b/em-format/e-mail-parser-inlinepgp-encrypted.c
index b73b201..1c0cd58e 100644
--- a/em-format/e-mail-parser-inlinepgp-encrypted.c
+++ b/em-format/e-mail-parser-inlinepgp-encrypted.c
@@ -64,7 +64,7 @@ empe_inlinepgp_encrypted_parse (EMailParserExtension *extension,
if (g_cancellable_is_cancelled (cancellable) ||
/* avoid recursion */
(part_id->str && part_id->len > 20 && g_str_has_suffix (part_id->str, ".inlinepgp_encrypted")))
- return FALSE;
+ return FALSE;
cipher = camel_gpg_context_new (e_mail_parser_get_session (parser));
diff --git a/em-format/e-mail-parser-inlinepgp-signed.c b/em-format/e-mail-parser-inlinepgp-signed.c
index 8f5f38c..37cf5a2 100644
--- a/em-format/e-mail-parser-inlinepgp-signed.c
+++ b/em-format/e-mail-parser-inlinepgp-signed.c
@@ -69,7 +69,7 @@ empe_inlinepgp_signed_parse (EMailParserExtension *extension,
if (g_cancellable_is_cancelled (cancellable) ||
/* avoid recursion */
(part_id->str && part_id->len > 17 && g_str_has_suffix (part_id->str, ".inlinepgp_signed")))
- return FALSE;
+ return FALSE;
cipher = camel_gpg_context_new (e_mail_parser_get_session (parser));
diff --git a/em-format/e-mail-parser-multipart-related.c b/em-format/e-mail-parser-multipart-related.c
index 96cca60..e2ed728 100644
--- a/em-format/e-mail-parser-multipart-related.c
+++ b/em-format/e-mail-parser-multipart-related.c
@@ -84,7 +84,7 @@ empe_mp_related_parse (EMailParserExtension *extension,
camel_data_wrapper_decode_to_stream_sync (dw, mem, cancellable, NULL);
camel_stream_close (mem, cancellable, NULL);
- bytes = camel_stream_mem_get_byte_array (CAMEL_STREAM_MEM (mem));
+ bytes = camel_stream_mem_get_byte_array (CAMEL_STREAM_MEM (mem));
if (bytes && bytes->len)
html_body = g_strndup ((const gchar *) bytes->data, bytes->len);
diff --git a/em-format/e-mail-part-utils.c b/em-format/e-mail-part-utils.c
index 4fa7a85..cbbedc5 100644
--- a/em-format/e-mail-part-utils.c
+++ b/em-format/e-mail-part-utils.c
@@ -563,7 +563,7 @@ e_mail_part_is_inline (CamelMimePart *mime_part,
**/
gboolean
e_mail_part_utils_body_refers (const gchar *body,
- const gchar *cid)
+ const gchar *cid)
{
const gchar *ptr;
diff --git a/mail/e-mail-printer.c b/mail/e-mail-printer.c
index 8da529f..4df136e 100644
--- a/mail/e-mail-printer.c
+++ b/mail/e-mail-printer.c
@@ -199,7 +199,7 @@ emp_start_printing (GObject *object,
static void
emp_run_print_operation (EMailPrinter *emp,
- EMailFormatter *formatter)
+ EMailFormatter *formatter)
{
EMailPartList *part_list;
CamelFolder *folder;
@@ -850,7 +850,7 @@ e_mail_printer_new (EMailPartList *source)
void
e_mail_printer_print (EMailPrinter *emp,
GtkPrintOperationAction action,
- EMailFormatter *formatter,
+ EMailFormatter *formatter,
GCancellable *cancellable)
{
g_return_if_fail (E_IS_MAIL_PRINTER (emp));
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 11ac330..619289b 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -972,7 +972,8 @@ mail_reader_do_print_message (GObject *object,
mail_display = e_mail_reader_get_mail_display (reader);
- e_mail_printer_print (printer, context->action,
+ e_mail_printer_print (
+ printer, context->action,
e_mail_display_get_formatter (mail_display),
cancellable);
diff --git a/modules/cal-config-caldav/e-caldav-chooser.c b/modules/cal-config-caldav/e-caldav-chooser.c
index dcb29f1..99017b8 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 4b9f5e1..98680f8 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 914b969..8282b02 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)) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
