Commit c85109fc authored by Matthew Barnes's avatar Matthew Barnes
Browse files

Coding style and whitespace cleanup.

parent 7d1751cc
......@@ -233,11 +233,11 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam
e_contact_editor_fullname->builder = builder;
widget = e_builder_get_widget(builder, "dialog-checkfullname");
widget = e_builder_get_widget (builder, "dialog-checkfullname");
title = gtk_window_get_title (GTK_WINDOW (widget));
gtk_window_set_title (GTK_WINDOW (e_contact_editor_fullname), title);
widget = e_builder_get_widget(builder, "table-checkfullname");
widget = e_builder_get_widget (builder, "table-checkfullname");
parent = gtk_widget_get_parent (widget);
g_object_ref (widget);
gtk_container_remove (GTK_CONTAINER (parent), widget);
......@@ -276,7 +276,7 @@ fill_in_field (EContactEditorFullname *editor,
if (string)
gtk_entry_set_text (entry, string);
else
gtk_entry_set_text(entry, "");
gtk_entry_set_text (entry, "");
}
}
......@@ -285,11 +285,11 @@ fill_in_info (EContactEditorFullname *editor)
{
EContactName *name = editor->name;
if (name) {
fill_in_field(editor, "comboentry-title", name->prefixes);
fill_in_field(editor, "entry-first", name->given);
fill_in_field(editor, "entry-middle", name->additional);
fill_in_field(editor, "entry-last", name->family);
fill_in_field(editor, "comboentry-suffix", name->suffixes);
fill_in_field (editor, "comboentry-title", name->prefixes);
fill_in_field (editor, "entry-first", name->given);
fill_in_field (editor, "entry-middle", name->additional);
fill_in_field (editor, "entry-last", name->family);
fill_in_field (editor, "comboentry-suffix", name->suffixes);
}
}
......@@ -320,9 +320,9 @@ extract_info (EContactEditorFullname *editor)
editor->name = name;
}
name->prefixes = extract_field(editor, "comboentry-title" );
name->given = extract_field(editor, "entry-first" );
name->additional = extract_field(editor, "entry-middle");
name->family = extract_field(editor, "entry-last" );
name->suffixes = extract_field(editor, "comboentry-suffix");
name->prefixes = extract_field (editor, "comboentry-title" );
name->given = extract_field (editor, "entry-first" );
name->additional = extract_field (editor, "entry-middle");
name->family = extract_field (editor, "entry-last" );
name->suffixes = extract_field (editor, "comboentry-suffix");
}
......@@ -445,7 +445,7 @@ name_to_style (const EContactName *name,
*(stringptr++) = name->given;
}
*stringptr = NULL;
string = g_strjoinv(", ", strings);
string = g_strjoinv (", ", strings);
break;
case 1:
stringptr = strings;
......@@ -456,7 +456,7 @@ name_to_style (const EContactName *name,
*(stringptr++) = name->family;
}
*stringptr = NULL;
string = g_strjoinv(" ", strings);
string = g_strjoinv (" ", strings);
break;
case 2:
midstrptr = midstring;
......@@ -474,7 +474,7 @@ name_to_style (const EContactName *name,
*(stringptr++) = name->additional;
}
*stringptr = NULL;
string = g_strjoinv(" ", strings);
string = g_strjoinv (" ", strings);
break;
case 3:
string = g_strdup (company);
......@@ -489,17 +489,17 @@ name_to_style (const EContactName *name,
*(stringptr++) = name->given;
}
*stringptr = NULL;
substring = g_strjoinv(", ", strings);
substring = g_strjoinv (", ", strings);
if (!(company && *company))
company = "";
if (style == 4)
string = g_strdup_printf("%s (%s)", substring, company);
string = g_strdup_printf ("%s (%s)", substring, company);
else
string = g_strdup_printf("%s (%s)", company, substring);
string = g_strdup_printf ("%s (%s)", company, substring);
g_free (substring);
break;
default:
string = g_strdup("");
string = g_strdup ("");
}
return string;
}
......@@ -509,7 +509,7 @@ file_as_get_style (EContactEditor *editor)
{
GtkEntry *file_as = GTK_ENTRY (
gtk_bin_get_child (GTK_BIN (
e_builder_get_widget(editor->builder, "combo-file-as"))));
e_builder_get_widget (editor->builder, "combo-file-as"))));
GtkEntry *company_w = GTK_ENTRY (
e_builder_get_widget (editor->builder, "entry-company"));
gchar *filestring;
......@@ -2027,7 +2027,7 @@ init_address_textview (EContactEditor *editor,
GtkTextBuffer *text_buffer;
textview_name = g_strdup_printf (
"textview-%s-address", address_name [record]);
"textview-%s-address", address_name[record]);
textview = e_builder_get_widget (editor->builder, textview_name);
g_free (textview_name);
......@@ -2047,7 +2047,7 @@ init_address_field (EContactEditor *editor,
GtkWidget *entry;
entry_name = g_strdup_printf (
"entry-%s-%s", address_name [record], widget_field_name);
"entry-%s-%s", address_name[record], widget_field_name);
entry = e_builder_get_widget (editor->builder, entry_name);
g_free (entry_name);
......@@ -2095,7 +2095,7 @@ fill_in_address_textview (EContactEditor *editor,
GtkTextBuffer *text_buffer;
GtkTextIter iter_end, iter_start;
textview_name = g_strdup_printf ("textview-%s-address", address_name [record]);
textview_name = g_strdup_printf ("textview-%s-address", address_name[record]);
textview = e_builder_get_widget (editor->builder, textview_name);
g_free (textview_name);
......@@ -2123,7 +2123,7 @@ fill_in_address_label_textview (EContactEditor *editor,
GtkTextBuffer *text_buffer;
textview_name = g_strdup_printf (
"textview-%s-address", address_name [record]);
"textview-%s-address", address_name[record]);
textview = e_builder_get_widget (editor->builder, textview_name);
g_free (textview_name);
......@@ -2141,7 +2141,7 @@ fill_in_address_field (EContactEditor *editor,
GtkWidget *entry;
entry_name = g_strdup_printf (
"entry-%s-%s", address_name [record], widget_field_name);
"entry-%s-%s", address_name[record], widget_field_name);
entry = e_builder_get_widget (editor->builder, entry_name);
g_free (entry_name);
......@@ -2200,7 +2200,7 @@ extract_address_textview (EContactEditor *editor,
GtkTextBuffer *text_buffer;
GtkTextIter iter_1, iter_2;
textview_name = g_strdup_printf ("textview-%s-address", address_name [record]);
textview_name = g_strdup_printf ("textview-%s-address", address_name[record]);
textview = e_builder_get_widget (editor->builder, textview_name);
g_free (textview_name);
......@@ -2242,7 +2242,7 @@ extract_address_field (EContactEditor *editor,
GtkWidget *entry;
entry_name = g_strdup_printf (
"entry-%s-%s", address_name [record], widget_field_name);
"entry-%s-%s", address_name[record], widget_field_name);
entry = e_builder_get_widget (editor->builder, entry_name);
g_free (entry_name);
......@@ -2366,11 +2366,11 @@ sensitize_address_textview (EContactEditor *editor,
GtkWidget *textview;
GtkWidget *label;
widget_name = g_strdup_printf ("textview-%s-address", address_name [record]);
widget_name = g_strdup_printf ("textview-%s-address", address_name[record]);
textview = e_builder_get_widget (editor->builder, widget_name);
g_free (widget_name);
widget_name = g_strdup_printf ("label-%s-address", address_name [record]);
widget_name = g_strdup_printf ("label-%s-address", address_name[record]);
label = e_builder_get_widget (editor->builder, widget_name);
g_free (widget_name);
......@@ -2389,12 +2389,12 @@ sensitize_address_field (EContactEditor *editor,
GtkWidget *label;
widget_name = g_strdup_printf (
"entry-%s-%s", address_name [record], widget_field_name);
"entry-%s-%s", address_name[record], widget_field_name);
entry = e_builder_get_widget (editor->builder, widget_name);
g_free (widget_name);
widget_name = g_strdup_printf (
"label-%s-%s", address_name [record], widget_field_name);
"label-%s-%s", address_name[record], widget_field_name);
label = e_builder_get_widget (editor->builder, widget_name);
g_free (widget_name);
......@@ -3266,7 +3266,7 @@ categories_clicked (GtkWidget *button,
{
gchar *categories = NULL;
GtkDialog *dialog;
GtkWidget *entry = e_builder_get_widget(editor->builder, "entry-categories");
GtkWidget *entry = e_builder_get_widget (editor->builder, "entry-categories");
if (entry && GTK_IS_ENTRY (entry))
categories = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
......@@ -3898,24 +3898,24 @@ setup_tab_order (GtkBuilder *builder)
GtkWidget *container;
GList *list = NULL;
/*
container = e_builder_get_widget(builder, "table-contact-editor-general");
container = e_builder_get_widget (builder, "table-contact-editor-general");
*
if (container) {
list = add_to_tab_order(list, builder, "entry-fullname");
list = add_to_tab_order(list, builder, "entry-jobtitle");
list = add_to_tab_order(list, builder, "entry-company");
list = add_to_tab_order(list, builder, "combo-file-as");
list = add_to_tab_order(list, builder, "entry-phone-1");
list = add_to_tab_order(list, builder, "entry-phone-2");
list = add_to_tab_order(list, builder, "entry-phone-3");
list = add_to_tab_order(list, builder, "entry-phone-4");
list = add_to_tab_order (list, builder, "entry-fullname");
list = add_to_tab_order (list, builder, "entry-jobtitle");
list = add_to_tab_order (list, builder, "entry-company");
list = add_to_tab_order (list, builder, "combo-file-as");
list = add_to_tab_order (list, builder, "entry-phone-1");
list = add_to_tab_order (list, builder, "entry-phone-2");
list = add_to_tab_order (list, builder, "entry-phone-3");
list = add_to_tab_order (list, builder, "entry-phone-4");
*
list = add_to_tab_order(list, builder, "entry-email1");
list = add_to_tab_order(list, builder, "alignment-htmlmail");
list = add_to_tab_order(list, builder, "entry-web");
list = add_to_tab_order(list, builder, "entry-homepage");
list = add_to_tab_order(list, builder, "button-fulladdr");
list = add_to_tab_order(list, builder, "text-address");
list = add_to_tab_order (list, builder, "entry-email1");
list = add_to_tab_order (list, builder, "alignment-htmlmail");
list = add_to_tab_order (list, builder, "entry-web");
list = add_to_tab_order (list, builder, "entry-homepage");
list = add_to_tab_order (list, builder, "button-fulladdr");
list = add_to_tab_order (list, builder, "text-address");
list = g_list_reverse (list);
e_container_change_tab_order (GTK_CONTAINER (container), list);
g_list_free (list);
......
......@@ -558,7 +558,7 @@ e_contact_quick_add (ESourceRegistry *registry,
g_strstrip (name);
len = strlen (name);
if ((name[0] == '\'' && name[len - 1] == '\'') ||
(name[0] == '"' && name[len-1] == '"')) {
(name[0] == '"' && name[len - 1] == '"')) {
name[0] = ' ';
name[len - 1] = ' ';
}
......
......@@ -693,7 +693,7 @@ use_common_book_client (EBookClient *book_client,
contact_file_as = e_contact_get (contact, E_CONTACT_FILE_AS);
if (contact_file_as) {
query_parts [p++] = g_strdup_printf ("(contains \"file_as\" \"%s\")", contact_file_as);
query_parts[p++] = g_strdup_printf ("(contains \"file_as\" \"%s\")", contact_file_as);
g_free (contact_file_as);
}
......
......@@ -273,7 +273,7 @@ dropdown_changed (GtkWidget *dropdown,
gchar *str;
str = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (dropdown));
if (g_ascii_strcasecmp(str, ""))
if (g_ascii_strcasecmp (str, ""))
e_contact_set (data->match, data->field, str);
else
e_contact_set (data->match, data->field, NULL);
......
......@@ -268,7 +268,7 @@ static gpointer
addressbook_initialize_value (ETableModel *etc,
gint col)
{
return g_strdup("");
return g_strdup ("");
}
static gboolean
......
......@@ -193,13 +193,13 @@ e_minicard_label_set_property (GObject *object,
e_canvas_item_grab_focus (e_minicard_label->field, FALSE);
break;
case PROP_FIELD:
gnome_canvas_item_set( e_minicard_label->field, "text", g_value_get_string (value), NULL );
gnome_canvas_item_set ( e_minicard_label->field, "text", g_value_get_string (value), NULL );
break;
case PROP_FIELDNAME:
gnome_canvas_item_set( e_minicard_label->fieldname, "text", g_value_get_string (value), NULL );
gnome_canvas_item_set ( e_minicard_label->fieldname, "text", g_value_get_string (value), NULL );
break;
case PROP_TEXT_MODEL:
gnome_canvas_item_set( e_minicard_label->field, "model", g_value_get_object (value), NULL);
gnome_canvas_item_set ( e_minicard_label->field, "model", g_value_get_object (value), NULL);
break;
case PROP_MAX_FIELD_NAME_WIDTH:
e_minicard_label->max_field_name_length = g_value_get_double (value);
......@@ -345,7 +345,7 @@ e_minicard_label_event (GnomeCanvasItem *item,
case GDK_ENTER_NOTIFY:
case GDK_LEAVE_NOTIFY: {
gboolean return_val;
g_signal_emit_by_name(e_minicard_label->field, "event", event, &return_val);
g_signal_emit_by_name (e_minicard_label->field, "event", event, &return_val);
return return_val;
}
default:
......
......@@ -397,7 +397,7 @@ e_minicard_view_event (GnomeCanvasItem *item,
if (((GdkEventButton *) event)->button == 1) {
gboolean editable;
g_object_get(view->adapter, "editable", &editable, NULL);
g_object_get (view->adapter, "editable", &editable, NULL);
if (editable)
e_minicard_view_create_contact (view);
......
......@@ -330,7 +330,7 @@ e_minicard_set_property (GObject *object,
}
break;
case PROP_HAS_CURSOR:
d(g_print("%s: PROP_HAS_CURSOR\n", G_STRFUNC));
d (g_print ("%s: PROP_HAS_CURSOR\n", G_STRFUNC));
if (e_minicard->has_cursor != g_value_get_boolean (value))
set_has_cursor (e_minicard, g_value_get_boolean (value));
break;
......@@ -490,7 +490,7 @@ e_minicard_realize (GnomeCanvasItem *item)
e_minicard->header_text =
gnome_canvas_item_new ( group,
e_text_get_type (),
"width", (double) MAX( e_minicard->width - 12, 0 ),
"width", (double) MAX ( e_minicard->width - 12, 0 ),
"clip", TRUE,
"use_ellipsis", TRUE,
"fill_color_gdk", &style->fg[GTK_STATE_NORMAL],
......@@ -531,7 +531,7 @@ e_minicard_event (GnomeCanvasItem *item,
case GDK_FOCUS_CHANGE:
{
GdkEventFocus *focus_event = (GdkEventFocus *) event;
d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", G_STRFUNC, focus_event->in?"in":"out"));
d (g_print ("%s: GDK_FOCUS_CHANGE: %s\n", G_STRFUNC, focus_event->in?"in":"out"));
if (focus_event->in) {
/* Chris: When EMinicard gets the cursor, if it doesn't have the focus, it should take it. */
e_minicard->has_focus = TRUE;
......@@ -721,7 +721,7 @@ add_field (EMinicard *e_minicard,
group = GNOME_CANVAS_GROUP ( e_minicard );
name = g_strdup_printf("%s:", e_contact_pretty_name (field));
name = g_strdup_printf ("%s:", e_contact_pretty_name (field));
string = e_contact_get (e_minicard->contact, field);
new_item = e_minicard_label_new (group);
......@@ -871,7 +871,7 @@ get_left_width (EMinicard *e_minicard,
if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME)
continue;
name = g_strdup_printf("%s:", e_contact_pretty_name (field));
name = g_strdup_printf ("%s:", e_contact_pretty_name (field));
pango_layout_set_text (layout, name, -1);
pango_layout_get_pixel_size (layout, &this_width, NULL);
if (width < this_width)
......
......@@ -517,7 +517,7 @@ eab_contact_display_class_init (EABContactDisplayClass *class)
EAB_CONTACT_DISPLAY_RENDER_NORMAL,
G_PARAM_READWRITE));
g_object_class_install_property (
g_object_class_install_property (
object_class,
PROP_SHOW_MAPS,
g_param_spec_boolean (
......
......@@ -1171,18 +1171,18 @@ eab_contact_formatter_class_init (EABContactFormatterClass *class)
PROP_STYLE,
g_param_spec_object (
"style",
NULL,
NULL,
GTK_TYPE_STYLE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
NULL,
NULL,
GTK_TYPE_STYLE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (
object_class,
PROP_STATE,
g_param_spec_uint (
"state",
NULL,
NULL,
NULL,
NULL,
0,
G_MAXUINT,
0,
......@@ -1201,7 +1201,7 @@ eab_contact_formatter_init (EABContactFormatter *formatter)
EABContactFormatter *
eab_contact_formatter_new (EABContactDisplayMode mode,
gboolean render_maps)
gboolean render_maps)
{
return g_object_new (EAB_TYPE_CONTACT_FORMATTER,
"display-mode", mode,
......@@ -1209,7 +1209,6 @@ eab_contact_formatter_new (EABContactDisplayMode mode,
NULL);
}
void
eab_contact_formatter_set_display_mode (EABContactFormatter *formatter,
EABContactDisplayMode mode)
......@@ -1257,7 +1256,7 @@ eab_contact_formatter_get_render_maps (EABContactFormatter *formatter)
void
eab_contact_formatter_set_style (EABContactFormatter *formatter,
GtkStyle *style)
GtkStyle *style)
{
g_return_if_fail (EAB_IS_CONTACT_FORMATTER (formatter));
......@@ -1284,7 +1283,7 @@ eab_contact_formatter_get_style (EABContactFormatter *formatter)
void
eab_contact_formatter_set_state (EABContactFormatter *formatter,
GtkStateType state)
GtkStateType state)
{
g_return_if_fail (EAB_IS_CONTACT_FORMATTER (formatter));
......
......@@ -58,14 +58,14 @@ struct _EABContactFormatterClass {
GType eab_contact_formatter_get_type ();
EABContactFormatter*
EABContactFormatter *
eab_contact_formatter_new (EABContactDisplayMode mode,
gboolean render_maps);
void eab_contact_formatter_set_style
(EABContactFormatter *formatter,
GtkStyle *context);
GtkStyle*
GtkStyle *
eab_contact_formatter_get_style
(EABContactFormatter *formatter);
......
......@@ -103,27 +103,27 @@ static import_fields csv_fields_outlook[] = {
{"Company", E_CONTACT_ORG},
{"Department", E_CONTACT_ORG_UNIT},
{"Job Title", E_CONTACT_TITLE},
{"Business Street", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET },
{"Business Street 2", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET },
{"Business Street 3", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET},
{"Business City", NOMAP, FLAG_WORK_ADDRESS|FLAG_CITY},
{"Business State", NOMAP, FLAG_WORK_ADDRESS|FLAG_STATE},
{"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS|FLAG_POSTAL_CODE},
{"Business Country", NOMAP, FLAG_WORK_ADDRESS|FLAG_COUNTRY},
{"Home Street", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
{"Home Street 2", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
{"Home Street 3", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
{"Home City", NOMAP, FLAG_HOME_ADDRESS|FLAG_CITY},
{"Home State", NOMAP, FLAG_HOME_ADDRESS|FLAG_STATE},
{"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS|FLAG_POSTAL_CODE},
{"Home Country", NOMAP, FLAG_HOME_ADDRESS|FLAG_COUNTRY},
{"Other Street", NOMAP, FLAG_OTHER_ADDRESS|FLAG_STREET},
{"Other Street 2", NOMAP, FLAG_OTHER_ADDRESS|FLAG_STREET},
{"Other Street 3", NOMAP, FLAG_OTHER_ADDRESS|FLAG_STREET},
{"Other City", NOMAP, FLAG_OTHER_ADDRESS|FLAG_CITY},
{"Other State", NOMAP, FLAG_OTHER_ADDRESS|FLAG_STATE},
{"Other Postal Code", NOMAP, FLAG_OTHER_ADDRESS|FLAG_POSTAL_CODE},
{"Other Country", NOMAP, FLAG_OTHER_ADDRESS|FLAG_COUNTRY},
{"Business Street", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET },
{"Business Street 2", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET },
{"Business Street 3", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET},
{"Business City", NOMAP, FLAG_WORK_ADDRESS | FLAG_CITY},
{"Business State", NOMAP, FLAG_WORK_ADDRESS | FLAG_STATE},
{"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS | FLAG_POSTAL_CODE},
{"Business Country", NOMAP, FLAG_WORK_ADDRESS | FLAG_COUNTRY},
{"Home Street", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
{"Home Street 2", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
{"Home Street 3", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
{"Home City", NOMAP, FLAG_HOME_ADDRESS | FLAG_CITY},
{"Home State", NOMAP, FLAG_HOME_ADDRESS | FLAG_STATE},
{"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS | FLAG_POSTAL_CODE},
{"Home Country", NOMAP, FLAG_HOME_ADDRESS | FLAG_COUNTRY},
{"Other Street", NOMAP, FLAG_OTHER_ADDRESS | FLAG_STREET},
{"Other Street 2", NOMAP, FLAG_OTHER_ADDRESS | FLAG_STREET},
{"Other Street 3", NOMAP, FLAG_OTHER_ADDRESS | FLAG_STREET},
{"Other City", NOMAP, FLAG_OTHER_ADDRESS | FLAG_CITY},
{"Other State", NOMAP, FLAG_OTHER_ADDRESS | FLAG_STATE},
{"Other Postal Code", NOMAP, FLAG_OTHER_ADDRESS | FLAG_POSTAL_CODE},
{"Other Country", NOMAP, FLAG_OTHER_ADDRESS | FLAG_COUNTRY},
{"Assistant's Phone", E_CONTACT_PHONE_ASSISTANT},
{"Business Fax", E_CONTACT_PHONE_BUSINESS_FAX},
{"Business Phone", E_CONTACT_PHONE_BUSINESS},
......@@ -148,7 +148,7 @@ static import_fields csv_fields_outlook[] = {
{"Assistant's Name", E_CONTACT_ASSISTANT},
{"Billing Information", NOMAP},
{"Birthday", NOMAP, FLAG_DATE_BDAY},
{"Business Address PO Box", NOMAP, FLAG_WORK_ADDRESS|FLAG_POBOX},
{"Business Address PO Box", NOMAP, FLAG_WORK_ADDRESS | FLAG_POBOX},
{"Categories", E_CONTACT_CATEGORIES},
{"Children", NOMAP},
{"Directory Server", NOMAP},
......@@ -164,7 +164,7 @@ static import_fields csv_fields_outlook[] = {
{"Gender", NOMAP},
{"Government ID Number", NOMAP},
{"Hobby", NOMAP},
{"Home Address PO Box", NOMAP, FLAG_HOME_ADDRESS|FLAG_POBOX},
{"Home Address PO Box", NOMAP, FLAG_HOME_ADDRESS | FLAG_POBOX},
{"Initials", NOMAP},
{"Internet FREE/BUSY", E_CONTACT_FREEBUSY_URL},
{"Keywords", NOMAP},
......@@ -175,7 +175,7 @@ static import_fields csv_fields_outlook[] = {
{"Notes", NOMAP},
{"Office Location", NOMAP},
{"Organizational ID Number", NOMAP},
{"Other Address PO Box", NOMAP, FLAG_OTHER_ADDRESS|FLAG_POBOX},
{"Other Address PO Box", NOMAP, FLAG_OTHER_ADDRESS | FLAG_POBOX},
{"Priority", NOMAP},
{"Private", NOMAP},
{"Profession", NOMAP},
......@@ -201,18 +201,18 @@ static import_fields csv_fields_mozilla[] = {
{"Business Fax", E_CONTACT_PHONE_BUSINESS_FAX},
{"Pager", E_CONTACT_PHONE_PAGER},
{"Mobile Phone", E_CONTACT_PHONE_MOBILE},
{"Home Street", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
{"Home Street 2", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
{"Home City", NOMAP, FLAG_HOME_ADDRESS|FLAG_CITY},
{"Home State", NOMAP, FLAG_HOME_ADDRESS|FLAG_STATE},
{"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS|FLAG_POSTAL_CODE},
{"Home Country", NOMAP, FLAG_HOME_ADDRESS|FLAG_COUNTRY},
{"Business Street", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET },
{"Business Street 2", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET },
{"Business City", NOMAP, FLAG_WORK_ADDRESS|FLAG_CITY},
{"Business State", NOMAP, FLAG_WORK_ADDRESS|FLAG_STATE},
{"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS|FLAG_POSTAL_CODE},
{"Business Country", NOMAP, FLAG_WORK_ADDRESS|FLAG_COUNTRY},
{"Home Street", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
{"Home Street 2", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
{"Home City", NOMAP, FLAG_HOME_ADDRESS | FLAG_CITY},
{"Home State", NOMAP, FLAG_HOME_ADDRESS | FLAG_STATE},
{"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS | FLAG_POSTAL_CODE},
{"Home Country", NOMAP, FLAG_HOME_ADDRESS | FLAG_COUNTRY},
{"Business Street", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET },
{"Business Street 2", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET },
{"Business City", NOMAP, FLAG_WORK_ADDRESS | FLAG_CITY},
{"Business State", NOMAP, FLAG_WORK_ADDRESS | FLAG_STATE},
{"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS | FLAG_POSTAL_CODE},
{"Business Country", NOMAP, FLAG_WORK_ADDRESS | FLAG_COUNTRY},
{"Job Title", E_CONTACT_TITLE},
{"Department", E_CONTACT_ORG_UNIT},
{"Company", E_CONTACT_ORG},
......@@ -244,18 +244,18 @@ static import_fields csv_fields_evolution[] = {
{"Business Fax", E_CONTACT_PHONE_BUSINESS_FAX},
{"Pager", E_CONTACT_PHONE_PAGER},
{"Mobile Phone", E_CONTACT_PHONE_MOBILE},
{"Home Street", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
{"Home Street", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
{"Home Street 2", NOMAP, FLAG_INVALID},
{"Home City", NOMAP, FLAG_HOME_ADDRESS|FLAG_CITY},
{"Home State", NOMAP, FLAG_HOME_ADDRESS|FLAG_STATE},
{"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS|FLAG_POSTAL_CODE},
{"Home Country", NOMAP, FLAG_HOME_ADDRESS|FLAG_COUNTRY},
{"Business Street", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET },
{"Home City", NOMAP, FLAG_HOME_ADDRESS | FLAG_CITY},
{"Home State", NOMAP, FLAG_HOME_ADDRESS | FLAG_STATE},
{"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS | FLAG_POSTAL_CODE},
{"Home Country", NOMAP, FLAG_HOME_ADDRESS | FLAG_COUNTRY},
{"Business Street", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET },
{"Business Street 2", NOMAP, FLAG_INVALID },
{"Business City", NOMAP, FLAG_WORK_ADDRESS|FLAG_CITY},
{"Business State", NOMAP, FLAG_WORK_ADDRESS|FLAG_STATE},
{"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS|FLAG_POSTAL_CODE},
{"Business Country", NOMAP, FLAG_WORK_ADDRESS|FLAG_COUNTRY},
{"Business City", NOMAP, FLAG_WORK_ADDRESS | FLAG_CITY},
{"Business State", NOMAP, FLAG_WORK_ADDRESS | FLAG_STATE},
{"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS | FLAG_POSTAL_CODE},
{"Business Country", NOMAP, FLAG_WORK_ADDRESS | FLAG_COUNTRY},
{"Job Title", E_CONTACT_TITLE},
{"Office", E_CONTACT_OFFICE},
{"Company", E_CONTACT_ORG},
......@@ -431,9 +431,9 @@ parseLine (CSVImporter *gci,
EContactAddress *home_address = NULL, *work_address = NULL, *other_address = NULL;
EContactDate *bday = NULL;