Reduce diff noise with 'account-mgmt' branch.

One last time.

8 files changed, 18 insertions, 17 deletions

diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c
index 4b483db6cb..cfc8521927 100644
--- a/calendar/gui/dialogs/copy-source-dialog.c
+++ b/calendar/gui/dialogs/copy-source-dialog.c
@@ -218,7 +218,8 @@ copy_source (const CopySourceDialogData *const_csdd)
 	csdd->obj_type = const_csdd->obj_type;
 	csdd->selected_source = g_object_ref (const_csdd->selected_source);
 
-	e_client_utils_open_new (csdd->orig_source, csdd->obj_type, FALSE, NULL,
+	e_client_utils_open_new (
+		csdd->orig_source, csdd->obj_type, FALSE, NULL,
 		e_client_utils_authenticate_handler, csdd->parent,
 		orig_source_opened_cb, csdd);
 }
diff --git a/calendar/gui/e-cal-config.c b/calendar/gui/e-cal-config.c
index 0e6f69725d..0f65bd6b1d 100644
--- a/calendar/gui/e-cal-config.c
+++ b/calendar/gui/e-cal-config.c
@@ -25,6 +25,7 @@
 #endif
 
 #include <gtk/gtk.h>
+
 #include "e-cal-config.h"
 
 #define E_CAL_CONFIG_GET_PRIVATE(obj) \
diff --git a/calendar/gui/e-calendar-selector.c b/calendar/gui/e-calendar-selector.c
index 4add4a3e97..158157e2a5 100644
--- a/calendar/gui/e-calendar-selector.c
+++ b/calendar/gui/e-calendar-selector.c
@@ -18,9 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "e-calendar-selector.h"
 
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 736bda3d4c..e05f949181 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -748,9 +748,9 @@ calendar_view_paste_clipboard (ESelectable *selectable)
 						&& cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),
 							comp_data->client, comp, TRUE))
 					itip_send_comp (
-							E_CAL_COMPONENT_METHOD_CANCEL,
-							comp, comp_data->client, NULL, NULL,
-							NULL, TRUE, FALSE);
+						E_CAL_COMPONENT_METHOD_CANCEL,
+						comp, comp_data->client,
+						NULL, NULL, NULL, TRUE, FALSE);
 
 				e_cal_component_get_uid (comp, &uid);
 				if (e_cal_component_is_instance (comp)) {
diff --git a/calendar/gui/e-memo-list-selector.c b/calendar/gui/e-memo-list-selector.c
index 51466da09e..f88ccdffd5 100644
--- a/calendar/gui/e-memo-list-selector.c
+++ b/calendar/gui/e-memo-list-selector.c
@@ -210,7 +210,8 @@ memo_list_selector_process_data (ESourceSelector *selector,
 	if (!E_IS_SOURCE (source) || e_source_get_readonly (source))
 		goto exit;
 
-	e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_MEMOS, TRUE, NULL,
+	e_client_utils_open_new (
+		source, E_CLIENT_SOURCE_TYPE_MEMOS, TRUE, NULL,
 		e_client_utils_authenticate_handler, NULL,
 		client_opened_cb, g_strdup (old_uid));
 
@@ -301,7 +302,8 @@ memo_list_selector_data_dropped (ESourceSelector *selector,
 	dd->action = action;
 	dd->list = cal_comp_selection_get_string_list (selection_data);
 
-	e_client_utils_open_new (destination, E_CLIENT_SOURCE_TYPE_MEMOS, TRUE, NULL,
+	e_client_utils_open_new (
+		destination, E_CLIENT_SOURCE_TYPE_MEMOS, TRUE, NULL,
 		e_client_utils_authenticate_handler, NULL,
 		client_opened_for_drop_cb, dd);
 
diff --git a/calendar/gui/e-task-list-selector.c b/calendar/gui/e-task-list-selector.c
index fd6a7915f3..433bec9d25 100644
--- a/calendar/gui/e-task-list-selector.c
+++ b/calendar/gui/e-task-list-selector.c
@@ -18,9 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "e-task-list-selector.h"
 
@@ -212,7 +210,8 @@ task_list_selector_process_data (ESourceSelector *selector,
 	if (!E_IS_SOURCE (source) || e_source_get_readonly (source))
 		goto exit;
 
-	e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_MEMOS, TRUE, NULL,
+	e_client_utils_open_new (
+		source, E_CLIENT_SOURCE_TYPE_MEMOS, TRUE, NULL,
 		e_client_utils_authenticate_handler, NULL,
 		client_opened_cb, g_strdup (old_uid));
 
@@ -303,7 +302,8 @@ task_list_selector_data_dropped (ESourceSelector *selector,
 	dd->action = action;
 	dd->list = cal_comp_selection_get_string_list (selection_data);
 
-	e_client_utils_open_new (destination, E_CLIENT_SOURCE_TYPE_TASKS, TRUE, NULL,
+	e_client_utils_open_new (
+		destination, E_CLIENT_SOURCE_TYPE_TASKS, TRUE, NULL,
 		e_client_utils_authenticate_handler, NULL,
 		client_opened_for_drop_cb, dd);
 
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
index 651ef83a89..6a13e4e5e4 100644
--- a/calendar/gui/e-task-table.c
+++ b/calendar/gui/e-task-table.c
@@ -1692,8 +1692,8 @@ hide_completed_rows_ready (GObject *source_object,
 
 			g_debug ("%s: Could not get the objects from '%s': %s",
 				G_STRFUNC,
-				source ? e_source_get_display_name (source) : "???",
-				error ? error->message : "Uknown error");
+				e_source_get_display_name (source),
+				error ? error->message : "Unknown error");
 		}
 		g_clear_error (&error);
 		return;
@@ -1754,8 +1754,8 @@ show_completed_rows_ready (GObject *source_object,
 
 			g_debug ("%s: Could not get the objects from '%s': %s",
 				G_STRFUNC,
-				source ? e_source_get_display_name (source) : "???",
-				error ? error->message : "Uknown error");
+				e_source_get_display_name (source),
+				error ? error->message : "Unknown error");
 		}
 		g_clear_error (&error);
 		return;
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index fd807fd832..879f90fde2 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -37,7 +37,6 @@
 #include <glib/gi18n.h>
 #include <libedataserver/e-categories.h>
 #include <libedataserver/e-url.h>
-#include <libedataserverui/e-passwords.h>
 #include <libedataserverui/e-client-utils.h>
 
 #include <libecal/e-cal-client-view.h>