[evolution-data-server] Remove CAMEL_STORE_SUMMARY_SUMMARY_LOCK.

[Matthew Barnes <mbarnes src gnome org>]

commit dc75702a08f580e6ae129fe13f48a60293df176a
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Aug 16 15:36:13 2013 -0400

    Remove CAMEL_STORE_SUMMARY_SUMMARY_LOCK.
    
    Keep this internal to CamelStoreSummary.
    
    Removed functions:
    
      camel_store_summary_lock()
      camel_store_summary_unlock()

 camel/camel-store-summary.c             |  112 +++++++++----------------------
 camel/camel-store-summary.h             |   14 ----
 docs/reference/camel/camel-sections.txt |    3 -
 3 files changed, 32 insertions(+), 97 deletions(-)
---
diff --git a/camel/camel-store-summary.c b/camel/camel-store-summary.c
index ae316d1..3883b9b 100644
--- a/camel/camel-store-summary.c
+++ b/camel/camel-store-summary.c
@@ -96,7 +96,7 @@ store_summary_dispose (GObject *object)
 {
        CamelStoreSummary *summary = CAMEL_STORE_SUMMARY (object);
 
-       camel_store_summary_lock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_lock (&summary->priv->summary_lock);
 
        if (summary->priv->scheduled_save_id != 0) {
                g_source_remove (summary->priv->scheduled_save_id);
@@ -104,7 +104,7 @@ store_summary_dispose (GObject *object)
                camel_store_summary_save (summary);
        }
 
-       camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_unlock (&summary->priv->summary_lock);
 
        G_OBJECT_CLASS (camel_store_summary_parent_class)->dispose (object);
 }
@@ -323,12 +323,12 @@ camel_store_summary_set_filename (CamelStoreSummary *summary,
 {
        g_return_if_fail (CAMEL_IS_STORE_SUMMARY (summary));
 
-       camel_store_summary_lock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_lock (&summary->priv->summary_lock);
 
        g_free (summary->summary_path);
        summary->summary_path = g_strdup (name);
 
-       camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_unlock (&summary->priv->summary_lock);
 }
 
 /**
@@ -367,7 +367,7 @@ camel_store_summary_array (CamelStoreSummary *summary)
 
        g_return_val_if_fail (CAMEL_IS_STORE_SUMMARY (summary), NULL);
 
-       camel_store_summary_lock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_lock (&summary->priv->summary_lock);
 
        res = g_ptr_array_sized_new (summary->folders->len);
        for (i = 0; i < summary->folders->len; i++) {
@@ -376,7 +376,7 @@ camel_store_summary_array (CamelStoreSummary *summary)
                g_ptr_array_add (res, info);
        }
 
-       camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_unlock (&summary->priv->summary_lock);
 
        return res;
 }
@@ -425,14 +425,14 @@ camel_store_summary_path (CamelStoreSummary *summary,
        g_return_val_if_fail (CAMEL_IS_STORE_SUMMARY (summary), NULL);
        g_return_val_if_fail (path != NULL, NULL);
 
-       camel_store_summary_lock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_lock (&summary->priv->summary_lock);
 
        info = g_hash_table_lookup (summary->folders_path, path);
 
        if (info != NULL)
                camel_store_summary_info_ref (summary, info);
 
-       camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_unlock (&summary->priv->summary_lock);
 
        return info;
 }
@@ -610,13 +610,13 @@ camel_store_summary_add (CamelStoreSummary *summary,
                return;
        }
 
-       camel_store_summary_lock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_lock (&summary->priv->summary_lock);
 
        g_ptr_array_add (summary->folders, info);
        g_hash_table_insert (summary->folders_path, (gchar *) camel_store_info_path (summary, info), info);
        summary->flags |= CAMEL_STORE_SUMMARY_DIRTY;
 
-       camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_unlock (&summary->priv->summary_lock);
 }
 
 /**
@@ -637,7 +637,7 @@ camel_store_summary_add_from_path (CamelStoreSummary *summary,
        g_return_val_if_fail (CAMEL_IS_STORE_SUMMARY (summary), NULL);
        g_return_val_if_fail (path != NULL, NULL);
 
-       camel_store_summary_lock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_lock (&summary->priv->summary_lock);
 
        info = g_hash_table_lookup (summary->folders_path, path);
        if (info != NULL) {
@@ -656,7 +656,7 @@ camel_store_summary_add_from_path (CamelStoreSummary *summary,
                summary->flags |= CAMEL_STORE_SUMMARY_DIRTY;
        }
 
-       camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_unlock (&summary->priv->summary_lock);
 
        return info;
 }
@@ -719,9 +719,9 @@ camel_store_summary_touch (CamelStoreSummary *summary)
 {
        g_return_if_fail (CAMEL_IS_STORE_SUMMARY (summary));
 
-       camel_store_summary_lock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_lock (&summary->priv->summary_lock);
        summary->flags |= CAMEL_STORE_SUMMARY_DIRTY;
-       camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_unlock (&summary->priv->summary_lock);
 }
 
 /**
@@ -738,11 +738,11 @@ camel_store_summary_remove (CamelStoreSummary *summary,
        g_return_if_fail (CAMEL_IS_STORE_SUMMARY (summary));
        g_return_if_fail (info != NULL);
 
-       camel_store_summary_lock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_lock (&summary->priv->summary_lock);
        g_hash_table_remove (summary->folders_path, camel_store_info_path (summary, info));
        g_ptr_array_remove (summary->folders, info);
        summary->flags |= CAMEL_STORE_SUMMARY_DIRTY;
-       camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_unlock (&summary->priv->summary_lock);
 
        camel_store_summary_info_unref (summary, info);
 }
@@ -764,15 +764,15 @@ camel_store_summary_remove_path (CamelStoreSummary *summary,
        g_return_if_fail (CAMEL_IS_STORE_SUMMARY (summary));
        g_return_if_fail (path != NULL);
 
-       camel_store_summary_lock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_lock (&summary->priv->summary_lock);
        if (g_hash_table_lookup_extended (summary->folders_path, path, (gpointer) &oldpath, (gpointer) 
&oldinfo)) {
                /* make sure it doesn't vanish while we're removing it */
                camel_store_summary_info_ref (summary, oldinfo);
-               camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+               g_rec_mutex_unlock (&summary->priv->summary_lock);
                camel_store_summary_remove (summary, oldinfo);
                camel_store_summary_info_unref (summary, oldinfo);
        } else {
-               camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+               g_rec_mutex_unlock (&summary->priv->summary_lock);
        }
 }
 
