Reduce diff noise with 'account-mgmt' branch.

One last time.

34 files changed, 149 insertions, 100 deletions

diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index 2302761812..f13b66d1c4 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -126,7 +126,9 @@ final_id_cb (EBookClient *book_client,
 	EContactMergingLookup *lookup = closure;
 
 	if (lookup->id_cb)
-		lookup->id_cb (lookup->book_client, error, id, lookup->closure);
+		lookup->id_cb (
+			lookup->book_client,
+			error, id, lookup->closure);
 
 	free_lookup (lookup);
 
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>
diff --git a/configure.ac b/configure.ac
index 4f906ce06d..3c97767a19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1336,15 +1336,15 @@ if test "x$enable_audio_inline" = "xyes"; then
 	fi
 fi
 
-dnl *****************************************
-dnl calendar-weather plugin requires gweather
-dnl *****************************************
+dnl **************************************
+dnl Weather calendars require gweather-3.0
+dnl **************************************
 AC_ARG_ENABLE([weather],
 	[AS_HELP_STRING([--enable-weather],
-	[Enable calendar-weather plugin @<:@default=yes@:>@])],
+	[Enable weather calendars @<:@default=yes@:>@])],
 	[enable_weather="$enableval"],[enable_weather=yes])
 
-if test "x$enable_weather" = "xyes"; then
+if test "x$enable_weather" != "xno"; then
 	PKG_CHECK_MODULES([GWEATHER], gweather-3.0 >= gweather_minimum_version,
 	have_weather="yes", have_weather="no")
 	AC_SUBST(GWEATHER_CFLAGS)
@@ -1353,7 +1353,7 @@ if test "x$enable_weather" = "xyes"; then
 	if test "x$have_weather" = "xyes"; then
 		plugins_base="$plugins_base calendar-weather"
 	else
-		AC_MSG_ERROR([gweather-3.0 >= gweather_minimum_version is required for the calendar-weather plugin.  Use --disable-weather to exclude the plugin.])
+		AC_MSG_ERROR([gweather-3.0 >= gweather_minimum_version is required for configuring weather calendars.  Use --disable-weather to disable this features.])
 	fi
 
 	dnl gweather-3.5 introduces API changes we do not yet support.
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c
index ee0b77cfe3..0a005ec9b1 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -826,6 +826,14 @@ e_mail_ui_session_get_account_store (EMailUISession *session)
 	return session->priv->account_store;
 }
 
+EMailLabelListStore *
+e_mail_ui_session_get_label_store (EMailUISession *session)
+{
+	g_return_val_if_fail (E_IS_MAIL_UI_SESSION (session), NULL);
+
+	return session->priv->label_store;
+}
+
 void
 e_mail_ui_session_add_activity (EMailUISession *session,
                                 EActivity *activity)
@@ -836,11 +844,3 @@ e_mail_ui_session_add_activity (EMailUISession *session,
 	g_signal_emit (session, signals[ACTIVITY_ADDED], 0, activity);
 }
 
-EMailLabelListStore *
-e_mail_ui_session_get_label_store (EMailUISession *session)
-{
-	g_return_val_if_fail (E_IS_MAIL_UI_SESSION (session), NULL);
-
-	return session->priv->label_store;
-}
-
diff --git a/mail/e-mail-ui-session.h b/mail/e-mail-ui-session.h
index f6ef4b42d5..7efb472590 100644
--- a/mail/e-mail-ui-session.h
+++ b/mail/e-mail-ui-session.h
@@ -75,16 +75,16 @@ struct _EMailUISessionClass {
 
 };
 
-GType		e_mail_ui_session_get_type		(void);
-EMailSession *	e_mail_ui_session_new			(void);
+GType		e_mail_ui_session_get_type	(void);
+EMailSession *	e_mail_ui_session_new		(void);
 EMailAccountStore *
 		e_mail_ui_session_get_account_store
 						(EMailUISession *session);
-void		e_mail_ui_session_add_activity	(EMailUISession *session,
-						 EActivity *activity);
 EMailLabelListStore *
 		e_mail_ui_session_get_label_store
 						(EMailUISession *session);
