[evolution-data-server/gnome-3-8] Miscellaneous cleanups.

[Matthew Barnes <mbarnes src gnome org>]

commit 609d7c72862670487c1d2700da89092b0261fbf7
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Jul 23 08:01:39 2013 -0400

    Miscellaneous cleanups.

 addressbook/backends/ldap/e-book-backend-ldap.c |   10 +++---
 calendar/libedata-cal/e-cal-backend-store.c     |    2 +-
 camel/camel-folder.c                            |    4 +-
 camel/camel-gpg-context.c                       |    4 +-
 camel/camel-imapx-folder.c                      |    6 ++--
 camel/camel-object-bag.c                        |   32 ++++++++++++----------
 camel/camel-sasl-ntlm.c                         |    1 -
 camel/camel-service.c                           |    6 ++--
 8 files changed, 33 insertions(+), 32 deletions(-)
---
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index 0c7f511..3bc9ba5 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -463,7 +463,7 @@ can_browse (EBookBackend *backend)
 }
 
 /* because the priv->marked_for_offline is populated only after open,
-   thus get the actual value directy from the source */
+ * thus get the actual value directy from the source */
 static gboolean
 get_marked_for_offline (EBookBackend *backend)
 {
@@ -5264,9 +5264,9 @@ generate_cache (EBookBackendLDAP *book_backend_ldap)
 
 static void
 book_backend_ldap_refresh (EBookBackend *backend,
-                          EDataBook *book,
-                          guint32 opid,
-                          GCancellable *cancellable)
+                           EDataBook *book,
+                           guint32 opid,
+                           GCancellable *cancellable)
 {
        EBookBackendLDAP *ldap_backend = E_BOOK_BACKEND_LDAP (backend);
 
@@ -5446,7 +5446,7 @@ e_book_backend_ldap_get_backend_property (EBookBackend *backend,
                if (get_marked_for_offline (backend))
                        e_data_book_respond_get_backend_property (book, opid, NULL, 
"net,anon-access,contact-lists,do-initial-query,refresh-supported");
                else if (can_browse (backend))
-                       e_data_book_respond_get_backend_property (book, opid, NULL, 
"net,anon-access,contact-lists,do-initial-query");
+                       e_data_book_respond_get_backend_property (book, opid, NULL, 
"net,anon-access,contact-lists,do-initial-query");
                else
                        e_data_book_respond_get_backend_property (book, opid, NULL, 
"net,anon-access,contact-lists");
        } else if (g_str_equal (prop_name, BOOK_BACKEND_PROPERTY_REQUIRED_FIELDS)) {
diff --git a/calendar/libedata-cal/e-cal-backend-store.c b/calendar/libedata-cal/e-cal-backend-store.c
index 2184bd8..82d2245 100644
--- a/calendar/libedata-cal/e-cal-backend-store.c
+++ b/calendar/libedata-cal/e-cal-backend-store.c
@@ -1325,7 +1325,7 @@ e_cal_backend_store_get_components_by_uid (ECalBackendStore *store,
  **/
 gchar *
 e_cal_backend_store_get_components_by_uid_as_ical_string (ECalBackendStore *store,
-                                                         const gchar *uid)
+                                                          const gchar *uid)
 {
        GSList *comps;
        gchar *ical_string = NULL;
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 145d441..1002c36 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -272,8 +272,8 @@ prepare_folder_filter_data_free (FolderFilterData *data)
        GThread *thread;
 
        /* Do the actual free in a dedicated thread, because the driver or
-          folder unref can do network/blocking I/O operations, but this
-          function is called in the main (UI) thread.
+        * folder unref can do network/blocking I/O operations, but this
+        * function is called in the main (UI) thread.
        */
        thread = g_thread_new (NULL, folder_filter_data_free_thread, data);
        g_thread_unref (thread);
diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
index d1b6ef7..33453e1 100644
--- a/camel/camel-gpg-context.c
+++ b/camel/camel-gpg-context.c
@@ -2166,8 +2166,8 @@ gpg_decrypt_sync (CamelCipherContext *context,
        }
 
        /* Report errors only if nothing was decrypted; missing sender's key used
-          for signature of a signed and encrypted messages causes GPG to return
-          failure, thus count with it.
+        * for signature of a signed and encrypted messages causes GPG to return
+        * failure, thus count with it.
         */
        if (gpg_ctx_op_wait (gpg) != 0 && gpg->nodata) {
                const gchar *diagnostics;
diff --git a/camel/camel-imapx-folder.c b/camel/camel-imapx-folder.c
index 132d0dc..d688b5e 100644
--- a/camel/camel-imapx-folder.c
+++ b/camel/camel-imapx-folder.c
@@ -321,7 +321,7 @@ imapx_search_by_uids (CamelFolder *folder,
 
        if (online) {
                /* do not panic when the server cannot be reached for whatever reason,
-                  show offline data at least */
+                * show offline data at least */
                server = camel_imapx_store_get_server (
                        CAMEL_IMAPX_STORE (parent_store),
                        folder_name, cancellable, NULL);
@@ -370,7 +370,7 @@ imapx_count_by_expression (CamelFolder *folder,
 
        if (online) {
                /* do not panic when the server cannot be reached for whatever reason,
-                  show offline data at least */
+                * show offline data at least */
                server = camel_imapx_store_get_server (
                        CAMEL_IMAPX_STORE (parent_store),
                        folder_name, cancellable, NULL);
@@ -419,7 +419,7 @@ imapx_search_by_expression (CamelFolder *folder,
 
        if (online) {
                /* do not panic when the server cannot be reached for whatever reason,
-                  show offline data at least */
+                * show offline data at least */
                server = camel_imapx_store_get_server (
                        CAMEL_IMAPX_STORE (parent_store),
                        folder_name, cancellable, NULL);
diff --git a/camel/camel-object-bag.c b/camel/camel-object-bag.c
index e33c09c..cbc7f16 100644
--- a/camel/camel-object-bag.c
+++ b/camel/camel-object-bag.c
@@ -104,10 +104,10 @@ object_bag_unreserve (CamelObjectBag *bag,
 }
 
 /* Ick. We need to store the original gobject pointer too, since that's
-   used as the key in one of the hash tables. So to clean up after the
-   object dies and the GWeakRef starts returning NULL, we'll need to
-   know where it *was*. This is safe because we'll always check and
-   avoid adding a duplicate. But still, ick. */
+ * used as the key in one of the hash tables. So to clean up after the
+ * object dies and the GWeakRef starts returning NULL, we'll need to
+ * know where it *was*. This is safe because we'll always check and
+ * avoid adding a duplicate. But still, ick. */
 typedef struct {
        GWeakRef ref;
        gpointer obj;
@@ -116,7 +116,7 @@ typedef struct {
 
 static void
 object_bag_notify (CamelObjectBag *bag,
-                  GObject *where_the_object_was)
+                   GObject *where_the_object_was)
 {
        gconstpointer key;
 
@@ -140,10 +140,10 @@ wref_free_func (gpointer p)
 
        if (obj) {
                /* The object is being removed from the bag while it's
-                  still alive, e.g. by camel_object_bag_remove()
-                  or camel_object_bag_destroy(). Drop the weak_ref. */
-               g_object_weak_unref (obj, (GWeakNotify) object_bag_notify,
-                                    ref->bag);
+                * still alive, e.g. by camel_object_bag_remove()
+                * or camel_object_bag_destroy(). Drop the weak_ref. */
+               g_object_weak_unref (
+                       obj, (GWeakNotify) object_bag_notify, ref->bag);
                g_object_unref (obj);
        }
        g_weak_ref_clear (&ref->ref);
@@ -384,7 +384,8 @@ camel_object_bag_reserve (CamelObjectBag *bag,
 }
 
 static gboolean
-object_in_bag (CamelObjectBag *bag, gpointer object)
+object_in_bag (CamelObjectBag *bag,
+               gpointer object)
 {
        gconstpointer key;
        ObjRef *ref;
@@ -430,15 +431,15 @@ camel_object_bag_add (CamelObjectBag *bag,
 
        g_mutex_lock (&bag->mutex);
 
-       /* Check it's the *same* object, not an old one at the same address */
+       /* Check it's the same object, not an old one at the same address. */
        if (!object_in_bag (bag, object)) {
                ObjRef *ref;
                gpointer copied_key;
 
                ref = g_slice_new (ObjRef);
                ref->bag = bag;
-               /* We need to stash a 'raw' pointer since that's the key we use
-                  in the key_table */
+               /* We need to stash a 'raw' pointer since that's the key
+                * we use in the key_table. */
                ref->obj = object;
                g_weak_ref_init (&ref->ref, object);
                copied_key = bag->key_copy_func (key);
@@ -446,8 +447,9 @@ camel_object_bag_add (CamelObjectBag *bag,
                g_hash_table_insert (bag->object_table, copied_key, ref);
                object_bag_unreserve (bag, key);
 
-               g_object_weak_ref (G_OBJECT (object),
-                                  (GWeakNotify) object_bag_notify, bag);
+               g_object_weak_ref (
+                       G_OBJECT (object),
+                       (GWeakNotify) object_bag_notify, bag);
        }
 
        g_mutex_unlock (&bag->mutex);
diff --git a/camel/camel-sasl-ntlm.c b/camel/camel-sasl-ntlm.c
index 3018f54..eedb79d 100644
--- a/camel/camel-sasl-ntlm.c
+++ b/camel/camel-sasl-ntlm.c
@@ -976,7 +976,6 @@ exit:
        return ret;
 }
 
-
 static void
 sasl_ntlm_finalize (GObject *object)
 {
diff --git a/camel/camel-service.c b/camel/camel-service.c
index 46e9e1e..777a344 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -1900,9 +1900,9 @@ camel_service_disconnect (CamelService *service,
                        service->priv->connection_op = op;
 
                        /* Do not change the status if "Connecting" - in case a provider calls
-                          "Disconnect" during the connection phase, which confuses the other
-                          logic here, effectively makes the service's connection state "Connected",
-                          instead of "Disconnected", at the end. */
+                        * "Disconnect" during the connection phase, which confuses the other
+                        * logic here, effectively makes the service's connection state "Connected",
+                        * instead of "Disconnected", at the end. */
                        if (service->priv->status != CAMEL_SERVICE_CONNECTING) {
                                service->priv->status = CAMEL_SERVICE_DISCONNECTING;
                                service_queue_notify_connection_status (service);