@@ -825,7 +825,7 @@ camel_store_info_set_string (CamelStoreSummary *summary,
 
        class->store_info_set_string (summary, info, type, value);
 
-       g_rec_mutex_unlock (&summary->priv->summary_unlock);
+       g_rec_mutex_unlock (&summary->priv->summary_lock);
 }
 
 /**
@@ -872,54 +872,6 @@ camel_store_info_name (CamelStoreSummary *summary,
        return (cp != NULL) ? cp + 1 : info->path;
 }
 
-/**
- * camel_store_summary_lock:
- * @summary: a #CamelStoreSummary
- * @lock: lock type to lock
- *
- * Locks @summary's @lock. Unlock it with camel_store_summary_unlock().
- *
- * Since: 2.32
- **/
-void
-camel_store_summary_lock (CamelStoreSummary *summary,
-                          CamelStoreSummaryLock lock)
-{
-       g_return_if_fail (CAMEL_IS_STORE_SUMMARY (summary));
-
-       switch (lock) {
-               case CAMEL_STORE_SUMMARY_SUMMARY_LOCK:
-                       g_rec_mutex_lock (&summary->priv->summary_lock);
-                       break;
-               default:
-                       g_return_if_reached ();
-       }
-}
-
-/**
- * camel_store_summary_unlock:
- * @summary: a #CamelStoreSummary
- * @lock: lock type to unlock
- *
- * Unlocks @summary's @lock, previously locked with camel_store_summary_lock().
- *
- * Since: 2.32
- **/
-void
-camel_store_summary_unlock (CamelStoreSummary *summary,
-                            CamelStoreSummaryLock lock)
-{
-       g_return_if_fail (CAMEL_IS_STORE_SUMMARY (summary));
-
-       switch (lock) {
-               case CAMEL_STORE_SUMMARY_SUMMARY_LOCK:
-                       g_rec_mutex_unlock (&summary->priv->summary_lock);
-                       break;
-               default:
-                       g_return_if_reached ();
-       }
-}
-
 static gboolean
 store_summary_save_timeout (gpointer user_data)
 {
@@ -927,14 +879,14 @@ store_summary_save_timeout (gpointer user_data)
 
        g_return_val_if_fail (summary != NULL, FALSE);
 
-       camel_store_summary_lock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_lock (&summary->priv->summary_lock);
 
        if (summary->priv->scheduled_save_id) {
                summary->priv->scheduled_save_id = 0;
                camel_store_summary_save (summary);
        }
 
-       camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_unlock (&summary->priv->summary_lock);
 
        return FALSE;
 }
