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.

2 files changed, 29 insertions, 14 deletions

diff --git a/widgets/misc/e-account-tree-view.c b/widgets/misc/e-account-tree-view.c
index a2136433d4..7eae4e14aa 100644
--- a/widgets/misc/e-account-tree-view.c
+++ b/widgets/misc/e-account-tree-view.c
@@ -941,7 +941,8 @@ e_account_tree_view_get_selected_type (EAccountTreeView *tree_view)
  * Since: 3.4
  **/
 void
-e_account_tree_view_set_selected_type (EAccountTreeView *tree_view, EAccountTreeViewSelectedType select)
+e_account_tree_view_set_selected_type (EAccountTreeView *tree_view,
+                                       EAccountTreeViewSelectedType select)
 {
 	GtkTreeSelection *selection;
 	GtkTreeModel *model;
@@ -994,7 +995,8 @@ e_account_tree_view_set_selected_type (EAccountTreeView *tree_view, EAccountTree
 }
 
 static guint
-account_tree_view_get_slist_index (const GSList *account_uids, const gchar *uid)
+account_tree_view_get_slist_index (const GSList *account_uids,
+                                   const gchar *uid)
 {
 	guint res = 0;
 
@@ -1021,7 +1023,8 @@ account_tree_view_get_slist_index (const GSList *account_uids, const gchar *uid)
  * Since: 3.4
  **/
 void
-e_account_tree_view_set_sort_order (EAccountTreeView *tree_view, const GSList *account_uids)
+e_account_tree_view_set_sort_order (EAccountTreeView *tree_view,
+                                    const GSList *account_uids)
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
@@ -1064,7 +1067,9 @@ e_account_tree_view_set_sort_order (EAccountTreeView *tree_view, const GSList *a
 }
 
 static gint
-eval_order_by_sort_hash_cb (gconstpointer a, gconstpointer b, gpointer user_data)
+eval_order_by_sort_hash_cb (gconstpointer a,
+                            gconstpointer b,
+                            gpointer user_data)
 {
 	guint asortorder = GPOINTER_TO_UINT (g_hash_table_lookup (user_data, a));
 	guint bsortorder = GPOINTER_TO_UINT (g_hash_table_lookup (user_data, b));
@@ -1173,7 +1178,8 @@ e_account_tree_view_sort_changed (EAccountTreeView *tree_view)
 }
 
 static void
-account_tree_view_swap_sort_order (EAccountTreeView *tree_view, gint direction)
+account_tree_view_swap_sort_order (EAccountTreeView *tree_view,
+                                   gint direction)
 {
 	GtkTreeSelection *selection;
 	GtkTreeModel *model;
@@ -1239,7 +1245,8 @@ e_account_tree_view_move_down (EAccountTreeView *tree_view)
 }
 
 void
-e_account_tree_view_set_sort_alpha (EAccountTreeView *tree_view, gboolean sort_alpha)
+e_account_tree_view_set_sort_alpha (EAccountTreeView *tree_view,
+                                    gboolean sort_alpha)
 {
 	g_return_if_fail (tree_view != NULL);
 	g_return_if_fail (E_IS_ACCOUNT_TREE_VIEW (tree_view));
@@ -1265,7 +1272,8 @@ e_account_tree_view_get_sort_alpha (EAccountTreeView *tree_view)
 }
 
 void
-e_account_tree_view_set_express_mode (EAccountTreeView *tree_view, gboolean express_mode)
+e_account_tree_view_set_express_mode (EAccountTreeView *tree_view,
+                                      gboolean express_mode)
 {
 	g_return_if_fail (tree_view != NULL);
 	g_return_if_fail (E_IS_ACCOUNT_TREE_VIEW (tree_view));
@@ -1291,7 +1299,9 @@ e_account_tree_view_get_express_mode (EAccountTreeView *tree_view)
 }
 
 static void
-update_special_enable_state (EAccountTreeView *tree_view, const gchar *display_name, gboolean enabled)
+update_special_enable_state (EAccountTreeView *tree_view,
+                             const gchar *display_name,
+                             gboolean enabled)
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
@@ -1332,7 +1342,8 @@ update_special_enable_state (EAccountTreeView *tree_view, const gchar *display_n
 }
 
 void
-e_account_tree_view_set_enable_local_folders (EAccountTreeView *tree_view, gboolean enabled)
+e_account_tree_view_set_enable_local_folders (EAccountTreeView *tree_view,
+                                              gboolean enabled)
 {
 	g_return_if_fail (tree_view != NULL);
 	g_return_if_fail (E_IS_ACCOUNT_TREE_VIEW (tree_view));
@@ -1359,7 +1370,8 @@ e_account_tree_view_get_enable_local_folders (EAccountTreeView *tree_view)
 }
 
 void
-e_account_tree_view_set_enable_search_folders (EAccountTreeView *tree_view, gboolean enabled)
+e_account_tree_view_set_enable_search_folders (EAccountTreeView *tree_view,
+                                               gboolean enabled)
 {
 	g_return_if_fail (tree_view != NULL);
 	g_return_if_fail (E_IS_ACCOUNT_TREE_VIEW (tree_view));
diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c
index 8db9f2af80..691fd518b8 100644
--- a/widgets/misc/e-attachment-store.c
+++ b/widgets/misc/e-attachment-store.c
@@ -1080,7 +1080,7 @@ struct _SaveContext {
 static SaveContext *
 attachment_store_save_context_new (EAttachmentStore *store,
                                    GFile *destination,
-				   const gchar *filename_prefix,
+                                   const gchar *filename_prefix,
                                    GAsyncReadyCallback callback,
                                    gpointer user_data)
 {
@@ -1128,7 +1128,7 @@ attachment_store_save_context_free (SaveContext *save_context)
 
 	g_free (save_context->filename_prefix);
 	save_context->filename_prefix = NULL;
-	
+
 	if (save_context->fresh_directory) {
 		g_object_unref (save_context->fresh_directory);
 		save_context->fresh_directory = NULL;
@@ -1145,7 +1145,10 @@ attachment_store_save_context_free (SaveContext *save_context)
 }
 
 static void
-attachment_store_move_file (SaveContext *save_context, GFile *source, GFile *destination, GError **error)
+attachment_store_move_file (SaveContext *save_context,
+                            GFile *source,
+                            GFile *destination,
+                            GError **error)
 {
 	gchar *tmpl;
 	gchar *path;
@@ -1311,7 +1314,7 @@ attachment_store_save_cb (EAttachment *attachment,
 void
 e_attachment_store_save_async (EAttachmentStore *store,
                                GFile *destination,
-			       const gchar *filename_prefix,
+                               const gchar *filename_prefix,
                                GAsyncReadyCallback callback,
                                gpointer user_data)
 {