[evolution-data-server] CamelSession: Remove camel_session_lock/unlock().



commit af21580ccd330fa289dd235fac87ff5f8b88fc39
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Aug 12 08:08:05 2012 -0400

    CamelSession: Remove camel_session_lock/unlock().
    
    Because exposing mutexes in a public API is horrible.

 camel/camel-session.c                   |   62 -------------------------------
 camel/camel-session.h                   |   14 -------
 docs/reference/camel/camel-sections.txt |    3 -
 3 files changed, 0 insertions(+), 79 deletions(-)
---
diff --git a/camel/camel-session.c b/camel/camel-session.c
index 1af8b75..09035cf 100644
--- a/camel/camel-session.c
+++ b/camel/camel-session.c
@@ -61,9 +61,6 @@ typedef struct _AsyncContext AsyncContext;
 typedef struct _JobData JobData;
 
 struct _CamelSessionPrivate {
-	GMutex *lock;		/* for locking everything basically */
-	GMutex *thread_lock;	/* locking threads */
-
 	gchar *user_data_dir;
 	gchar *user_cache_dir;
 
@@ -368,9 +365,6 @@ session_finalize (GObject *object)
 	if (priv->main_context != NULL)
 		g_main_context_unref (priv->main_context);
 
-	g_mutex_free (priv->lock);
-	g_mutex_free (priv->thread_lock);
-
 	g_mutex_free (priv->services_lock);
 
 	if (priv->junk_headers) {
@@ -865,8 +859,6 @@ camel_session_init (CamelSession *session)
 
 	session->priv = CAMEL_SESSION_GET_PRIVATE (session);
 
-	session->priv->lock = g_mutex_new ();
-	session->priv->thread_lock = g_mutex_new ();
 	session->priv->services = services;
 	session->priv->services_lock = g_mutex_new ();
 	session->priv->junk_headers = NULL;
@@ -1680,60 +1672,6 @@ camel_session_get_junk_headers (CamelSession *session)
 }
 
 /**
- * camel_session_lock:
- * @session: a #CamelSession
- * @lock: lock type to lock
- *
- * Locks @session's @lock. Unlock it with camel_session_unlock().
- *
- * Since: 2.32
- **/
-void
-camel_session_lock (CamelSession *session,
-                    CamelSessionLock lock)
-{
-	g_return_if_fail (CAMEL_IS_SESSION (session));
-
-	switch (lock) {
-		case CAMEL_SESSION_SESSION_LOCK:
-			g_mutex_lock (session->priv->lock);
-			break;
-		case CAMEL_SESSION_THREAD_LOCK:
-			g_mutex_lock (session->priv->thread_lock);
-			break;
-		default:
-			g_return_if_reached ();
-	}
-}
-
-/**
- * camel_session_unlock:
- * @session: a #CamelSession
- * @lock: lock type to unlock
- *
- * Unlocks @session's @lock, previously locked with camel_session_lock().
- *
- * Since: 2.32
- **/
-void
-camel_session_unlock (CamelSession *session,
-                      CamelSessionLock lock)
-{
-	g_return_if_fail (CAMEL_IS_SESSION (session));
-
-	switch (lock) {
-		case CAMEL_SESSION_SESSION_LOCK:
-			g_mutex_unlock (session->priv->lock);
-			break;
-		case CAMEL_SESSION_THREAD_LOCK:
-			g_mutex_unlock (session->priv->thread_lock);
-			break;
-		default:
-			g_return_if_reached ();
-	}
-}
-
-/**
  * camel_session_get_socks_proxy:
  * @session: A #CamelSession
  * @for_host: Host name to which the connection will be requested
diff --git a/camel/camel-session.h b/camel/camel-session.h
index 80deb37..c1fd5cb 100644
--- a/camel/camel-session.h
+++ b/camel/camel-session.h
@@ -69,16 +69,6 @@ enum {
 	CAMEL_SESSION_PASSPHRASE = 1 << 4
 };
 
-/**
- * CamelSessionLock:
- *
- * Since: 2.32
- **/
-typedef enum {
-	CAMEL_SESSION_SESSION_LOCK,
-	CAMEL_SESSION_THREAD_LOCK
-} CamelSessionLock;
-
 struct _CamelSession {
 	CamelObject parent;
 	CamelSessionPrivate *priv;
@@ -259,10 +249,6 @@ void		camel_session_set_junk_headers	(CamelSession *session,
 						 gint len);
 gboolean	camel_session_lookup_addressbook (CamelSession *session,
 						 const gchar *name);
-void		camel_session_lock		(CamelSession *session,
-						 CamelSessionLock lock);
-void		camel_session_unlock		(CamelSession *session,
-						 CamelSessionLock lock);
 
 gboolean	camel_session_authenticate_sync	(CamelSession *session,
 						 CamelService *service,
diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index f4bd7fc..3eda039 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -2318,9 +2318,6 @@ camel_session_set_network_available
 camel_session_get_junk_headers
 camel_session_set_junk_headers
 camel_session_lookup_addressbook
-CamelSessionLock
-camel_session_lock
-camel_session_unlock
 camel_session_authenticate_sync
 camel_session_authenticate
 camel_session_authenticate_finish



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]