Miscellaneous cleanups from the account-mgmt branch.

Reducing diff noise so I can see important changes easier when comparing
branches.  A few API changes, but nothing that affects functionality.

5 files changed, 37 insertions, 19 deletions

diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c
index 62ebd4b2a5..c80aba39cd 100644
--- a/plugins/default-source/default-source.c
+++ b/plugins/default-source/default-source.c
@@ -55,7 +55,8 @@ e_plugin_lib_enable (EPlugin *ep,
 }
 
 static void
-mark_default_source_in_list (ESourceList *source_list, ESource *source)
+mark_default_source_in_list (ESourceList *source_list,
+                             ESource *source)
 {
 	GSList *g, *s;
 	g_return_if_fail (source_list != NULL);
@@ -106,7 +107,7 @@ commit_default_calendar (EPlugin *epl,
 
 		if (source_list) {
 			/* mark in the backend's source_list, to avoid race
-			   with saving of two different source lists
+			 * with saving of two different source lists
 			*/
 			mark_default_source_in_list (source_list, source);
 		} else {
@@ -139,7 +140,7 @@ commit_default_book (EPlugin *epl,
 
 		if (source_list) {
 			/* mark in the backend's source_list, to avoid race
-			   with saving of two different source lists
+			 * with saving of two different source lists
 			*/
 			mark_default_source_in_list (source_list, source);
 		} else {
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 9639bc6908..d85987df55 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -37,7 +37,6 @@
 #include <time.h>
 
 #include <e-util/e-config.h>
-#include <e-util/e-account-utils.h>
 #include <e-util/gconf-bridge.h>
 #include <mail/e-mail-folder-utils.h>
 #include <mail/em-utils.h>
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 1d9f1fa0d0..810a2b593c 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -1131,10 +1131,12 @@ mail_to_event (ECalClientSourceType source_type,
 		/* ask the user which tasks list to save to */
 		dialog = e_source_selector_dialog_new (NULL, source_list);
 
-		e_source_selector_dialog_select_default_source (E_SOURCE_SELECTOR_DIALOG (dialog));
+		e_source_selector_dialog_select_default_source (
+			E_SOURCE_SELECTOR_DIALOG (dialog));
 
 		if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
-			source = e_source_selector_dialog_peek_primary_selection (E_SOURCE_SELECTOR_DIALOG (dialog));
+			source = e_source_selector_dialog_peek_primary_selection (
+				E_SOURCE_SELECTOR_DIALOG (dialog));
 		else
 			source = NULL;
 
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index b330a371ba..fc19d7a4fd 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -412,7 +412,9 @@ add_source_list_with_check (GtkWidget *frame,
 
 		gtk_box_pack_end ((GtkBox *) hbox, combo, FALSE, FALSE, 0);
 
-		g_signal_connect (check, "toggled", G_CALLBACK (widget_sanitizer_cb), combo);
+		g_signal_connect (
+			check, "toggled",
+			G_CALLBACK (widget_sanitizer_cb), combo);
 		widget_sanitizer_cb (GTK_TOGGLE_BUTTON (check), combo);
 	}
 
@@ -472,10 +474,22 @@ org_credativ_evolution_readpst_getwidget (EImport *ei,
 
 	gtk_box_pack_start ((GtkBox *) framebox, hbox, FALSE, FALSE, 0);
 
-	add_source_list_with_check (framebox, _("_Address Book"), E_CLIENT_SOURCE_TYPE_CONTACTS, G_CALLBACK (checkbox_addr_toggle_cb), target);
-	add_source_list_with_check (framebox, _("A_ppointments"), E_CLIENT_SOURCE_TYPE_EVENTS, G_CALLBACK (checkbox_appt_toggle_cb), target);
-	add_source_list_with_check (framebox, _("_Tasks"), E_CLIENT_SOURCE_TYPE_TASKS, G_CALLBACK (checkbox_task_toggle_cb), target);
-	add_source_list_with_check (framebox, _("_Journal entries"), E_CLIENT_SOURCE_TYPE_MEMOS, G_CALLBACK (checkbox_journal_toggle_cb), target);
+	add_source_list_with_check (
+		framebox, _("_Address Book"),
+		E_CLIENT_SOURCE_TYPE_CONTACTS,
+		G_CALLBACK (checkbox_addr_toggle_cb), target);
+	add_source_list_with_check (
+		framebox, _("A_ppointments"),
+		E_CLIENT_SOURCE_TYPE_EVENTS,
+		G_CALLBACK (checkbox_appt_toggle_cb), target);
+	add_source_list_with_check (
+		framebox, _("_Tasks"),
+		E_CLIENT_SOURCE_TYPE_TASKS,
+		G_CALLBACK (checkbox_task_toggle_cb), target);
+	add_source_list_with_check (
+		framebox, _("_Journal entries"),
+		E_CLIENT_SOURCE_TYPE_MEMOS,
+		G_CALLBACK (checkbox_journal_toggle_cb), target);
 
 	gtk_widget_show_all (framebox);
 
@@ -550,7 +564,8 @@ open_client (PstImporter *m,
 
 	m->waiting_open++;
 
-	e_client_utils_open_new (source, source_type, FALSE, m->cancellable,
+	e_client_utils_open_new (
+		source, source_type, FALSE, m->cancellable,
 		e_client_utils_authenticate_handler, NULL,
 		client_opened_cb, m);
 }
diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
index 1b72958712..cfe461b163 100644
--- a/plugins/vcard-inline/vcard-inline.c
+++ b/plugins/vcard-inline/vcard-inline.c
@@ -119,14 +119,13 @@ org_gnome_vcard_inline_decode (VCardInlinePObject *vcard_object,
 }
 
 static void
-org_gnome_vcard_inline_client_loaded_cb (GObject *source_object,
+org_gnome_vcard_inline_client_loaded_cb (ESource *source,
                                          GAsyncResult *result,
-                                         gpointer user_data)
+                                         GSList *contact_list)
 {
-	ESource *source = E_SOURCE (source_object);
 	EClient *client = NULL;
 	EBookClient *book_client;
-	GSList *contact_list = user_data, *iter;
+	GSList *iter;
 	GError *error = NULL;
 
 	e_client_utils_open_new_finish (source, result, &client, &error);
@@ -185,9 +184,11 @@ org_gnome_vcard_inline_save_cb (VCardInlinePObject *vcard_object)
 
 	contact_list = e_client_util_copy_object_slist (NULL, vcard_object->contact_list);
 
-	e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL,
-		e_client_utils_authenticate_handler, NULL,
-		org_gnome_vcard_inline_client_loaded_cb, contact_list);
+	e_client_utils_open_new (
+		source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE,
+		NULL, e_client_utils_authenticate_handler, NULL,
+		(GAsyncReadyCallback) org_gnome_vcard_inline_client_loaded_cb,
+		contact_list);
 }
 
 static void