Coding style and whitespace cleanup.

3 files changed, 30 insertions, 11 deletions

diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index cca537d65e..c3c6cf1090 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -125,7 +125,9 @@ clear_drag_data (EMinicardView *view)
 }
 
 static gint
-e_minicard_view_drag_begin (EAddressbookReflowAdapter *adapter, GdkEvent *event, EMinicardView *view)
+e_minicard_view_drag_begin (EAddressbookReflowAdapter *adapter,
+                            GdkEvent *event,
+                            EMinicardView *view)
 {
 	GdkDragContext *context;
 	GtkTargetList *target_list;
@@ -197,13 +199,16 @@ set_empty_message (EMinicardView *view)
 }
 
 static void
-writable_status_change (EAddressbookModel *model, gboolean writable, EMinicardView *view)
+writable_status_change (EAddressbookModel *model,
+                        gboolean writable,
+                        EMinicardView *view)
 {
 	set_empty_message (view);
 }
 
 static void
-stop_state_changed (EAddressbookModel *model, EMinicardView *view)
+stop_state_changed (EAddressbookModel *model,
+                    EMinicardView *view)
 {
 	set_empty_message (view);
 }
@@ -410,7 +415,9 @@ e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event)
 }
 
 static gint
-e_minicard_view_selection_event (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event)
+e_minicard_view_selection_event (EReflow *reflow,
+                                 GnomeCanvasItem *item,
+                                 GdkEvent *event)
 {
 	EMinicardView *view;
 	gint return_val = FALSE;
@@ -651,7 +658,9 @@ static void
 add_to_list (gint index, gpointer closure)
 {
 	ModelAndList *mal = closure;
-	mal->list = g_list_prepend (mal->list, e_addressbook_reflow_adapter_get_contact (mal->adapter, index));
+	mal->list = g_list_prepend (
+		mal->list, e_addressbook_reflow_adapter_get_contact (
+		mal->adapter, index));
 }
 
 GList *
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index 0fd7d09129..81dc9b6dac 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -657,7 +657,9 @@ csv_import_contacts(gpointer d) {
 		return FALSE;
 	}
 	else {
-		e_import_status(gci->import, gci->target, _("Importing..."), ftell(gci->file) *100 / gci->size);
+		e_import_status (
+			gci->import, gci->target, _("Importing..."),
+			ftell (gci->file) * 100 / gci->size);
 		return TRUE;
 	}
 }
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index b3b965ffa0..1222566387 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -249,7 +249,9 @@ vcard_import_contacts(gpointer data)
 		vcard_import_done(gci);
 		return FALSE;
 	} else {
-		e_import_status(gci->import, gci->target, _("Importing..."), gci->count * 100 / gci->total);
+		e_import_status (
+			gci->import, gci->target, _("Importing..."),
+			gci->count * 100 / gci->total);
 		return TRUE;
 	}
 }
@@ -397,12 +399,17 @@ vcard_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
 	if (primary == NULL) {
 		primary = e_source_list_peek_source_any (source_list);
 		g_object_ref(primary);
-		g_datalist_set_data_full(&target->data, "vcard-source", primary, g_object_unref);
+		g_datalist_set_data_full (
+			&target->data, "vcard-source", primary,
+			(GDestroyNotify) g_object_unref);
 	}
-	e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (selector), primary);
+	e_source_selector_set_primary_selection (
+		E_SOURCE_SELECTOR (selector), primary);
 	g_object_unref (source_list);
 
-	g_signal_connect (selector, "primary_selection_changed", G_CALLBACK (primary_selection_changed_cb), target);
+	g_signal_connect (
+		selector, "primary_selection_changed",
+		G_CALLBACK (primary_selection_changed_cb), target);
 
 	gtk_widget_show_all (vbox);
 
@@ -469,7 +476,8 @@ vcard_import(EImport *ei, EImportTarget *target, EImportImporter *im)
 	encoding = guess_vcard_encoding(filename);
 	if (encoding == VCARD_ENCODING_NONE) {
 		g_free (filename);
-		/* this check is superfluous, we've already checked otherwise we can't get here ... */
+		/* This check is superfluous, we've already
+		 * checked otherwise we can't get here ... */
 		e_import_complete(ei, target);
 		return;
 	}