[evolution-data-server] Miscellaneous cleanups.

[Matthew Barnes <mbarnes src gnome org>]

commit eafd5381e46a8d9dd5ca6a24245f328493304f0d
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Mar 2 17:10:13 2014 -0500

    Miscellaneous cleanups.

 calendar/backends/caldav/e-cal-backend-caldav.c |    4 +-
 camel/camel-folder-summary.c                    |    8 +++---
 camel/camel-mime-utils.c                        |    2 +-
 camel/camel-vee-folder.c                        |    2 +-
 camel/providers/imapx/camel-imapx-search.c      |   34 +++++++++++-----------
 camel/providers/imapx/camel-imapx-server.c      |    8 +++---
 camel/providers/imapx/camel-imapx-utils.c       |    2 +-
 libebackend/e-server-side-source.c              |    2 +-
 libedataserver/e-source.c                       |   12 ++++----
 9 files changed, 37 insertions(+), 37 deletions(-)
---
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index 948901d..c2fde31 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -5119,8 +5119,8 @@ caldav_source_changed_thread (gpointer data)
        g_mutex_lock (&cbdav->priv->busy_lock);
 
        /* guard the call with busy_lock, thus the two threads (this 'source changed'
-          thread and the 'backend open' thread) will not clash on internal data
-          when they are called in once */
+        * thread and the 'backend open' thread) will not clash on internal data
+        * when they are called in once */
        initialize_backend (cbdav, NULL);
 
        /* always wakeup thread, even when it was sleeping */
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 90bd255..d38220f 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -2004,8 +2004,8 @@ perform_content_info_load_from_db (CamelFolderSummary *summary,
 
 static void
 gather_dirty_uids (gpointer key,
-                  gpointer value,
-                  gpointer user_data)
+                   gpointer value,
+                   gpointer user_data)
 {
        const gchar *uid = key;
        CamelMessageInfoBase *info = value;
@@ -2017,8 +2017,8 @@ gather_dirty_uids (gpointer key,
 
 static void
 gather_changed_uids (gpointer key,
-                    gpointer value,
-                    gpointer user_data)
+                     gpointer value,
+                     gpointer user_data)
 {
        const gchar *uid = key;
        guint32 flags = GPOINTER_TO_UINT (value);
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index af9fa55..185e562 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -1076,7 +1076,7 @@ decode_8bit (const gchar *text,
 
 static void
 make_string_utf8_valid (gchar *text,
-                       gsize textlen)
+                        gsize textlen)
 {
        gchar *p;
        gsize len;
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index 4dfe6c6..ea690b4 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -1716,7 +1716,7 @@ camel_vee_folder_ignore_next_changed_event (CamelVeeFolder *vfolder,
  **/
 void
 camel_vee_folder_remove_from_ignore_changed_event (CamelVeeFolder *vfolder,
-                                                  CamelFolder *subfolder)
+                                                   CamelFolder *subfolder)
 {
        g_return_if_fail (CAMEL_IS_VEE_FOLDER (vfolder));
        g_return_if_fail (subfolder != NULL);
diff --git a/camel/providers/imapx/camel-imapx-search.c b/camel/providers/imapx/camel-imapx-search.c
index 64d3d44..7480048 100644
--- a/camel/providers/imapx/camel-imapx-search.c
+++ b/camel/providers/imapx/camel-imapx-search.c
@@ -91,7 +91,7 @@ imapx_search_dispose (GObject *object)
 
 static CamelSExpResult *
 imapx_search_result_match_all (CamelSExp *sexp,
-                              CamelFolderSearch *search)
+                               CamelFolderSearch *search)
 {
        CamelSExpResult *result;
 
@@ -117,7 +117,7 @@ imapx_search_result_match_all (CamelSExp *sexp,
 
 static CamelSExpResult *
 imapx_search_result_match_none (CamelSExp *sexp,
-                               CamelFolderSearch *search)
+                                CamelFolderSearch *search)
 {
        CamelSExpResult *result;
 
@@ -136,10 +136,10 @@ imapx_search_result_match_none (CamelSExp *sexp,
 
 static CamelSExpResult *
 imapx_search_process_criteria (CamelSExp *sexp,
-                              CamelFolderSearch *search,
-                              CamelIMAPXServer *server,
-                              const GString *criteria,
-                              const gchar *from_function)
+                               CamelFolderSearch *search,
+                               CamelIMAPXServer *server,
+                               const GString *criteria,
+                               const gchar *from_function)
 {
        CamelSExpResult *result;
        CamelIMAPXMailbox *mailbox;
@@ -191,9 +191,9 @@ imapx_search_process_criteria (CamelSExp *sexp,
 
 static CamelSExpResult *
 imapx_search_match_all (CamelSExp *sexp,
-                       gint argc,
-                       CamelSExpTerm **argv,
-                       CamelFolderSearch *search)
+                        gint argc,
+                        CamelSExpTerm **argv,
+                        CamelFolderSearch *search)
 {
        CamelIMAPXSearch *imapx_search = CAMEL_IMAPX_SEARCH (search);
        CamelIMAPXServer *server;
@@ -214,7 +214,7 @@ imapx_search_match_all (CamelSExp *sexp,
        }
 
        /* First try to see whether all used headers are available locally - if
-          they are, then do not use server-side filtering at all. */
+        * they are, then do not use server-side filtering at all. */
        prev_local_data_search = imapx_search->priv->local_data_search;
        imapx_search->priv->local_data_search = &local_data_search;
 
@@ -245,7 +245,7 @@ imapx_search_match_all (CamelSExp *sexp,
        }
 
        /* let's change the requirements a bit, the parent class expects as a result boolean,
-          but here is expected GPtrArray of matched UIDs */
+        * but here is expected GPtrArray of matched UIDs */
        result = camel_sexp_term_eval (sexp, argv[0]);
 
        g_object_unref (server);
@@ -352,9 +352,9 @@ imapx_search_is_header_from_summary (const gchar *header_name)
 
 static CamelSExpResult *
 imapx_search_header_contains (CamelSExp *sexp,
-                             gint argc,
-                             CamelSExpResult **argv,
-                             CamelFolderSearch *search)
+                              gint argc,
+                              CamelSExpResult **argv,
+                              CamelFolderSearch *search)
 {
        CamelIMAPXSearch *imapx_search = CAMEL_IMAPX_SEARCH (search);
        CamelIMAPXServer *server;
@@ -463,9 +463,9 @@ imapx_search_header_contains (CamelSExp *sexp,
 
 static CamelSExpResult *
 imapx_search_header_exists (CamelSExp *sexp,
-                           gint argc,
-                           CamelSExpResult **argv,
-                           CamelFolderSearch *search)
+                            gint argc,
+                            CamelSExpResult **argv,
+                            CamelFolderSearch *search)
 {
        CamelIMAPXSearch *imapx_search = CAMEL_IMAPX_SEARCH (search);
        CamelIMAPXServer *server;
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 1661b27..162b34c 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -7641,9 +7641,9 @@ imapx_parser_thread (gpointer user_data)
        is = CAMEL_IMAPX_SERVER (user_data);
 
        /* Do not use CamelOperation here, because it can be cancelled at
-          an application end with camel_operation_cancel_all() call, which
-          is done too early, before any pending jobs are properly finished
-          (it can be IDLE job, or save of folder changes back to the server).
+        * an application end with camel_operation_cancel_all() call, which
+        * is done too early, before any pending jobs are properly finished
+        * (it can be IDLE job, or save of folder changes back to the server).
         */
        cancellable = g_cancellable_new ();
        g_weak_ref_set (&is->priv->parser_cancellable, cancellable);
@@ -8817,7 +8817,7 @@ imapx_sync_free_user (GArray *user_set)
 
 static void
 imapx_unset_folder_flagged_flag (CamelFolderSummary *summary,
-                                GPtrArray *changed_uids)
+                                 GPtrArray *changed_uids)
 {
        CamelMessageInfo *info;
        gboolean changed = FALSE;
diff --git a/camel/providers/imapx/camel-imapx-utils.c b/camel/providers/imapx/camel-imapx-utils.c
index 16619d4..2ebfd1b 100644
--- a/camel/providers/imapx/camel-imapx-utils.c
+++ b/camel/providers/imapx/camel-imapx-utils.c
@@ -291,7 +291,7 @@ imapx_update_message_info_flags (CamelMessageInfo *info,
        }
 
        /* This makes sure that server flags has precedence from locally stored flags,
-          thus a user actually sees what is stored on the server */
+        * thus a user actually sees what is stored on the server */
        if ((camel_message_info_flags (info) & CAMEL_IMAPX_SERVER_FLAGS) != (server_flags & 
CAMEL_IMAPX_SERVER_FLAGS)) {
                xinfo->server_flags = (xinfo->server_flags & ~CAMEL_IMAPX_SERVER_FLAGS) |
                                      (camel_message_info_flags (info) & CAMEL_IMAPX_SERVER_FLAGS);
diff --git a/libebackend/e-server-side-source.c b/libebackend/e-server-side-source.c
index 60ce7f3..67007fd 100644
--- a/libebackend/e-server-side-source.c
+++ b/libebackend/e-server-side-source.c
@@ -271,7 +271,7 @@ server_side_source_write_cb (EDBusSourceWritable *dbus_interface,
                e_dbus_source_set_data (dbus_source, data);
 
                /* Make sure the ESource::changed signal is called, otherwise
-                  the above Q&A doesn't work and changed data are not saved. */
+                * the above Q&A doesn't work and changed data are not saved. */
                e_source_changed (source);
        }
 
diff --git a/libedataserver/e-source.c b/libedataserver/e-source.c
index fe25872..a9a923f 100644
--- a/libedataserver/e-source.c
+++ b/libedataserver/e-source.c
@@ -338,8 +338,8 @@ source_localized_hack (GKeyFile *key_file,
 
 static gboolean
 source_check_values_differ (GType g_type,
-                           const GValue *value,
-                           const GValue *value2)
+                            const GValue *value,
+                            const GValue *value2)
 {
        gboolean differ = TRUE;
        GValue *value1;
@@ -360,7 +360,7 @@ source_check_values_differ (GType g_type,
 
                do {
                        check_type (BOOLEAN, boolean);
-                       check_type (CHAR, char);
+                       check_type (CHAR, schar);
                        check_type (DOUBLE, double);
                        check_type (ENUM, enum);
                        check_type (FLAGS, flags);
@@ -657,9 +657,9 @@ source_set_property_from_key_file (GObject *object,
                g_object_get_property (object, pspec->name, cvalue);
 
                /* This is because the g_object_set_property() invokes "notify" signal
-                  on the set property, even if the value did not change, which creates
-                  false notifications, which can cause UI or background activities
-                  without any real reason (especially with the ''enabled' property load). */
+                * on the set property, even if the value did not change, which creates
+                * false notifications, which can cause UI or background activities
+                * without any real reason (especially with the ''enabled' property load). */
                if (!G_IS_VALUE (cvalue) || source_check_values_differ (pspec->value_type, value, cvalue))
                        g_object_set_property (object, pspec->name, value);