[evolution-data-server/openismus-work-3-8] EBookClientCursor: Keep a strong reference to the client

[Tristan Van Berkom <tvb src gnome org>]

commit 76b7e7ef5f06e8b10dab71c8f25f0123fc353e9d
Author: Tristan Van Berkom <tristanvb openismus com>
Date:   Sat Nov 30 03:12:44 2013 +0900

    EBookClientCursor: Keep a strong reference to the client
    
    When finalizing a cursor, it is important to have access
    to the direct backend available so that it can be asked
    to delete the direct access cursor instance.
    
    For this reason EBookClientCursor must keep the EBookClient alive,
    EBookClient now exposes a hidden API (not in the header file)
    to allow the EBookClientCursor to ask the EBookClient to delete
    the cursor on the EBookClientCursor's behalf.
    
    Ugly, but works.
    
    Conflicts:
    
        addressbook/libebook/e-book-client.c

 addressbook/libebook/e-book-client-cursor.c |   46 ++++++++++++++++----------
 addressbook/libebook/e-book-client.c        |   28 ++++++++++++++++
 2 files changed, 56 insertions(+), 18 deletions(-)
---
diff --git a/addressbook/libebook/e-book-client-cursor.c b/addressbook/libebook/e-book-client-cursor.c
index f484615..2e5a0dc 100644
--- a/addressbook/libebook/e-book-client-cursor.c
+++ b/addressbook/libebook/e-book-client-cursor.c
@@ -617,10 +617,10 @@ struct _Notification {
 };
 
 struct _EBookClientCursorPrivate {
-       /* Weak reference to the EBookClient and
+       /* Strong reference to the EBookClient and
         * to the GMainContext in which notifications
         * should be delivered to the EBookClientCursor user */
-       GWeakRef      client;
+       EBookClient  *client;
        GMainContext *main_context;
        GMutex        main_context_lock;
 
@@ -975,9 +975,9 @@ book_client_cursor_dispose (GObject *object)
        EBookClientCursorPrivate *priv = cursor->priv;
        gint i;
 
+       book_client_cursor_set_direct_cursor (cursor, NULL);
        book_client_cursor_set_client (cursor, NULL);
        book_client_cursor_set_proxy (cursor, NULL);
-       book_client_cursor_set_direct_cursor (cursor, NULL);
        book_client_cursor_set_connection (cursor, NULL);
        book_client_cursor_set_context (cursor, NULL);
 
@@ -1164,31 +1164,29 @@ book_client_cursor_set_client (EBookClientCursor *cursor,
                               EBookClient *client)
 {
        EBookClientCursorPrivate *priv = cursor->priv;
-       EBookClient *current_client;
 
        g_return_if_fail (client == NULL || E_IS_BOOK_CLIENT (client));
 
-       current_client = e_book_client_cursor_ref_client (cursor);
-
        /* Clients can't really change, but we set up this
         * mutator style code just to manage the signal connections
         * we watch on the client, we need to disconnect them properly.
         */
-       if (current_client != client) {
+       if (priv->client != client) {
 
-               if (current_client) {
+               if (priv->client) {
 
                        /* Disconnect signals */
-                       g_signal_handler_disconnect (current_client, priv->revision_changed_id);
-                       g_signal_handler_disconnect (current_client, priv->locale_changed_id);
+                       g_signal_handler_disconnect (priv->client, priv->revision_changed_id);
+                       g_signal_handler_disconnect (priv->client, priv->locale_changed_id);
                        priv->revision_changed_id = 0;
                        priv->locale_changed_id = 0;
+                       g_object_unref (priv->client);
                }
 
                /* Set the new client */
-               g_weak_ref_set (&priv->client, client);
+               priv->client = client;
 
-               if (client) {
+               if (priv->client) {
                        gchar *revision = NULL;
 
                        /* Connect signals */
@@ -1206,19 +1204,18 @@ book_client_cursor_set_client (EBookClientCursor *cursor,
                                                       0);
 
                        /* Load initial locale & revision */
-                       book_client_cursor_set_locale (cursor, e_book_client_get_locale (client));
+                       book_client_cursor_set_locale (cursor, e_book_client_get_locale (priv->client));
 
                        /* This loads a cached D-Bus property, no D-Bus activity */
-                       e_client_get_backend_property_sync (E_CLIENT (client),
+                       e_client_get_backend_property_sync (E_CLIENT (priv->client),
                                                            CLIENT_BACKEND_PROPERTY_REVISION,
                                                            &revision, NULL, NULL);
                        book_client_cursor_set_revision (cursor, revision);
                        g_free (revision);
+
+                       g_object_ref (priv->client);
                }
        }
-
-       /* e_book_client_cursor_ref_client() gave us a ref */
-       g_clear_object (&current_client);
 }
 
 static void
@@ -1376,6 +1373,10 @@ book_client_cursor_context_is_current (EBookClientCursor *cursor)
        return is_current;
 }
 
+/* Secretly shared API */
+void book_client_delete_direct_cursor (EBookClient *client,
+                                      EDataBookCursor *cursor);
+
 static void
 book_client_cursor_set_direct_cursor (EBookClientCursor *cursor,
                                      EDataBookCursor   *direct_cursor)
@@ -1393,6 +1394,15 @@ book_client_cursor_set_direct_cursor (EBookClientCursor *cursor,
                        priv->dra_total_changed_id = 0;
                        priv->dra_position_changed_id = 0;
 
+                       /* Tell EBookClient to delete the cursor
+                        *
+                        * This should only happen in ->dispose()
+                        * before releasing our strong reference to the EBookClient
+                        */
+                       g_warn_if_fail (priv->client != NULL);
+                       book_client_delete_direct_cursor (priv->client,
+                                                         priv->direct_cursor);
+
                        g_object_unref (priv->direct_cursor);
                }
 
@@ -2159,7 +2169,7 @@ e_book_client_cursor_ref_client (EBookClientCursor *cursor)
 {
        g_return_val_if_fail (E_IS_BOOK_CLIENT_CURSOR (cursor), NULL);
 
-       return g_weak_ref_get (&cursor->priv->client);
+       return g_object_ref (cursor->priv->client);
 }
 
 /**
diff --git a/addressbook/libebook/e-book-client.c b/addressbook/libebook/e-book-client.c
index 7bd582e..d66edc1 100644
--- a/addressbook/libebook/e-book-client.c
+++ b/addressbook/libebook/e-book-client.c
@@ -3623,6 +3623,34 @@ sort_param_to_strv (gpointer param,
        return array;
 }
 
+/* This is ugly and should change yes, currently EBookClientCursor
+ * needs to keep a strong reference to the EBookClient to keep it alive
+ * long enough to ask the EBookClient to delete a direct cursor on
+ * the EBookClientCursor's behalf, otherwise direct cursors are leaked.
+ */
+void book_client_delete_direct_cursor (EBookClient *client,
+                                      EDataBookCursor *cursor);
+
+void
+book_client_delete_direct_cursor (EBookClient *client,
+                                 EDataBookCursor *cursor)
+{
+       EBookBackend *backend;
+
+       g_return_if_fail (E_IS_BOOK_CLIENT (client));
+       g_return_if_fail (E_IS_DATA_BOOK_CURSOR (cursor));
+
+       if (!client->priv->direct_book) {
+               g_warning ("Tried to delete a cursor in DRA mode but the direct backend is missing");
+               return;
+       }
+
+       backend = e_data_book_get_backend (client->priv->direct_book);
+       e_book_backend_delete_cursor (backend,
+                                     cursor, NULL);
+}
+
+
 static void
 book_client_get_cursor_in_dbus_thread (GSimpleAsyncResult *simple,
                                       GObject *source_object,