Coding style and whitespace cleanup.

12 files changed, 74 insertions, 75 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index e7d1390716..8dc2621787 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -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");
 }
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 44fd081fe4..ca4b1cb86c 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -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);
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 5ea618bc32..fd4c8edb82 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -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] = ' ';
 		}
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index 9a55ffb134..7c7f096e90 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -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);
 	}
 
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index cbcb376734..cb2f6055ae 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -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);
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index c6775d4e5a..51886cf186 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -268,7 +268,7 @@ static gpointer
 addressbook_initialize_value (ETableModel *etc,
                               gint col)
 {
-	return g_strdup("");
+	return g_strdup ("");
 }
 
 static gboolean
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 7eefdf8fc0..584ed9fe98 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -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:
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 690fe7796f..01899e8a57 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -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);
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 652851877b..d0af5117b0 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -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)
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 6501bccc24..d6c4238e2f 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -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 (
diff --git a/addressbook/gui/widgets/eab-contact-formatter.c b/addressbook/gui/widgets/eab-contact-formatter.c
index 5b3021cc6c..d04cc07f04 100644
--- a/addressbook/gui/widgets/eab-contact-formatter.c
+++ b/addressbook/gui/widgets/eab-contact-formatter.c
@@ -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));
 
diff --git a/addressbook/gui/widgets/eab-contact-formatter.h b/addressbook/gui/widgets/eab-contact-formatter.h
index 4773a7bb24..31104b1f9a 100644
--- a/addressbook/gui/widgets/eab-contact-formatter.h
+++ b/addressbook/gui/widgets/eab-contact-formatter.h
@@ -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);