diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-06-05 04:53:10 +0800 |
---|---|---|
committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:42:26 +0800 |
commit | e7954c3f251aabbf95d099159709c8c66dfedc44 (patch) | |
tree | 08b6fbba02f05aa622cd54f45da223ef43066bb3 /addressbook/importers | |
parent | dcaf6c52082765c2586a7d35b56b3dc417aa988d (diff) | |
download | gsoc2013-evolution-e7954c3f251aabbf95d099159709c8c66dfedc44.tar.gz gsoc2013-evolution-e7954c3f251aabbf95d099159709c8c66dfedc44.tar.zst gsoc2013-evolution-e7954c3f251aabbf95d099159709c8c66dfedc44.zip |
Coding style and whitespace cleanups.
Diffstat (limited to 'addressbook/importers')
-rw-r--r-- | addressbook/importers/evolution-csv-importer.c | 14 | ||||
-rw-r--r-- | addressbook/importers/evolution-ldif-importer.c | 5 | ||||
-rw-r--r-- | addressbook/importers/evolution-vcard-importer.c | 4 |
3 files changed, 17 insertions, 6 deletions
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c index 28d9f2d617..358b8198ab 100644 --- a/addressbook/importers/evolution-csv-importer.c +++ b/addressbook/importers/evolution-csv-importer.c @@ -316,7 +316,8 @@ date_from_string (const gchar *str) date->day = str[i] - '0' * 1; i = i+2; } - date->year = str[i] * 1000 + str[i+1] * 100 + str[i+2] * 10 + str[i+3] - '0' * 1111; + date->year = str[i] * 1000 + str[i + 1] * 100 + + str[i + 2] * 10 + str[i + 3] - '0' * 1111; return date; } @@ -388,7 +389,9 @@ map_fields (const gchar *header_line, gint pimporter) while (value = parseNextValue (&pptr), value != NULL) { for (j = 0; j < n_fields; j++) { if (g_ascii_strcasecmp (fields_array[j].csv_attribute, value->str) == 0) { - g_hash_table_insert (fmap, GINT_TO_POINTER (idx), GINT_TO_POINTER (j + 1)); + g_hash_table_insert ( + fmap, GINT_TO_POINTER (idx), + GINT_TO_POINTER (j + 1)); any_found = TRUE; break; } @@ -445,9 +448,12 @@ parseLine (CSVImporter *gci, EContact *contact, gchar *buf) { idx = ii; if (gci->fields_map) { - gpointer found = g_hash_table_lookup (gci->fields_map, GINT_TO_POINTER (idx)); + gpointer found; - if (!found) { + found = g_hash_table_lookup ( + gci->fields_map, GINT_TO_POINTER (idx)); + + if (found == NULL) { g_warning ("%s: No map for index %d, skipping it", G_STRFUNC, idx); idx = -1; } else { diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index c76f0763bf..85e46923d1 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -302,7 +302,10 @@ parseLine (GHashTable *dn_contact_hash, EContact *contact, } else { /* FIXME is everything a string? */ - e_contact_set (contact, ldif_fields[i].contact_field, ldif_value->str); + e_contact_set ( + contact, + ldif_fields[i].contact_field, + ldif_value->str); g_message ("set %s to %s", ptr, ldif_value->str); } field_handled = TRUE; diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index 97f2551c38..04f81b222c 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -936,7 +936,9 @@ evolution_contact_importer_get_preview_widget (const GList *contacts) if (description) { const gchar *at = strchr (description, '@'); if (at) { - free_description = g_strndup (description, (gsize)(at - description)); + free_description = g_strndup ( + description, + (gsize) (at - description)); description = free_description; } } |