[evolution-data-server/evolution-data-server-3-12] [EBookBackendGoogle] Serialize group list update and cache update

[Milan Crha <mcrha src gnome org>]

commit 1f5926b67207a3e683e5b458b4be939cb5e8eaf5
Author: Milan Crha <mcrha redhat com>
Date:   Thu May 22 16:34:41 2014 +0200

    [EBookBackendGoogle] Serialize group list update and cache update
    
    The cache update requires system groups to be available, thus
    in some corner case, when get_groups() finished after get_new_contacts()
    the get_new_contacts() simply fails and no contacts are read.
    The serialization of the two updates ensures the system groups
    are available when needed.

 .../backends/google/e-book-backend-google.c        |   43 +++++++++++++++----
 1 files changed, 34 insertions(+), 9 deletions(-)
---
diff --git a/addressbook/backends/google/e-book-backend-google.c 
b/addressbook/backends/google/e-book-backend-google.c
index 31fb008..35ac14e 100644
--- a/addressbook/backends/google/e-book-backend-google.c
+++ b/addressbook/backends/google/e-book-backend-google.c
@@ -250,6 +250,9 @@ cache_add_contact (EBookBackend *backend,
        contact = e_contact_new_from_gdata_entry (entry, priv->groups_by_id, priv->system_groups_by_entry_id);
        g_rec_mutex_unlock (&priv->groups_lock);
 
+       if (!contact)
+               return NULL;
+
        e_contact_add_gdata_entry_xml (contact, entry);
        g_mutex_lock (&priv->cache_lock);
        e_book_backend_cache_add_contact (priv->cache, contact);
@@ -549,6 +552,9 @@ process_contact_finish (EBookBackend *backend,
        was_cached = cache_has_contact (backend, gdata_entry_get_id (entry));
        new_contact = cache_add_contact (backend, entry);
 
+       if (!new_contact)
+               return;
+
        if (was_cached == TRUE) {
                e_book_backend_notify_update (backend, new_contact);
        } else {
@@ -960,7 +966,21 @@ get_groups_cb (GDataService *service,
 }
 
 static void
-get_groups (EBookBackend *backend)
+get_groups_and_update_cache_cb (GDataService *service,
+                               GAsyncResult *result,
+                               EBookBackend *backend)
+{
+       g_object_ref (backend);
+
+       get_groups_cb (service, result, backend);
+       get_new_contacts (backend);
+
+       g_object_unref (backend);
+}
+
+static void
+get_groups (EBookBackend *backend,
+           gboolean and_update_cache)
 {
        EBookBackendGooglePrivate *priv;
        GDataQuery *query;
@@ -995,7 +1015,7 @@ get_groups (EBookBackend *backend)
                (GDataQueryProgressCallback) process_group,
                backend,
                (GDestroyNotify) NULL,
-               (GAsyncReadyCallback) get_groups_cb,
+               (GAsyncReadyCallback) (and_update_cache ? get_groups_and_update_cache_cb : get_groups_cb),
                backend);
 
        g_object_unref (cancellable);
@@ -1108,8 +1128,9 @@ refresh_local_cache_cb (ESource *source,
 
        g_debug ("Invoking cache refresh");
 
-       get_groups (backend);
-       get_new_contacts (backend);
+       /* The TRUE means the cache update will be run immediately
+          after groups are updated */
+       get_groups (backend, TRUE);
 }
 
 static void
@@ -1143,7 +1164,7 @@ cache_refresh_if_needed (EBookBackend *backend)
                g_rec_mutex_lock (&priv->groups_lock);
                if (g_hash_table_size (priv->system_groups_by_id) == 0) {
                        g_rec_mutex_unlock (&priv->groups_lock);
-                       get_groups (backend);
+                       get_groups (backend, FALSE);
                } else {
                        g_rec_mutex_unlock (&priv->groups_lock);
                }
@@ -1817,8 +1838,10 @@ book_backend_google_create_contacts_sync (EBookBackend *backend,
        }
 
        contact = cache_add_contact (backend, GDATA_ENTRY (new_contact));
-       g_queue_push_tail (out_contacts, g_object_ref (contact));
-       g_object_unref (contact);
+       if (contact) {
+               g_queue_push_tail (out_contacts, g_object_ref (contact));
+               g_object_unref (contact);
+       }
 
 exit:
        g_clear_object (&entry);
@@ -2031,8 +2054,10 @@ book_backend_google_modify_contacts_sync (EBookBackend *backend,
        }
 
        contact = cache_add_contact (backend, new_contact);
-       g_queue_push_tail (out_contacts, g_object_ref (contact));
-       g_object_unref (contact);
+       if (contact) {
+               g_queue_push_tail (out_contacts, g_object_ref (contact));
+               g_object_unref (contact);
+       }
 
 exit:
        g_clear_object (&entry);