@@ -966,10 +918,10 @@ store_summary_sync_folder_summary_count_cb (CamelFolderSummary *folder_summary,
        path = g_hash_table_lookup (summary->priv->folder_summaries, folder_summary);
        g_return_if_fail (path != NULL);
 
-       camel_store_summary_lock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_lock (&summary->priv->summary_lock);
        si = camel_store_summary_path (summary, path);
        if (!si) {
-               camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+               g_rec_mutex_unlock (&summary->priv->summary_lock);
                g_warning ("%s: Store summary %p doesn't hold path '%s'", G_STRFUNC, summary, path);
                return;
        }
@@ -994,7 +946,7 @@ store_summary_sync_folder_summary_count_cb (CamelFolderSummary *folder_summary,
 
        camel_store_summary_info_unref (summary, si);
 
-       camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_unlock (&summary->priv->summary_lock);
 }
 
 /**
@@ -1025,11 +977,11 @@ camel_store_summary_connect_folder_summary (CamelStoreSummary *summary,
        g_return_val_if_fail (path != NULL, FALSE);
        g_return_val_if_fail (CAMEL_IS_FOLDER_SUMMARY (folder_summary), FALSE);
 
-       camel_store_summary_lock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_lock (&summary->priv->summary_lock);
 
        si = camel_store_summary_path (summary, path);
        if (!si) {
-               camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+               g_rec_mutex_unlock (&summary->priv->summary_lock);
                g_warning ("%s: Store summary %p doesn't hold path '%s'", G_STRFUNC, summary, path);
                return FALSE;
        }
@@ -1037,7 +989,7 @@ camel_store_summary_connect_folder_summary (CamelStoreSummary *summary,
        camel_store_summary_info_unref (summary, si);
 
        if (g_hash_table_lookup (summary->priv->folder_summaries, folder_summary)) {
-               camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+               g_rec_mutex_unlock (&summary->priv->summary_lock);
                g_warning ("%s: Store summary %p already listens on folder summary %p", G_STRFUNC, summary, 
folder_summary);
                return FALSE;
        }
@@ -1046,7 +998,7 @@ camel_store_summary_connect_folder_summary (CamelStoreSummary *summary,
        g_signal_connect (folder_summary, "notify::saved-count", G_CALLBACK 
(store_summary_sync_folder_summary_count_cb), summary);
        g_signal_connect (folder_summary, "notify::unread-count", G_CALLBACK 
(store_summary_sync_folder_summary_count_cb), summary);
 
-       camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_unlock (&summary->priv->summary_lock);
 
        return TRUE;
 }
@@ -1071,10 +1023,10 @@ camel_store_summary_disconnect_folder_summary (CamelStoreSummary *summary,
        g_return_val_if_fail (CAMEL_IS_STORE_SUMMARY (summary), FALSE);
        g_return_val_if_fail (CAMEL_IS_FOLDER_SUMMARY (folder_summary), FALSE);
 
-       camel_store_summary_lock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_lock (&summary->priv->summary_lock);
 
        if (!g_hash_table_lookup (summary->priv->folder_summaries, folder_summary)) {
-               camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+               g_rec_mutex_unlock (&summary->priv->summary_lock);
                g_warning ("%s: Store summary %p is not connected to folder summary %p", G_STRFUNC, summary, 
folder_summary);
                return FALSE;
        }
@@ -1089,7 +1041,7 @@ camel_store_summary_disconnect_folder_summary (CamelStoreSummary *summary,
 
        camel_store_summary_save (summary);
 
-       camel_store_summary_unlock (summary, CAMEL_STORE_SUMMARY_SUMMARY_LOCK);
+       g_rec_mutex_unlock (&summary->priv->summary_lock);
 
        return TRUE;
 }
diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h
index 384501e..72a3b12 100644
--- a/camel/camel-store-summary.h
+++ b/camel/camel-store-summary.h
@@ -80,15 +80,6 @@ typedef enum _CamelStoreSummaryFlags {
        CAMEL_STORE_SUMMARY_DIRTY = 1 << 0,
 } CamelStoreSummaryFlags;
 
-/**
- * CamelStoreSummaryLock:
- *
- * Since: 2.32
- **/
-typedef enum {
-       CAMEL_STORE_SUMMARY_SUMMARY_LOCK,
-} CamelStoreSummaryLock;
-
 struct _CamelStoreSummary {
        CamelObject parent;
        CamelStoreSummaryPrivate *priv;
@@ -201,11 +192,6 @@ const gchar *      camel_store_info_path           (CamelStoreSummary *summary,
 const gchar *  camel_store_info_name           (CamelStoreSummary *summary,
                                                 CamelStoreInfo *info);
 
-void           camel_store_summary_lock        (CamelStoreSummary *summary,
-                                                CamelStoreSummaryLock lock);
-void           camel_store_summary_unlock      (CamelStoreSummary *summary,
-                                                CamelStoreSummaryLock lock);
-
 gboolean       camel_store_summary_connect_folder_summary
                                                (CamelStoreSummary *summary,
                                                 const gchar *path,
diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index 3a2ea4c..7c2893d 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -2602,9 +2602,6 @@ camel_store_summary_array_free
 camel_store_info_set_string
 camel_store_info_path
 camel_store_info_name
-CamelStoreSummaryLock
-camel_store_summary_lock
-camel_store_summary_unlock
 camel_store_summary_connect_folder_summary
 camel_store_summary_disconnect_folder_summary
 <SUBSECTION Standard>