+void		e_mail_ui_session_add_activity	(EMailUISession *session,
+						 EActivity *activity);
 
 G_END_DECLS
 
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index aea13e910b..0c55ecec5f 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -2869,7 +2869,8 @@ efh_format_full_headers (EMFormatHTML *efh,
 
 		cia = camel_internet_address_new ();
 		camel_address_decode ((CamelAddress *) cia, (const gchar *) photo_name);
-		only_local_photo = em_format_html_get_only_local_photos (efh);
+		only_local_photo =
+			em_format_html_get_only_local_photos (efh);
 		photopart = em_utils_contact_photo (cia, only_local_photo);
 
 		if (photopart) {
diff --git a/maint/evolution.xml b/maint/evolution.xml
index bc9340c540..1fb4f03814 100644
--- a/maint/evolution.xml
+++ b/maint/evolution.xml
@@ -28,9 +28,7 @@
 
     <glade-widget-class name="EPortEntry" generic-name="port-entry" title="Port Entry" get-type-function="e_port_entry_get_type"/>
 
-    <glade-widget-class name="ESourceComboBox" generic-name="source-combo-box" title="Source Combo Box">
-      <property id="source-list"/>
-    </glade-widget-class>
+    <glade-widget-class name="ESourceComboBox" generic-name="source-combo-box" title="Source Combo Box"/>
 
     <glade-widget-class name="ETimezoneEntry" generic-name="timezone-entry" title="Timezone Entry">
       <property id="timezone"/>
diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c
index 985eafaff5..f8199eef84 100644
--- a/modules/addressbook/autocompletion-config.c
+++ b/modules/addressbook/autocompletion-config.c
@@ -22,9 +22,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "autocompletion-config.h"
 
diff --git a/modules/addressbook/autocompletion-config.h b/modules/addressbook/autocompletion-config.h
index c4630f8d66..2cebea1b4a 100644
--- a/modules/addressbook/autocompletion-config.h
+++ b/modules/addressbook/autocompletion-config.h
@@ -30,7 +30,7 @@
 
 G_BEGIN_DECLS
 
-GtkWidget *autocompletion_config_new (EPreferencesWindow *window);
+GtkWidget *	autocompletion_config_new	(EPreferencesWindow *window);
 
 G_END_DECLS
 
diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c
index 5a564e8fa4..a10eefa01d 100644
--- a/modules/addressbook/e-book-shell-backend.c
+++ b/modules/addressbook/e-book-shell-backend.c
@@ -284,13 +284,17 @@ action_contact_new_cb (GtkAction *action,
 	/* Use a callback function appropriate for the action. */
 	action_name = gtk_action_get_name (action);
 	if (strcmp (action_name, "contact-new") == 0)
-		e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL,
+		e_client_utils_open_new (
+			source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL,
 			e_client_utils_authenticate_handler, GTK_WINDOW (shell_window),
-			book_shell_backend_new_contact_cb, g_object_ref (shell));
+			book_shell_backend_new_contact_cb,
+			g_object_ref (shell));
 	if (strcmp (action_name, "contact-new-list") == 0)
-		e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL,
+		e_client_utils_open_new (
+			source, E_CLIENT_SOURCE_TYPE_CONTACTS, FALSE, NULL,
 			e_client_utils_authenticate_handler, GTK_WINDOW (shell_window),
-			book_shell_backend_new_contact_list_cb, g_object_ref (shell));
+			book_shell_backend_new_contact_list_cb,
+			g_object_ref (shell));
 
 	g_object_unref (source_list);
 }
diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c
index 403345d8ec..360635e45f 100644
--- a/modules/calendar/e-cal-attachment-handler.c
+++ b/modules/calendar/e-cal-attachment-handler.c
@@ -363,13 +363,15 @@ attachment_handler_run_dialog (GtkWindow *parent,
 		e_client_utils_open_new (
 			source, E_CLIENT_SOURCE_TYPE_EVENTS, FALSE, NULL,
 			e_client_utils_authenticate_handler, NULL,
-			attachment_handler_import_event, g_object_ref (attachment));
+			attachment_handler_import_event,
+			g_object_ref (attachment));
 		break;
 	case E_CAL_CLIENT_SOURCE_TYPE_TASKS:
 		e_client_utils_open_new (
 			source, E_CLIENT_SOURCE_TYPE_TASKS, FALSE, NULL,
 			e_client_utils_authenticate_handler, NULL,
-			attachment_handler_import_todo, g_object_ref (attachment));
+			attachment_handler_import_todo,
+			g_object_ref (attachment));
 		break;
 	default:
 		break;
diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c
index e73eca5d42..bcc4ade035 100644
--- a/modules/calendar/e-cal-shell-backend.c
+++ b/modules/calendar/e-cal-shell-backend.c
@@ -422,17 +422,23 @@ action_event_new_cb (GtkAction *action,
 	/* Use a callback function appropriate for the action.
 	 * FIXME Need to obtain a better default time zone. */
 	if (strcmp (action_name, "event-all-day-new") == 0)
-		e_client_utils_open_new (source, source_type, FALSE, NULL,
+		e_client_utils_open_new (
+			source, source_type, FALSE, NULL,
 			e_client_utils_authenticate_handler, GTK_WINDOW (shell_window),
-			cal_shell_backend_event_all_day_new_cb, g_object_ref (shell));
+			cal_shell_backend_event_all_day_new_cb,
+			g_object_ref (shell));
 	else if (strcmp (action_name, "event-meeting-new") == 0)
-		e_client_utils_open_new (source, source_type, FALSE, NULL,
+		e_client_utils_open_new (
+			source, source_type, FALSE, NULL,
 			e_client_utils_authenticate_handler, GTK_WINDOW (shell_window),
-			cal_shell_backend_event_meeting_new_cb, g_object_ref (shell));
+			cal_shell_backend_event_meeting_new_cb,
+			g_object_ref (shell));
 	else
-		e_client_utils_open_new (source, source_type, FALSE, NULL,
+		e_client_utils_open_new (
+			source, source_type, FALSE, NULL,
 			e_client_utils_authenticate_handler, GTK_WINDOW (shell_window),
-			cal_shell_backend_event_new_cb, g_object_ref (shell));
+			cal_shell_backend_event_new_cb,
+			g_object_ref (shell));
 
 	g_object_unref (source_list);
 }
diff --git a/modules/calendar/e-cal-shell-view-memopad.c b/modules/calendar/e-cal-shell-view-memopad.c
index 4978ca2183..eab1254415 100644
--- a/modules/calendar/e-cal-shell-view-memopad.c
+++ b/modules/calendar/e-cal-shell-view-memopad.c
@@ -50,9 +50,11 @@ action_calendar_memopad_forward_cb (GtkAction *action,
 	comp = e_cal_component_new ();
 	clone = icalcomponent_new_clone (comp_data->icalcomp);
 	e_cal_component_set_icalcomponent (comp, clone);
+
 	itip_send_comp (
 		E_CAL_COMPONENT_METHOD_PUBLISH, comp,
 		comp_data->client, NULL, NULL, NULL, TRUE, FALSE);
+
 	g_object_unref (comp);
 }
 
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index c256c9aebe..5418d6cab9 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -712,8 +712,8 @@ e_cal_shell_view_private_dispose (ECalShellView *cal_shell_view)
 
 	e_cal_shell_view_search_stop (cal_shell_view);
 
-	/* Calling calendar's save state from here,
-	 * because it is too late in its dispose. */
+	/* Calling ECalShellContent's save state from here,
+	 * because it is too late in its own dispose(). */
 	if (priv->cal_shell_content != NULL)
 		e_cal_shell_content_save_state (priv->cal_shell_content);
 
diff --git a/modules/calendar/e-cal-shell-view-taskpad.c b/modules/calendar/e-cal-shell-view-taskpad.c
index 92263c75e3..5a88c7d92c 100644
--- a/modules/calendar/e-cal-shell-view-taskpad.c
+++ b/modules/calendar/e-cal-shell-view-taskpad.c
@@ -73,9 +73,11 @@ action_calendar_taskpad_forward_cb (GtkAction *action,
 	comp = e_cal_component_new ();
 	clone = icalcomponent_new_clone (comp_data->icalcomp);
 	e_cal_component_set_icalcomponent (comp, clone);
+
 	itip_send_comp (
 		E_CAL_COMPONENT_METHOD_PUBLISH, comp,
 		comp_data->client, NULL, NULL, NULL, TRUE, FALSE);
+
 	g_object_unref (comp);
 }
 
diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c
index 127473d582..c34808698e 100644
--- a/modules/calendar/e-memo-shell-backend.c
+++ b/modules/calendar/e-memo-shell-backend.c
@@ -283,13 +283,17 @@ action_memo_new_cb (GtkAction *action,
 	 * FIXME Need to obtain a better default time zone. */
 	action_name = gtk_action_get_name (action);
 	if (g_strcmp0 (action_name, "memo-shared-new") == 0)
-		e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_MEMOS, FALSE, NULL,
+		e_client_utils_open_new (
+			source, E_CLIENT_SOURCE_TYPE_MEMOS, FALSE, NULL,
 			e_client_utils_authenticate_handler, GTK_WINDOW (shell_window),
-			memo_shell_backend_memo_shared_new_cb, g_object_ref (shell));
+			memo_shell_backend_memo_shared_new_cb,
+			g_object_ref (shell));
 	else
-		e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_MEMOS, FALSE, NULL,
+		e_client_utils_open_new (
+			source, E_CLIENT_SOURCE_TYPE_MEMOS, FALSE, NULL,
 			e_client_utils_authenticate_handler, GTK_WINDOW (shell_window),
-			memo_shell_backend_memo_new_cb, g_object_ref (shell));
+			memo_shell_backend_memo_new_cb,
+			g_object_ref (shell));
 
 	g_object_unref (source_list);
 }
diff --git a/modules/calendar/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c
index 4c2025910a..44625ad670 100644
--- a/modules/calendar/e-memo-shell-view-actions.c
+++ b/modules/calendar/e-memo-shell-view-actions.c
@@ -95,9 +95,11 @@ action_memo_forward_cb (GtkAction *action,
 	comp = e_cal_component_new ();
 	clone = icalcomponent_new_clone (comp_data->icalcomp);
 	e_cal_component_set_icalcomponent (comp, clone);
+
 	itip_send_comp (
 		E_CAL_COMPONENT_METHOD_PUBLISH, comp,
 		comp_data->client, NULL, NULL, NULL, TRUE, FALSE);
+
 	g_object_unref (comp);
 }
 
@@ -166,6 +168,7 @@ action_memo_list_delete_cb (GtkAction *action,
 		GTK_WINDOW (shell_window),
 		"calendar:prompt-delete-memo-list",
 		e_source_get_display_name (source), NULL);
+
 	if (response != GTK_RESPONSE_YES) {
 		g_object_unref (source);
 		return;
diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c
index 786e9c6910..0bcf95d31d 100644
--- a/modules/calendar/e-task-shell-backend.c
+++ b/modules/calendar/e-task-shell-backend.c
@@ -278,13 +278,17 @@ action_task_new_cb (GtkAction *action,
 	 * FIXME Need to obtain a better default time zone. */
 	action_name = gtk_action_get_name (action);
 	if (strcmp (action_name, "task-assigned-new") == 0)
-		e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_TASKS, FALSE, NULL,
+		e_client_utils_open_new (
+			source, E_CLIENT_SOURCE_TYPE_TASKS, FALSE, NULL,
 			e_client_utils_authenticate_handler, GTK_WINDOW (shell_window),
-			task_shell_backend_task_assigned_new_cb, g_object_ref (shell));
+			task_shell_backend_task_assigned_new_cb,
+			g_object_ref (shell));
 	else
-		e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_TASKS, FALSE, NULL,
+		e_client_utils_open_new (
+			source, E_CLIENT_SOURCE_TYPE_TASKS, FALSE, NULL,
 			e_client_utils_authenticate_handler, GTK_WINDOW (shell_window),
-			task_shell_backend_task_new_cb, g_object_ref (shell));
+			task_shell_backend_task_new_cb,
+			g_object_ref (shell));
 
 	g_object_unref (source_list);
 }
diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c
index 8284a63446..73351d0cf0 100644
--- a/modules/calendar/e-task-shell-content.c
+++ b/modules/calendar/e-task-shell-content.c
@@ -427,10 +427,10 @@ static void
 task_shell_content_constructed (GObject *object)
 {
 	ETaskShellContentPrivate *priv;
+	EShellView *shell_view;
+	EShellWindow *shell_window;
 	EShellContent *shell_content;
 	EShellTaskbar *shell_taskbar;
-	EShellWindow *shell_window;
-	EShellView *shell_view;
 	GalViewInstance *view_instance;
 	GtkTargetList *target_list;
 	GtkTargetEntry *targets;
diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c
index 4667ae4ed6..3a9a09ad16 100644
--- a/modules/calendar/e-task-shell-sidebar.c
+++ b/modules/calendar/e-task-shell-sidebar.c
@@ -750,7 +750,8 @@ task_shell_sidebar_check_state (EShellSidebar *shell_sidebar)
 		client = g_hash_table_lookup (
 			task_shell_sidebar->priv->client_table,
 			e_source_get_uid (source));
-		refresh_supported = client &&
+		refresh_supported =
+			client != NULL &&
 			e_client_check_refresh_supported (E_CLIENT (client));
 
 		g_object_unref (source);
diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c
index badfbf031d..c15597b082 100644
--- a/modules/calendar/e-task-shell-view-actions.c
+++ b/modules/calendar/e-task-shell-view-actions.c
@@ -118,9 +118,11 @@ action_task_forward_cb (GtkAction *action,
 	comp = e_cal_component_new ();
 	clone = icalcomponent_new_clone (comp_data->icalcomp);
 	e_cal_component_set_icalcomponent (comp, clone);
+
 	itip_send_comp (
 		E_CAL_COMPONENT_METHOD_PUBLISH, comp,
 		comp_data->client, NULL, NULL, NULL, TRUE, FALSE);
+
 	g_object_unref (comp);
 }
 
@@ -189,6 +191,7 @@ action_task_list_delete_cb (GtkAction *action,
 		GTK_WINDOW (shell_window),
 		"calendar:prompt-delete-task-list",
 		e_source_get_display_name (source), NULL);
+
 	if (response != GTK_RESPONSE_YES) {
 		g_object_unref (source);
 		return;
diff --git a/modules/mail/e-mail-shell-backend.h b/modules/mail/e-mail-shell-backend.h
index c9c23d045d..3b820a0439 100644
--- a/modules/mail/e-mail-shell-backend.h
+++ b/modules/mail/e-mail-shell-backend.h
@@ -59,14 +59,17 @@ struct _EMailShellBackendClass {
 	EMailBackendClass parent_class;
 };
 
-GType		e_mail_shell_backend_get_type		(void);
-void		e_mail_shell_backend_type_register	(GTypeModule *type_module);
+GType		e_mail_shell_backend_get_type	(void);
+void		e_mail_shell_backend_type_register
+						(GTypeModule *type_module);
 
-void		e_mail_shell_backend_new_account	(EMailShellBackend *mail_shell_backend,
-							 GtkWindow *parent);
-void		e_mail_shell_backend_edit_account	(EMailShellBackend *mail_shell_backend,
-							 GtkWindow *parent,
-							 EAccount *account);
+void		e_mail_shell_backend_new_account
+						(EMailShellBackend *mail_shell_backend,
+						 GtkWindow *parent);
+void		e_mail_shell_backend_edit_account
+						(EMailShellBackend *mail_shell_backend,
+						 GtkWindow *parent,
+						 EAccount *account);
 
 /* XXX Find a better place for this function. */
 GSList *	e_mail_labels_get_filter_options (void);
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index bcda07c7a1..5de1e509fb 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -139,7 +139,8 @@ action_mail_account_properties_cb (GtkAction *action,
 	service = CAMEL_SERVICE (store);
 	uid = camel_service_get_uid (service);
 
-	e_mail_shell_backend_edit_account (E_MAIL_SHELL_BACKEND (shell_backend),
+	e_mail_shell_backend_edit_account (
+		E_MAIL_SHELL_BACKEND (shell_backend),
 		GTK_WINDOW (shell_window),
 		e_get_account_by_uid (uid));
 }
diff --git a/modules/online-accounts/camel-sasl-xoauth.c b/modules/online-accounts/camel-sasl-xoauth.c
index 7b1a59aa24..e3cbb69f80 100644
--- a/modules/online-accounts/camel-sasl-xoauth.c
+++ b/modules/online-accounts/camel-sasl-xoauth.c
@@ -16,19 +16,18 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+/* XXX Yeah, yeah... */
+#define GOA_API_IS_SUBJECT_TO_CHANGE
 
+#include <config.h>
 #include <glib/gi18n-lib.h>
 
+#include <goa/goa.h>
+
 #include <libemail-utils/e-account-utils.h>
 
 #include "camel-sasl-xoauth.h"
 
-#define GOA_API_IS_SUBJECT_TO_CHANGE
-#include <goa/goa.h>
-
 #define CAMEL_SASL_XOAUTH_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), CAMEL_TYPE_SASL_XOAUTH, CamelSaslXOAuthPrivate))
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 32fbf52e38..d9a2b4e6d4 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -62,7 +62,7 @@ struct _ItipViewPrivate {
 	ItipViewMode mode;
 	ECalClientSourceType type;
 
-        gchar *sender;
+	gchar *sender;
 	gchar *organizer;
 	gchar *organizer_sentby;
 	gchar *delegator;
@@ -73,18 +73,18 @@ struct _ItipViewPrivate {
 	gchar *summary;
 
 	gchar *location;
-        gchar *status;
+	gchar *status;
 	gchar *comment;
 
 	struct tm *start_tm;
 	gint start_tm_is_date : 1;
-        gchar *start_label;
-        const gchar *start_header;
+	gchar *start_label;
+	const gchar *start_header;
 
 	struct tm *end_tm;
 	gint end_tm_is_date : 1;
-        gchar *end_label;
-        const gchar *end_header;
+	gchar *end_label;
+	const gchar *end_header;
 
 	GSList *upper_info_items;
 	GSList *lower_info_items;
@@ -97,14 +97,14 @@ struct _ItipViewPrivate {
 
 	gint buttons_sensitive : 1;
 
-        gboolean is_recur_set;
+	gboolean is_recur_set;
 
 	gint needs_decline : 1;
 
-        WebKitDOMDocument *dom_document;
-        ItipPURI *puri;
+	WebKitDOMDocument *dom_document;
+	ItipPURI *puri;
 
-        gchar *error;
+	gchar *error;
 };
 
 #define TEXT_ROW_SENDER "text_row_sender"
@@ -150,7 +150,6 @@ struct _ItipViewPrivate {
 #define DIV_ITIP_CONTENT "div_itip_content"
 #define DIV_ITIP_ERROR "div_itip_error"
 
-/* Signal IDs */
 enum {
 	SOURCE_SELECTED,
 	RESPONSE,
@@ -2292,9 +2291,9 @@ itip_view_set_source (ItipView *view,
 	select = webkit_dom_document_get_element_by_id (
 		view->priv->dom_document, SELECT_ESOURCE);
 
-        /* <select> does not emit 'change' event when already selected <option>
-         * is re-selected, but we need to notify itip formatter, so that it would
-         * make all the buttons sensitive */
+	/* <select> does not emit 'change' event when already selected
+	 * <option> is re-selected, but we need to notify itip formatter,
+	 * so that it would make all the buttons sensitive. */
 	if (source == itip_view_get_source (view)) {
 		source_changed_cb (select, NULL, view);
 	}
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index 2d9efb6380..35910db8c7 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -25,10 +25,13 @@
 #endif
 
 #include "url-editor-dialog.h"
+
+#include <string.h>
+#include <glib/gi18n.h>
+
 #include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-url.h>
-#include <glib/gi18n.h>
-#include <string.h>
+
 #include <e-util/e-util.h>
 #include <e-util/e-util-private.h>
 
@@ -588,8 +591,15 @@ url_editor_dialog_run (UrlEditorDialog *dialog)
 		}
 
 		l = e_source_selector_get_selection (E_SOURCE_SELECTOR (dialog->events_selector));
-		for (p = l; p; p = g_slist_next (p))
-			dialog->uri->events = g_slist_append (dialog->uri->events, g_strdup (e_source_get_uid (p->data)));
+		for (p = l; p; p = g_slist_next (p)) {
+			ESource *source;
+			const gchar *uid;
+
+			source = E_SOURCE (p->data);
+			uid = e_source_get_uid (source);
+			dialog->uri->events = g_slist_append (
+				dialog->uri->events, g_strdup (uid));
+		}
 	}
 	gtk_widget_hide (GTK_WIDGET (dialog));
 
diff --git a/widgets/misc/e-auth-combo-box.c b/widgets/misc/e-auth-combo-box.c
index 182e171c00..bd3d8c78ea 100644
--- a/widgets/misc/e-auth-combo-box.c
+++ b/widgets/misc/e-auth-combo-box.c
@@ -185,6 +185,12 @@ e_auth_combo_box_init (EAuthComboBox *combo_box)
 	combo_box->priv = E_AUTH_COMBO_BOX_GET_PRIVATE (combo_box);
 }
 
+GtkWidget *
+e_auth_combo_box_new (void)
+{
+	return g_object_new (E_TYPE_AUTH_COMBO_BOX, NULL);
+}
+
 CamelProvider *
 e_auth_combo_box_get_provider (EAuthComboBox *combo_box)
 {