Add camel_service_ref_session().

Replaces camel_service_get_session().

CamelService now uses a GWeakRef instead of a weak pointer.

diff --git a/camel/camel-service.c b/camel/camel-service.c
index 17f7410..845a06d 100644 (file)
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -55,7 +55,7 @@ typedef struct _AsyncContext AsyncContext;
 typedef struct _ConnectionOp ConnectionOp;
 
 struct _CamelServicePrivate {
-       gpointer session;  /* weak pointer */
+       GWeakRef session;
 
        CamelSettings *settings;
        GMutex settings_lock;
@@ -517,12 +517,8 @@ service_set_session (CamelService *service,
                      CamelSession *session)
 {
        g_return_if_fail (CAMEL_IS_SESSION (session));
-       g_return_if_fail (service->priv->session == NULL);
 
-       service->priv->session = session;
-
-       g_object_add_weak_pointer (
-               G_OBJECT (session), &service->priv->session);
+       g_weak_ref_set (&service->priv->session, session);
 }
 
 static void
@@ -642,11 +638,7 @@ service_dispose (GObject *object)
 
        priv = CAMEL_SERVICE_GET_PRIVATE (object);
 
-       if (priv->session != NULL) {
-               g_object_remove_weak_pointer (
-                       G_OBJECT (priv->session), &priv->session);
-               priv->session = NULL;
-       }
+       g_weak_ref_set (&priv->session, NULL);
 
        if (priv->settings != NULL) {
                g_object_unref (priv->settings);
@@ -1442,19 +1434,55 @@ camel_service_get_provider (CamelService *service)
 }
 
 /**
+ * camel_service_ref_session:
+ * @service: a #CamelService
+ *
+ * Returns the #CamelSession associated with the service.
+ *
+ * The returned #CamelSession is referenced for thread-safety.  Unreference
+ * the #CamelSession with g_object_unref() when finished with it.
+ *
+ * Returns: the #CamelSession
+ *
+ * Since: 3.8
+ **/
+CamelSession *
+camel_service_ref_session (CamelService *service)
+{
+       g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);
+
+       return g_weak_ref_get (&service->priv->session);
+}
+
+/**
  * camel_service_get_session:
  * @service: a #CamelService
  *
- * Gets the #CamelSession associated with the service.
+ * Returns the #CamelSession associated with the service.
+ *
+ * Note this function is not thread-safe.  The returned #CamelSession could
+ * be finalized by another thread while the caller is still using it.
  *
  * Returns: the #CamelSession
+ *
+ * Deprecated: 3.8: Use camel_service_ref_session() instead.
  **/
 CamelSession *
 camel_service_get_session (CamelService *service)
 {
+       CamelSession *session;
+
        g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);
 
-       return CAMEL_SESSION (service->priv->session);
+       session = camel_service_ref_session (service);
+
+       /* XXX Drop the CamelSession reference for backward-compatibility.
+        *     This is risky.  Without a reference, the CamelSession could
+        *     be finalized while the caller is still using it. */
+       if (session != NULL)
+               g_object_unref (session);
+
+       return session;
 }
 
 /**

diff --git a/camel/camel-service.h b/camel/camel-service.h
index f3714aa..3923288 100644 (file)
--- a/camel/camel-service.h
+++ b/camel/camel-service.h
@@ -184,7 +184,7 @@ gchar *             camel_service_get_name          (CamelService *service,
                                                 gboolean brief);
 CamelProvider *        camel_service_get_provider      (CamelService *service);
 struct _CamelSession *
-               camel_service_get_session       (CamelService *service);
+               camel_service_ref_session       (CamelService *service);
 CamelSettings *        camel_service_ref_settings      (CamelService *service);
 void           camel_service_set_settings      (CamelService *service,
                                                 CamelSettings *settings);
@@ -244,6 +244,11 @@ GList *            camel_service_query_auth_types_finish
                                                 GAsyncResult *result,
                                                 GError **error);
 
+#ifndef CAMEL_DISABLE_DEPRECATED
+struct _CamelSession *
+               camel_service_get_session       (CamelService *service);
+#endif /* CAMEL_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
 #endif /* CAMEL_SERVICE_H */

diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index bc11ff9..2253f39 100644 (file)
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -2284,7 +2284,7 @@ camel_service_get_user_data_dir
 camel_service_get_user_cache_dir
 camel_service_get_name
 camel_service_get_provider
-camel_service_get_session
+camel_service_ref_session
 camel_service_ref_settings
 camel_service_set_settings
 camel_service_get_uid
@@ -2301,6 +2301,8 @@ camel_service_authenticate_finish
 camel_service_query_auth_types_sync
 camel_service_query_auth_types
 camel_service_query_auth_types_finish
+<SUBSECTION Deprecated>
+camel_service_get_session
 <SUBSECTION Standard>
 CAMEL_SERVICE
 CAMEL_IS_SERVICE