[evolution-data-server/openismus-work-3-8: 20/43] EBookClientCursor: Changed for EDataBookCursor API change (cancellables)

[Tristan Van Berkom <tvb src gnome org>]

commit 2495a56eb9220e9e406db3d81dd88e0df3a8fa51
Author: Tristan Van Berkom <tristanvb openismus com>
Date:   Fri Nov 29 21:30:13 2013 +0900

    EBookClientCursor: Changed for EDataBookCursor API change (cancellables)

 addressbook/libebook/e-book-client-cursor.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/addressbook/libebook/e-book-client-cursor.c b/addressbook/libebook/e-book-client-cursor.c
index 0fa605f..06d9656 100644
--- a/addressbook/libebook/e-book-client-cursor.c
+++ b/addressbook/libebook/e-book-client-cursor.c
@@ -1415,7 +1415,7 @@ book_client_cursor_set_direct_cursor (EBookClientCursor *cursor,
                        /* Load initial locale */
                        if (priv->direct_cursor &&
                            !e_data_book_cursor_load_locale (priv->direct_cursor,
-                                                            &freeme, &error)) {
+                                                            &freeme, NULL, &error)) {
                                g_warning ("Error loading locale in direct read access cursor: %s",
                                           error->message);
                                g_clear_error (&error);
@@ -1476,7 +1476,7 @@ book_client_cursor_set_locale (EBookClientCursor *cursor,
         * explicitly load the new locale for DRA cursors.
         */
        if (priv->direct_cursor &&
-           !e_data_book_cursor_load_locale (priv->direct_cursor, NULL, &error)) {
+           !e_data_book_cursor_load_locale (priv->direct_cursor, NULL, NULL, &error)) {
                g_warning ("Error loading locale in direct read access cursor: %s",
                           error->message);
                g_clear_error (&error);
@@ -1508,7 +1508,7 @@ book_client_cursor_set_revision (EBookClientCursor    *cursor,
                if (priv->direct_cursor) {
                        GError *error = NULL;
 
-                       if (!e_data_book_cursor_recalculate (priv->direct_cursor, &error)) {
+                       if (!e_data_book_cursor_recalculate (priv->direct_cursor, NULL, &error)) {
                                g_warning ("Error calcualting cursor position: %s", error->message);
                        } else {
                                g_object_freeze_notify (G_OBJECT (cursor));
@@ -1852,7 +1852,7 @@ set_sexp_sync_internal (EBookClientCursor   *cursor,
        if (priv->direct_cursor) {
 
                if (!e_data_book_cursor_set_sexp (priv->direct_cursor,
-                                                 sexp, error))
+                                                 sexp, cancellable, error))
                        return FALSE;
 
                *new_total = e_data_book_cursor_get_total (priv->direct_cursor);
@@ -1956,6 +1956,7 @@ step_sync_internal (EBookClientCursor   *cursor,
                                                     origin,
                                                     count,
                                                     &results,
+                                                    cancellable,
                                                     error);
                if (n_results < 0)
                        return n_results;
@@ -2086,6 +2087,7 @@ set_alphabetic_index_sync_internal (EBookClientCursor   *cursor,
                if (!e_data_book_cursor_set_alphabetic_index (priv->direct_cursor,
                                                              index,
                                                              locale,
+                                                             cancellable,
                                                              error))
                        return FALSE;