[evolution-data-server] Remove CAMEL_FOLDER_SUMMARY_FILTER_LOCK.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Remove CAMEL_FOLDER_SUMMARY_FILTER_LOCK.
- Date: Mon, 23 Sep 2013 16:06:48 +0000 (UTC)
commit b8f70064cf279543634c795a4f6e7132f27de327
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Sep 16 10:38:36 2013 -0400
Remove CAMEL_FOLDER_SUMMARY_FILTER_LOCK.
This is a private mutex, don't expose it in the public API.
camel/camel-folder-summary.c | 14 ++++----------
camel/camel-folder-summary.h | 1 -
2 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 29725d5..bd62ec6 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -3046,7 +3046,7 @@ camel_folder_summary_info_new_from_parser (CamelFolderSummary *summary,
if (p->index)
summary_assign_uid (summary, info);
- camel_folder_summary_lock (summary, CAMEL_FOLDER_SUMMARY_FILTER_LOCK);
+ g_rec_mutex_lock (&summary->priv->filter_lock);
if (p->index) {
if (p->filter_index == NULL)
@@ -3066,7 +3066,7 @@ camel_folder_summary_info_new_from_parser (CamelFolderSummary *summary,
CAMEL_MIME_FILTER_INDEX (p->filter_index), NULL);
}
- camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_FILTER_LOCK);
+ g_rec_mutex_unlock (&summary->priv->filter_lock);
((CamelMessageInfoBase *) info)->size = camel_mime_parser_tell (mp) - start;
}
@@ -3100,7 +3100,7 @@ camel_folder_summary_info_new_from_message (CamelFolderSummary *summary,
if (p->index)
summary_assign_uid (summary, info);
- camel_folder_summary_lock (summary, CAMEL_FOLDER_SUMMARY_FILTER_LOCK);
+ g_rec_mutex_lock (&summary->priv->filter_lock);
if (p->index) {
if (p->filter_index == NULL)
@@ -3127,7 +3127,7 @@ camel_folder_summary_info_new_from_message (CamelFolderSummary *summary,
CAMEL_MIME_FILTER_INDEX (p->filter_index), NULL);
}
- camel_folder_summary_unlock (summary, CAMEL_FOLDER_SUMMARY_FILTER_LOCK);
+ g_rec_mutex_unlock (&summary->priv->filter_lock);
return info;
}
@@ -4792,9 +4792,6 @@ camel_folder_summary_lock (CamelFolderSummary *summary,
case CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK:
g_rec_mutex_lock (&summary->priv->summary_lock);
break;
- case CAMEL_FOLDER_SUMMARY_FILTER_LOCK:
- g_rec_mutex_lock (&summary->priv->filter_lock);
- break;
case CAMEL_FOLDER_SUMMARY_ALLOC_LOCK:
g_rec_mutex_lock (&summary->priv->alloc_lock);
break;
@@ -4822,9 +4819,6 @@ camel_folder_summary_unlock (CamelFolderSummary *summary,
case CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK:
g_rec_mutex_unlock (&summary->priv->summary_lock);
break;
- case CAMEL_FOLDER_SUMMARY_FILTER_LOCK:
- g_rec_mutex_unlock (&summary->priv->filter_lock);
- break;
case CAMEL_FOLDER_SUMMARY_ALLOC_LOCK:
g_rec_mutex_unlock (&summary->priv->alloc_lock);
break;
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index 073522a..7da389b 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -232,7 +232,6 @@ typedef enum {
**/
typedef enum _CamelFolderSummaryLock {
CAMEL_FOLDER_SUMMARY_SUMMARY_LOCK,
- CAMEL_FOLDER_SUMMARY_FILTER_LOCK,
CAMEL_FOLDER_SUMMARY_ALLOC_LOCK,
} CamelFolderSummaryLock;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]