EDataBook: Changed for EBookBackend set_locale() API change
authorTristan Van Berkom <tristanvb@openismus.com>
Fri, 29 Nov 2013 12:27:15 +0000 (21:27 +0900)
committerTristan Van Berkom <tristanvb@openismus.com>
Fri, 29 Nov 2013 13:08:03 +0000 (22:08 +0900)
addressbook/libedata-book/e-data-book.c

index b466ba6..935b1f5 100644 (file)
@@ -1182,7 +1182,7 @@ data_book_handle_get_cursor_cb (EDBusAddressBook *interface,
        /*
         * Set the query, if any (no query is allowed)
         */
-       if (!e_data_book_cursor_set_sexp (cursor, in_query, &error)) {
+       if (!e_data_book_cursor_set_sexp (cursor, in_query, NULL, &error)) {
 
                e_book_backend_delete_cursor (backend, cursor, NULL);
                g_dbus_method_invocation_take_error (invocation, error);
@@ -1717,7 +1717,10 @@ data_book_locale_changed (GObject *object,
                locale = e_dbus_locale1_get_locale (locale_proxy);
                interpreted_locale = data_book_interpret_locale (locale);
 
-               e_book_backend_set_locale (backend, interpreted_locale);
+               /* XXX This needs work, the whole handling should be done
+                * by the singleton EDataBookFactory, and handle errors well
+                */
+               e_book_backend_set_locale (backend, interpreted_locale, NULL, NULL);
 
                e_dbus_address_book_set_locale (book->priv->dbus_interface, interpreted_locale);