diff options
| author | Tristan Van Berkom <tristanvb@openismus.com> | 2013-11-29 21:23:34 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristanvb@openismus.com> | 2013-11-29 22:08:03 +0900 |
| commit | 3ad9edbc3021c9d207a3b83613a003d70e2d12d7 (patch) | |
| tree | d918d969258a7cf9600e1d0f378f6c6efc792f7d | |
| parent | 3145120c6666d2617cb02ffe45a317e8367cf502 (diff) | |
| download | evolution-data-server-3ad9edbc3021c9d207a3b83613a003d70e2d12d7.tar.gz | |
EBookBackend: e_book_backend_set_locale() now has GCancellable
| -rw-r--r-- | addressbook/libedata-book/e-book-backend.c | 19 | ||||
| -rw-r--r-- | addressbook/libedata-book/e-book-backend.h | 12 |
2 files changed, 22 insertions, 9 deletions
diff --git a/addressbook/libedata-book/e-book-backend.c b/addressbook/libedata-book/e-book-backend.c index ce5afc376..2e312c527 100644 --- a/addressbook/libedata-book/e-book-backend.c +++ b/addressbook/libedata-book/e-book-backend.c @@ -3288,25 +3288,34 @@ e_book_backend_sync (EBookBackend *backend) * e_book_backend_set_locale: * @backend: an #EBookbackend * @locale: the new locale for the addressbook + * @cancellable: optional #GCancellable object, or %NULL + * @error: return location for a #GError, or %NULL * * Notify the addressbook backend that the current locale has * changed, this is important for backends which support * ordered result lists which are locale sensitive. * + * Returns: %TRUE on success, %FALSE on failure + * * Since: 3.12 */ -void +gboolean e_book_backend_set_locale (EBookBackend *backend, - const gchar *locale) + const gchar *locale, + GCancellable *cancellable, + GError **error) { - g_return_if_fail (E_IS_BOOK_BACKEND (backend)); + g_return_val_if_fail (E_IS_BOOK_BACKEND (backend), FALSE); g_object_ref (backend); if (E_BOOK_BACKEND_GET_CLASS (backend)->set_locale) - (* E_BOOK_BACKEND_GET_CLASS (backend)->set_locale) (backend, locale); - + return (* E_BOOK_BACKEND_GET_CLASS (backend)->set_locale) (backend, locale, + cancellable, error); g_object_unref (backend); + + /* Backend does not support locales, just happily return */ + return TRUE; } /** diff --git a/addressbook/libedata-book/e-book-backend.h b/addressbook/libedata-book/e-book-backend.h index 43594cb1a..d3230b0da 100644 --- a/addressbook/libedata-book/e-book-backend.h +++ b/addressbook/libedata-book/e-book-backend.h @@ -218,8 +218,10 @@ struct _EBookBackendClass { void (*sync) (EBookBackend *backend); - void (*set_locale) (EBookBackend *backend, - const gchar *locale); + gboolean (*set_locale) (EBookBackend *backend, + const gchar *locale, + GCancellable *cancellable, + GError **error); gchar *(*dup_locale) (EBookBackend *backend); EDataBookCursor * (*create_cursor) (EBookBackend *backend, @@ -402,8 +404,10 @@ void e_book_backend_configure_direct (EBookBackend *backend, void e_book_backend_sync (EBookBackend *backend); -void e_book_backend_set_locale (EBookBackend *backend, - const gchar *locale); +gboolean e_book_backend_set_locale (EBookBackend *backend, + const gchar *locale, + GCancellable *cancellable, + GError **error); gchar *e_book_backend_dup_locale (EBookBackend *backend); EDataBookCursor * |