[evolution-data-server/openismus-work-master: 4/8] Added e_book_client_get_revision().
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/openismus-work-master: 4/8] Added e_book_client_get_revision().
- Date: Wed, 3 Aug 2011 01:35:49 +0000 (UTC)
commit 62f4358860776ac379b044fe548db430d0e63b76
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Fri Jul 22 19:58:20 2011 -0400
Added e_book_client_get_revision().
Adds e_book_client_get_revision() async/sync api to access an
opaque revision string which will be NULL for a backend that
does not implement. Adds all the needed gdbus machinery and
implements a revision in the file backend.
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=652175
addressbook/backends/file/e-book-backend-file.c | 123 +++++++++++++++++++----
addressbook/libebook/e-book-client.c | 86 ++++++++++++++++
addressbook/libebook/e-book-client.h | 4 +
addressbook/libedata-book/e-book-backend.c | 26 +++++
addressbook/libedata-book/e-book-backend.h | 2 +
addressbook/libedata-book/e-data-book.c | 36 +++++++
addressbook/libedata-book/e-data-book.h | 1 +
addressbook/libegdbus/e-gdbus-book.c | 29 ++++++
addressbook/libegdbus/e-gdbus-book.h | 9 ++
9 files changed, 298 insertions(+), 18 deletions(-)
---
diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index 23b5ac4..c9b3cda 100644
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -61,6 +61,8 @@
#define E_BOOK_BACKEND_FILE_VERSION_NAME "PAS-DB-VERSION"
#define E_BOOK_BACKEND_FILE_VERSION "0.2"
+#define E_BOOK_BACKEND_FILE_REVISION_NAME "PAS-DB-REVISION"
+
#define PAS_ID_PREFIX "pas-id-"
#define SQLITEDB_EMAIL_ID "addressbook localbackend com"
@@ -68,6 +70,7 @@
#define SQLITEDB_FOLDER_NAME "folder"
+
#define EDB_ERROR(_code) e_data_book_create_error (E_DATA_BOOK_STATUS_ ## _code, NULL)
#define EDB_ERROR_EX(_code, _msg) e_data_book_create_error (E_DATA_BOOK_STATUS_ ## _code, _msg)
#define EDB_NOT_OPENED_ERROR EDB_ERROR(NOT_OPENED)
@@ -77,16 +80,11 @@ G_DEFINE_TYPE (EBookBackendFile, e_book_backend_file, E_TYPE_BOOK_BACKEND_SYNC)
struct _EBookBackendFilePrivate {
gchar *dirname;
gchar *filename;
+ gchar *revision;
DB *file_db;
DB_ENV *env;
EBookBackendSqliteDB *sqlitedb;
-
- /* for future use */
- gpointer reserved1;
- gpointer reserved2;
- gpointer reserved3;
- gpointer reserved4;
};
G_LOCK_DEFINE_STATIC (global_env);
@@ -163,9 +161,11 @@ build_sqlitedb (EBookBackendFilePrivate *bfpriv)
while (db_error == 0) {
- /* don't include the version in the list of cards */
- if (id_dbt.size != strlen (E_BOOK_BACKEND_FILE_VERSION_NAME) + 1
- || strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_VERSION_NAME)) {
+ /* don't include the version and revision in the list of cards */
+ if ((id_dbt.size != strlen (E_BOOK_BACKEND_FILE_VERSION_NAME) + 1 ||
+ strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_VERSION_NAME)) &&
+ (id_dbt.size != strlen (E_BOOK_BACKEND_FILE_REVISION_NAME) + 1 ||
+ strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_REVISION_NAME))) {
EContact *contact = create_contact (id_dbt.data, vcard_dbt.data);
contacts = g_slist_prepend (contacts, contact);
@@ -209,6 +209,68 @@ e_book_backend_file_create_unique_id (void)
return g_strdup_printf (PAS_ID_PREFIX "%08lX%08X", time(NULL), c++);
}
+
+static gchar *
+e_book_backend_new_revision (const gchar *current_revision)
+{
+ guint64 revision;
+
+ if (!current_revision)
+ return g_strdup ("0");
+
+ revision = g_ascii_strtoull (current_revision, NULL, 10);
+ revision++;
+
+ return g_strdup_printf ("%" G_GUINT64_FORMAT, revision);
+}
+
+/* For now just bump the revision and set it in the DB every
+ * time the revision bumps, this is the safest approach and
+ * its unclear so far if bumping the revision string for
+ * every DB modification is going to really be an overhead.
+ */
+static void
+e_book_backend_bump_revision (EBookBackendFile *bf)
+{
+ DB *db = bf->priv->file_db;
+ DBT revision_name_dbt, revision_dbt;
+ gint db_error;
+ gchar *tmp = bf->priv->revision;
+
+ bf->priv->revision = e_book_backend_new_revision (tmp);
+ g_free (tmp);
+
+ string_to_dbt (E_BOOK_BACKEND_FILE_REVISION_NAME, &revision_name_dbt);
+ string_to_dbt (bf->priv->revision, &revision_dbt);
+ db_error = db->put (db, NULL, &revision_name_dbt, &revision_dbt, 0);
+
+ if (db_error != 0)
+ g_warning (G_STRLOC ": db->put failed while bumping the revision string: %s",
+ db_strerror (db_error));
+}
+
+static void
+e_book_backend_file_load_revision (EBookBackendFile *bf)
+{
+ DB *db = bf->priv->file_db;
+ DBT version_name_dbt, version_dbt;
+ gint db_error;
+
+ string_to_dbt (E_BOOK_BACKEND_FILE_REVISION_NAME, &version_name_dbt);
+ memset (&version_dbt, 0, sizeof (version_dbt));
+ version_dbt.flags = DB_DBT_MALLOC;
+
+ db_error = db->get (db, NULL, &version_name_dbt, &version_dbt, 0);
+ if (db_error == 0) {
+ /* success */
+ bf->priv->revision = version_dbt.data;
+ }
+ else {
+ /* key was not in file */
+ bf->priv->revision = e_book_backend_new_revision (NULL);
+ }
+}
+
static void
set_revision (EContact *contact)
{
@@ -300,6 +362,8 @@ e_book_backend_file_create_contact (EBookBackendSync *backend,
g_warning ("Failed to add contact to summary: %s", error->message);
g_error_free (error);
}
+
+ e_book_backend_bump_revision (bf);
}
}
@@ -355,6 +419,8 @@ e_book_backend_file_remove_contacts (EBookBackendSync *backend,
}
*ids = removed_cards;
+
+ e_book_backend_bump_revision (bf);
}
static void
@@ -430,6 +496,8 @@ e_book_backend_file_modify_contact (EBookBackendSync *backend,
g_free (vcard_with_rev);
db_error_to_gerror (db_error, perror);
+
+ e_book_backend_bump_revision (bf);
}
static void
@@ -538,9 +606,11 @@ e_book_backend_file_get_contact_list (EBookBackendSync *backend,
while (db_error == 0) {
- /* don't include the version in the list of cards */
- if (id_dbt.size != strlen (E_BOOK_BACKEND_FILE_VERSION_NAME) + 1
- || strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_VERSION_NAME)) {
+ /* don't include the version or revision in the list of cards */
+ if ((id_dbt.size != strlen (E_BOOK_BACKEND_FILE_VERSION_NAME) + 1
+ || strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_VERSION_NAME)) &&
+ (id_dbt.size != strlen (E_BOOK_BACKEND_FILE_REVISION_NAME) + 1
+ || strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_REVISION_NAME))) {
if ((!search_needed) || (card_sexp != NULL && e_book_backend_sexp_match_vcard (card_sexp, vcard_dbt.data))) {
contact_list = g_slist_prepend (contact_list, vcard_dbt.data);
@@ -628,9 +698,11 @@ e_book_backend_file_get_contact_list_uids (EBookBackendSync *backend,
while (db_error == 0) {
- /* don't include the version in the list of cards */
- if (id_dbt.size != strlen (E_BOOK_BACKEND_FILE_VERSION_NAME) + 1
- || strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_VERSION_NAME)) {
+ /* don't include the version or revision in the list of cards */
+ if ((id_dbt.size != strlen (E_BOOK_BACKEND_FILE_VERSION_NAME) + 1
+ || strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_VERSION_NAME)) &&
+ (id_dbt.size != strlen (E_BOOK_BACKEND_FILE_REVISION_NAME) + 1
+ || strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_REVISION_NAME))) {
if ((!search_needed) || (card_sexp != NULL && e_book_backend_sexp_match_vcard (card_sexp, vcard_dbt.data))) {
uids = g_slist_prepend (uids, g_strdup (id_dbt.data));
@@ -790,7 +862,8 @@ book_view_thread (gpointer data)
break;
/* don't include the version in the list of cards */
- if (strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_VERSION_NAME)) {
+ if (strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_VERSION_NAME) &&
+ strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_REVISION_NAME)) {
notify_update_vcard (book_view, allcontacts,
id_dbt.data, vcard_dbt.data);
} else {
@@ -959,8 +1032,10 @@ e_book_backend_file_upgrade_db (EBookBackendFile *bf, gchar *old_version)
db_error = dbc->c_get (dbc, &id_dbt, &vcard_dbt, DB_FIRST);
while (db_error == 0) {
- if (id_dbt.size != strlen (E_BOOK_BACKEND_FILE_VERSION_NAME) + 1
- || strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_VERSION_NAME)) {
+ if ((id_dbt.size != strlen (E_BOOK_BACKEND_FILE_VERSION_NAME) + 1
+ || strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_VERSION_NAME)) &&
+ (id_dbt.size != strlen (E_BOOK_BACKEND_FILE_REVISION_NAME) + 1
+ || strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_REVISION_NAME))) {
EContact *contact;
contact = create_contact (id_dbt.data, vcard_dbt.data);
@@ -1294,6 +1369,8 @@ e_book_backend_file_open (EBookBackendSync *backend,
}
}
+ e_book_backend_file_load_revision (bf);
+
e_book_backend_notify_online (E_BOOK_BACKEND (backend), TRUE);
e_book_backend_notify_readonly (E_BOOK_BACKEND (backend), readonly);
e_book_backend_notify_opened (E_BOOK_BACKEND (backend), NULL /* Success */);
@@ -1423,6 +1500,14 @@ e_book_backend_file_sync (EBookBackend *backend)
}
}
+static void
+e_book_backend_file_get_revision (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable)
+{
+ EBookBackendFile *bf = E_BOOK_BACKEND_FILE (backend);
+
+ e_data_book_respond_get_revision (book, opid, NULL, bf->priv->revision);
+}
+
typedef struct {
EContact *contact;
EBookBackendFile *bf;
@@ -1510,6 +1595,7 @@ e_book_backend_file_finalize (GObject *object)
g_free (bf->priv->filename);
g_free (bf->priv->dirname);
+ g_free (bf->priv->revision);
g_free (bf->priv);
@@ -1575,6 +1661,7 @@ e_book_backend_file_class_init (EBookBackendFileClass *klass)
backend_class->stop_book_view = e_book_backend_file_stop_book_view;
backend_class->set_online = e_book_backend_file_set_online;
backend_class->sync = e_book_backend_file_sync;
+ backend_class->get_revision = e_book_backend_file_get_revision;
backend_class->notify_update = e_book_backend_file_notify_update;
sync_class->open_sync = e_book_backend_file_open;
diff --git a/addressbook/libebook/e-book-client.c b/addressbook/libebook/e-book-client.c
index a2fd03f..b038af1 100644
--- a/addressbook/libebook/e-book-client.c
+++ b/addressbook/libebook/e-book-client.c
@@ -2169,6 +2169,92 @@ e_book_client_get_view_sync (EBookClient *client, const gchar *sexp, EBookClient
return complete_get_view (client, res, view_path, view, error);
}
+
+
+
+
+
+
+
+
+
+/**
+ * e_book_client_get_revision:
+ * @client: an #EBookClient
+ * @cancellable: a #GCancellable; can be %NULL
+ * @callback: callback to call when a result is ready
+ * @user_data: user data for the @callback
+ *
+ * Query @client for an opaque revision string representing
+ * the current state of the addressbook. The call is finished
+ * by e_book_client_get_view_finish() from the @callback.
+ *
+ *
+ * Since: 3.2
+ **/
+void
+e_book_client_get_revision (EBookClient *client, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+{
+ e_client_proxy_call_void (E_CLIENT (client), cancellable, callback, user_data,
+ e_book_client_get_revision,
+ e_gdbus_book_call_get_revision,
+ NULL, NULL, e_gdbus_book_call_get_revision_finish, NULL, NULL);
+}
+
+/**
+ * e_book_client_get_revision_finish:
+ * @client: an #EBookClient
+ * @result: a #GAsyncResult
+ * @revision: (out) (transfer full): an opaque revision string if the backend supports it, otherwise %NULL.
+ * @error: (out): a #GError to set an error, if any
+ *
+ * Finishes previous call of e_book_client_get_revision().
+ * If the call is successful and the backend in use reports opaque
+ * revision strings, then the @revision is set to newly allocated opaque
+ * revision string which should be freed with g_free().
+ *
+ * Returns: %TRUE if successful, %FALSE otherwise.
+ *
+ * Since: 3.2
+ **/
+gboolean
+e_book_client_get_revision_finish (EBookClient *client, GAsyncResult *result, gchar **revision, GError **error)
+{
+ g_return_val_if_fail (revision != NULL, FALSE);
+
+ return e_client_proxy_call_finish_string (E_CLIENT (client), result, revision, error,
+ e_book_client_get_revision);
+}
+
+/**
+ * e_book_client_get_revision_sync:
+ * @client: an #EBookClient
+ * @revision: (out) (transfer full): a location to store an opaque revision string
+ * @cancellable: a #GCancellable; can be %NULL
+ * @error: (out): a #GError to set an error, if any
+ *
+ * Query @client for an opaque revision string representing
+ * the current state of the addressbook.
+ *
+ * Since: 3.2
+ **/
+gboolean
+e_book_client_get_revision_sync (EBookClient *client, gchar **revision, GCancellable *cancellable, GError **error)
+{
+ g_return_val_if_fail (client != NULL, FALSE);
+ g_return_val_if_fail (E_IS_BOOK_CLIENT (client), FALSE);
+ g_return_val_if_fail (client->priv != NULL, FALSE);
+ g_return_val_if_fail (revision != NULL, FALSE);
+
+ if (!client->priv->gdbus_book) {
+ set_proxy_gone_error (error);
+ return FALSE;
+ }
+
+ return e_client_proxy_call_sync_void__string (E_CLIENT (client), revision, cancellable, error,
+ e_gdbus_book_call_get_revision_sync);
+}
+
static GDBusProxy *
book_client_get_dbus_proxy (EClient *client)
{
diff --git a/addressbook/libebook/e-book-client.h b/addressbook/libebook/e-book-client.h
index 8c51203..25dcec0 100644
--- a/addressbook/libebook/e-book-client.h
+++ b/addressbook/libebook/e-book-client.h
@@ -127,6 +127,10 @@ void e_book_client_get_view (EBookClient *client, const gchar *sexp, GCancel
gboolean e_book_client_get_view_finish (EBookClient *client, GAsyncResult *result, EBookClientView **view, GError **error);
gboolean e_book_client_get_view_sync (EBookClient *client, const gchar *sexp, EBookClientView **view, GCancellable *cancellable, GError **error);
+void e_book_client_get_revision (EBookClient *client, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+gboolean e_book_client_get_revision_finish (EBookClient *client, GAsyncResult *result, gchar **revision, GError **error);
+gboolean e_book_client_get_revision_sync (EBookClient *client, gchar **revision, GCancellable *cancellable, GError **error);
+
G_END_DECLS
#endif /* E_BOOK_CLIENT_H */
diff --git a/addressbook/libedata-book/e-book-backend.c b/addressbook/libedata-book/e-book-backend.c
index 79505d3..2ff29c2 100644
--- a/addressbook/libedata-book/e-book-backend.c
+++ b/addressbook/libedata-book/e-book-backend.c
@@ -767,6 +767,32 @@ e_book_backend_remove_book_view (EBookBackend *backend,
g_mutex_unlock (backend->priv->views_mutex);
}
+
+/**
+ * e_book_backend_get_revision:
+ * @backend: an #EBookBackend
+ * @book: an #EDataBook
+ * @opid: the ID to use for this operation
+ *
+ * Executes a 'get revision' request specified by @opid on @book
+ * using @backend.
+ **/
+void
+e_book_backend_get_revision (EBookBackend *backend,
+ EDataBook *book,
+ guint32 opid,
+ GCancellable *cancellable)
+{
+ g_return_if_fail (E_IS_BOOK_BACKEND (backend));
+ g_return_if_fail (E_IS_DATA_BOOK (book));
+
+ if (E_BOOK_BACKEND_GET_CLASS (backend)->get_revision)
+ (* E_BOOK_BACKEND_GET_CLASS (backend)->get_revision) (backend, book, opid, cancellable);
+ else
+ /* If the backend does not implement, successfully return a NULL string */
+ e_data_book_respond_get_revision (book, opid, NULL, NULL);
+}
+
/**
* e_book_backend_add_client:
* @backend: An addressbook backend.
diff --git a/addressbook/libedata-book/e-book-backend.h b/addressbook/libedata-book/e-book-backend.h
index dbb35e6..d5a9c47 100644
--- a/addressbook/libedata-book/e-book-backend.h
+++ b/addressbook/libedata-book/e-book-backend.h
@@ -75,6 +75,7 @@ struct _EBookBackendClass {
void (* get_contact) (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, const gchar *id);
void (* get_contact_list) (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, const gchar *query);
void (* get_contact_list_uids) (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, const gchar *query);
+ void (* get_revision) (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable);
void (* start_book_view) (EBookBackend *backend, EDataBookView *book_view);
void (* stop_book_view) (EBookBackend *backend, EDataBookView *book_view);
@@ -116,6 +117,7 @@ void e_book_backend_modify_contact (EBookBackend *backend, EDataBook *book, gui
void e_book_backend_get_contact (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, const gchar *id);
void e_book_backend_get_contact_list (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, const gchar *query);
void e_book_backend_get_contact_list_uids (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, const gchar *query);
+void e_book_backend_get_revision (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable);
void e_book_backend_start_book_view (EBookBackend *backend, EDataBookView *view);
void e_book_backend_stop_book_view (EBookBackend *backend, EDataBookView *view);
diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c
index 5c44a06..608b9e2 100644
--- a/addressbook/libedata-book/e-data-book.c
+++ b/addressbook/libedata-book/e-data-book.c
@@ -59,6 +59,7 @@ typedef enum {
OP_GET_CONTACT,
OP_GET_CONTACTS,
OP_GET_CONTACTS_UIDS,
+ OP_GET_REVISION,
OP_AUTHENTICATE,
OP_ADD_CONTACT,
OP_REMOVE_CONTACTS,
@@ -158,6 +159,9 @@ operation_thread (gpointer data, gpointer user_data)
e_book_backend_get_contact_list_uids (backend, op->book, op->id, op->cancellable, op->d.query);
g_free (op->d.query);
break;
+ case OP_GET_REVISION:
+ e_book_backend_get_revision (backend, op->book, op->id, op->cancellable);
+ break;
case OP_MODIFY_CONTACT:
e_book_backend_modify_contact (backend, op->book, op->id, op->cancellable, op->d.vcard);
g_free (op->d.vcard);
@@ -592,6 +596,19 @@ impl_Book_get_contact_list_uids (EGdbusBook *object, GDBusMethodInvocation *invo
}
static gboolean
+impl_Book_get_revision (EGdbusBook *object, GDBusMethodInvocation *invocation, EDataBook *book)
+{
+ OperationData *op;
+
+ op = op_new (OP_GET_REVISION, book);
+
+ e_gdbus_book_complete_get_revision (book->priv->gdbus_object, invocation, op->id);
+ e_operation_pool_push (ops_pool, op);
+
+ return TRUE;
+}
+
+static gboolean
impl_Book_add_contact (EGdbusBook *object, GDBusMethodInvocation *invocation, const gchar *in_vcard, EDataBook *book)
{
OperationData *op;
@@ -922,6 +939,24 @@ e_data_book_respond_get_contact_list_uids (EDataBook *book, guint32 opid, GError
}
void
+e_data_book_respond_get_revision (EDataBook *book, guint32 opid, GError *error, const gchar *revision)
+{
+ gchar *gdbus_revision = NULL;
+
+ op_complete (book, opid);
+
+ /* Translators: This is prefix to a detailed error message */
+ g_prefix_error (&error, "%s", _("Cannot get revision of addressbook: "));
+
+ e_gdbus_book_emit_get_revision_done (book->priv->gdbus_object, opid, error, e_util_ensure_gdbus_string (revision, &gdbus_revision));
+
+ if (error)
+ g_error_free (error);
+
+ g_free (gdbus_revision);
+}
+
+void
e_data_book_respond_create (EDataBook *book, guint32 opid, GError *error, const EContact *contact)
{
gchar *gdbus_uid = NULL;
@@ -1104,6 +1139,7 @@ e_data_book_init (EDataBook *ebook)
g_signal_connect (gdbus_object, "handle-get-contact", G_CALLBACK (impl_Book_get_contact), ebook);
g_signal_connect (gdbus_object, "handle-get-contact-list", G_CALLBACK (impl_Book_get_contact_list), ebook);
g_signal_connect (gdbus_object, "handle-get-contact-list-uids", G_CALLBACK (impl_Book_get_contact_list_uids), ebook);
+ g_signal_connect (gdbus_object, "handle-get-revision", G_CALLBACK (impl_Book_get_revision), ebook);
g_signal_connect (gdbus_object, "handle-authenticate-user", G_CALLBACK (impl_Book_authenticate_user), ebook);
g_signal_connect (gdbus_object, "handle-add-contact", G_CALLBACK (impl_Book_add_contact), ebook);
g_signal_connect (gdbus_object, "handle-remove-contacts", G_CALLBACK (impl_Book_remove_contacts), ebook);
diff --git a/addressbook/libedata-book/e-data-book.h b/addressbook/libedata-book/e-data-book.h
index f875d5c..d52a639 100644
--- a/addressbook/libedata-book/e-data-book.h
+++ b/addressbook/libedata-book/e-data-book.h
@@ -143,6 +143,7 @@ void e_data_book_respond_modify (EDataBook *book, guint32 opid, GError *error
void e_data_book_respond_get_contact (EDataBook *book, guint32 opid, GError *error, const gchar *vcard);
void e_data_book_respond_get_contact_list (EDataBook *book, guint32 opid, GError *error, const GSList *cards);
void e_data_book_respond_get_contact_list_uids (EDataBook *book, guint32 opid, GError *error, const GSList *uids);
+void e_data_book_respond_get_revision (EDataBook *book, guint32 opid, GError *error, const gchar *revision);
void e_data_book_report_error (EDataBook *book, const gchar *message);
void e_data_book_report_readonly (EDataBook *book, gboolean readonly);
diff --git a/addressbook/libegdbus/e-gdbus-book.c b/addressbook/libegdbus/e-gdbus-book.c
index 1096692..c49efac 100644
--- a/addressbook/libegdbus/e-gdbus-book.c
+++ b/addressbook/libegdbus/e-gdbus-book.c
@@ -65,6 +65,8 @@ enum
__SET_BACKEND_PROPERTY_DONE_SIGNAL,
__GET_VIEW_METHOD,
__GET_VIEW_DONE_SIGNAL,
+ __GET_REVISION_METHOD,
+ __GET_REVISION_DONE_SIGNAL,
__AUTHENTICATE_USER_METHOD,
__CANCEL_OPERATION_METHOD,
__CANCEL_ALL_METHOD,
@@ -133,6 +135,7 @@ E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_VOID (GDBUS_BOOK_INTERFACE_NAME,
E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_STRING (GDBUS_BOOK_INTERFACE_NAME, get_backend_property)
E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_VOID (GDBUS_BOOK_INTERFACE_NAME, set_backend_property)
E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_STRING (GDBUS_BOOK_INTERFACE_NAME, get_view)
+E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_STRING (GDBUS_BOOK_INTERFACE_NAME, get_revision)
static void
e_gdbus_book_default_init (EGdbusBookIface *iface)
@@ -164,6 +167,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
E_INIT_GDBUS_METHOD_ASYNC_STRING__STRING(EGdbusBookIface, "get_backend_property", get_backend_property, __GET_BACKEND_PROPERTY_METHOD, __GET_BACKEND_PROPERTY_DONE_SIGNAL)
E_INIT_GDBUS_METHOD_ASYNC_STRV__VOID (EGdbusBookIface, "set_backend_property", set_backend_property, __SET_BACKEND_PROPERTY_METHOD, __SET_BACKEND_PROPERTY_DONE_SIGNAL)
E_INIT_GDBUS_METHOD_ASYNC_STRING__STRING(EGdbusBookIface, "get_view", get_view, __GET_VIEW_METHOD, __GET_VIEW_DONE_SIGNAL)
+ E_INIT_GDBUS_METHOD_ASYNC_VOID__STRING (EGdbusBookIface, "get_revision", get_revision, __GET_REVISION_METHOD, __GET_REVISION_DONE_SIGNAL)
E_INIT_GDBUS_METHOD_STRV (EGdbusBookIface, "authenticate_user", authenticate_user, __AUTHENTICATE_USER_METHOD)
E_INIT_GDBUS_METHOD_UINT (EGdbusBookIface, "cancel_operation", cancel_operation, __CANCEL_OPERATION_METHOD)
E_INIT_GDBUS_METHOD_VOID (EGdbusBookIface, "cancel_all", cancel_all, __CANCEL_ALL_METHOD)
@@ -425,6 +429,26 @@ e_gdbus_book_call_get_view_sync (GDBusProxy *proxy, const gchar *in_query, gchar
}
void
+e_gdbus_book_call_get_revision (GDBusProxy *proxy, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
+{
+ e_gdbus_proxy_call_void ("get_revision", e_gdbus_book_call_get_revision, E_GDBUS_ASYNC_OP_KEEPER (proxy), cancellable, callback, user_data);
+}
+
+gboolean
+e_gdbus_book_call_get_revision_finish (GDBusProxy *proxy, GAsyncResult *result, gchar **out_revision, GError **error)
+{
+ return e_gdbus_proxy_finish_call_string (E_GDBUS_ASYNC_OP_KEEPER (proxy), result, out_revision, error, e_gdbus_book_call_get_revision);
+}
+
+gboolean
+e_gdbus_book_call_get_revision_sync (GDBusProxy *proxy, gchar **out_revision, GCancellable *cancellable, GError **error)
+{
+ return e_gdbus_proxy_call_sync_void__string (proxy, out_revision, cancellable, error,
+ e_gdbus_book_call_get_revision,
+ e_gdbus_book_call_get_revision_finish);
+}
+
+void
e_gdbus_book_call_authenticate_user (GDBusProxy *proxy, const gchar * const *in_credentials, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data)
{
e_gdbus_proxy_method_call_strv ("authenticate_user", proxy, in_credentials, cancellable, callback, user_data);
@@ -522,6 +546,7 @@ DECLARE_EMIT_DONE_SIGNAL_0 (modify_contact, __MODIFY_CONTACT_DONE_SIGNAL)
DECLARE_EMIT_DONE_SIGNAL_1 (get_backend_property, __GET_BACKEND_PROPERTY_DONE_SIGNAL, const gchar *)
DECLARE_EMIT_DONE_SIGNAL_0 (set_backend_property, __SET_BACKEND_PROPERTY_DONE_SIGNAL)
DECLARE_EMIT_DONE_SIGNAL_1 (get_view, __GET_VIEW_DONE_SIGNAL, const gchar *)
+DECLARE_EMIT_DONE_SIGNAL_1 (get_revision, __GET_REVISION_DONE_SIGNAL, const gchar *)
void
e_gdbus_book_emit_backend_error (EGdbusBook *object, const gchar *arg_message)
@@ -581,6 +606,7 @@ E_DECLARE_GDBUS_ASYNC_METHOD_1 (book, modify_contact, vcard, "s")
E_DECLARE_GDBUS_ASYNC_METHOD_1_WITH_RETURN (book, get_backend_property, prop_name, "s", prop_value, "s")
E_DECLARE_GDBUS_ASYNC_METHOD_1 (book, set_backend_property, prop_name_value, "as")
E_DECLARE_GDBUS_ASYNC_METHOD_1_WITH_RETURN (book, get_view, query, "s", view, "s")
+E_DECLARE_GDBUS_ASYNC_METHOD_0_WITH_RETURN (book, get_revision, revision, "s")
E_DECLARE_GDBUS_SYNC_METHOD_1 (book, authenticate_user, credentials, "as")
E_DECLARE_GDBUS_SYNC_METHOD_1 (book, cancel_operation, opid, "u")
@@ -601,6 +627,7 @@ static const GDBusMethodInfo * const e_gdbus_book_method_info_pointers[] =
&E_DECLARED_GDBUS_METHOD_INFO_NAME (book, get_backend_property),
&E_DECLARED_GDBUS_METHOD_INFO_NAME (book, set_backend_property),
&E_DECLARED_GDBUS_METHOD_INFO_NAME (book, get_view),
+ &E_DECLARED_GDBUS_METHOD_INFO_NAME (book, get_revision),
&E_DECLARED_GDBUS_METHOD_INFO_NAME (book, authenticate_user),
&E_DECLARED_GDBUS_METHOD_INFO_NAME (book, cancel_operation),
&E_DECLARED_GDBUS_METHOD_INFO_NAME (book, cancel_all),
@@ -629,6 +656,7 @@ static const GDBusSignalInfo * const e_gdbus_book_signal_info_pointers[] =
&E_DECLARED_GDBUS_SIGNAL_INFO_NAME (book, get_backend_property_done),
&E_DECLARED_GDBUS_SIGNAL_INFO_NAME (book, set_backend_property_done),
&E_DECLARED_GDBUS_SIGNAL_INFO_NAME (book, get_view_done),
+ &E_DECLARED_GDBUS_SIGNAL_INFO_NAME (book, get_revision_done),
NULL
};
@@ -835,6 +863,7 @@ e_gdbus_book_proxy_init (EGdbusBookProxy *proxy)
E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_STRING (get_backend_property);
E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_VOID (set_backend_property);
E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_STRING (get_view);
+ E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_STRING (get_revision);
}
static void
diff --git a/addressbook/libegdbus/e-gdbus-book.h b/addressbook/libegdbus/e-gdbus-book.h
index aea23ef..1eacd47 100644
--- a/addressbook/libegdbus/e-gdbus-book.h
+++ b/addressbook/libegdbus/e-gdbus-book.h
@@ -156,6 +156,9 @@ struct _EGdbusBookIface
gboolean (*handle_get_view) (EGdbusBook *object, GDBusMethodInvocation *invocation, const gchar *in_query);
void (*get_view_done) (EGdbusBook *object, guint arg_opid, const GError *arg_error, gchar **out_view);
+ gboolean (*handle_get_revision) (EGdbusBook *object, GDBusMethodInvocation *invocation);
+ void (*get_revision_done) (EGdbusBook *object, guint arg_opid, const GError *arg_error, gchar **out_revision);
+
gboolean (*handle_authenticate_user) (EGdbusBook *object, GDBusMethodInvocation *invocation, const gchar * const *in_credentials);
gboolean (*handle_cancel_operation) (EGdbusBook *object, GDBusMethodInvocation *invocation, guint in_opid);
gboolean (*handle_cancel_all) (EGdbusBook *object, GDBusMethodInvocation *invocation);
@@ -216,6 +219,10 @@ void e_gdbus_book_call_get_view (GDBusProxy *proxy, const gchar *in_query, GCan
gboolean e_gdbus_book_call_get_view_finish (GDBusProxy *proxy, GAsyncResult *result, gchar **out_view_path, GError **error);
gboolean e_gdbus_book_call_get_view_sync (GDBusProxy *proxy, const gchar *in_query, gchar **out_view_path, GCancellable *cancellable, GError **error);
+void e_gdbus_book_call_get_revision (GDBusProxy *proxy, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
+gboolean e_gdbus_book_call_get_revision_finish (GDBusProxy *proxy, GAsyncResult *result, gchar **out_revision, GError **error);
+gboolean e_gdbus_book_call_get_revision_sync (GDBusProxy *proxy, gchar **out_revision, GCancellable *cancellable, GError **error);
+
void e_gdbus_book_call_authenticate_user (GDBusProxy *proxy, const gchar * const *in_credentials, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
gboolean e_gdbus_book_call_authenticate_user_finish (GDBusProxy *proxy, GAsyncResult *result, GError **error);
gboolean e_gdbus_book_call_authenticate_user_sync (GDBusProxy *proxy, const gchar * const *in_credentials, GCancellable *cancellable, GError **error);
@@ -245,6 +252,7 @@ gboolean e_gdbus_book_call_close_sync (GDBusProxy *proxy, GCancellable *cancella
#define e_gdbus_book_complete_get_backend_property e_gdbus_complete_async_method
#define e_gdbus_book_complete_set_backend_property e_gdbus_complete_async_method
#define e_gdbus_book_complete_get_view e_gdbus_complete_async_method
+#define e_gdbus_book_complete_get_revision e_gdbus_complete_async_method
#define e_gdbus_book_complete_authenticate_user e_gdbus_complete_sync_method_void
#define e_gdbus_book_complete_cancel_operation e_gdbus_complete_sync_method_void
#define e_gdbus_book_complete_cancel_all e_gdbus_complete_sync_method_void
@@ -262,6 +270,7 @@ void e_gdbus_book_emit_modify_contact_done (EGdbusBook *object, guint arg_opid,
void e_gdbus_book_emit_get_backend_property_done (EGdbusBook *object, guint arg_opid, const GError *arg_error, const gchar *out_prop_value);
void e_gdbus_book_emit_set_backend_property_done (EGdbusBook *object, guint arg_opid, const GError *arg_error);
void e_gdbus_book_emit_get_view_done (EGdbusBook *object, guint arg_opid, const GError *arg_error, const gchar *out_view);
+void e_gdbus_book_emit_get_revision_done (EGdbusBook *object, guint arg_opid, const GError *arg_error, const gchar *out_revision);
/* D-Bus Signal Emission Helpers */
void e_gdbus_book_emit_backend_error (EGdbusBook *object, const gchar *arg_message);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
