From 578214584caa7805edca09b27e2306dc31d80fb6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 7 May 2011 12:22:36 -0400 Subject: Whitespace and coding style cleanups. --- addressbook/gui/contact-editor/e-contact-editor-fullname.c | 4 +++- addressbook/gui/contact-editor/e-contact-quick-add.c | 8 ++++---- addressbook/gui/widgets/e-addressbook-view.c | 4 +++- addressbook/gui/widgets/e-minicard-view.c | 3 ++- addressbook/importers/evolution-csv-importer.c | 10 ++++++++-- addressbook/importers/evolution-ldif-importer.c | 10 ++++++++-- addressbook/tools/evolution-addressbook-export-list-folders.c | 4 +++- 7 files changed, 31 insertions(+), 12 deletions(-) (limited to 'addressbook') 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)); -- cgit