[evolution-data-server] Coding style and whitespace cleanups.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Coding style and whitespace cleanups.
- Date: Sun, 8 Dec 2013 19:19:39 +0000 (UTC)
commit e50d1da66cc4c5f2ecf37549159d74803a250465
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Dec 8 11:19:08 2013 -0500
Coding style and whitespace cleanups.
.../file/e-book-backend-file-migrate-bdb.c | 8 +-
addressbook/backends/file/e-book-backend-file.c | 324 ++--
.../backends/google/e-book-backend-google.c | 2 +-
addressbook/backends/ldap/e-book-backend-ldap.c | 4 +-
.../backends/webdav/e-book-backend-webdav.c | 47 +-
.../libebook-contacts/e-book-contacts-types.h | 4 +-
addressbook/libebook-contacts/e-contact.c | 82 +-
addressbook/libebook-contacts/e-contact.h | 18 +-
addressbook/libebook-contacts/e-name-western.c | 116 +-
.../e-source-backend-summary-setup.c | 12 +-
addressbook/libebook-contacts/e-vcard.c | 14 +-
addressbook/libebook/e-book-client-cursor.c | 554 +++---
addressbook/libebook/e-book-client-cursor.h | 117 +-
addressbook/libebook/e-book-client.c | 253 ++-
addressbook/libebook/e-book-client.h | 13 +-
addressbook/libebook/e-book.c | 7 +-
addressbook/libebook/e-destination.c | 20 +-
addressbook/libebook/e-error.h | 114 +-
addressbook/libedata-book/e-book-backend-sexp.c | 5 +-
.../libedata-book/e-book-backend-sqlitedb.c | 443 ++--
.../libedata-book/e-book-backend-sqlitedb.h | 2 +-
addressbook/libedata-book/e-book-backend-summary.c | 30 +-
addressbook/libedata-book/e-book-backend.c | 27 +-
addressbook/libedata-book/e-book-backend.h | 23 +-
addressbook/libedata-book/e-book-sqlite.c | 2479 ++++++++++----------
addressbook/libedata-book/e-book-sqlite.h | 109 +-
.../libedata-book/e-data-book-cursor-sqlite.c | 247 +-
.../libedata-book/e-data-book-cursor-sqlite.h | 1 -
addressbook/libedata-book/e-data-book-cursor.c | 307 ++--
addressbook/libedata-book/e-data-book-cursor.h | 1 -
addressbook/libedata-book/e-data-book-factory.c | 81 +-
addressbook/libedata-book/e-data-book-factory.h | 2 +-
addressbook/libedata-book/e-data-book.c | 92 +-
addressbook/libedata-book/e-data-book.h | 3 +-
calendar/backends/caldav/e-cal-backend-caldav.c | 108 +-
.../backends/contacts/e-cal-backend-contacts.c | 25 +-
calendar/backends/file/e-cal-backend-file.c | 30 +-
calendar/backends/http/e-cal-backend-http.c | 26 +-
calendar/backends/weather/e-cal-backend-weather.c | 20 +-
calendar/backends/weather/e-weather-source.c | 4 +-
calendar/libecal/e-cal-client-view.h | 2 +-
calendar/libecal/e-cal-client.c | 126 +-
calendar/libecal/e-cal-recur.c | 98 +-
calendar/libecal/e-cal-time-util.c | 20 +-
calendar/libecal/e-cal-types.h | 8 +-
calendar/libecal/e-cal-util.h | 10 +-
calendar/libedata-cal/e-cal-backend-sexp.c | 12 +-
calendar/libedata-cal/e-cal-backend-sync.c | 28 +-
calendar/libedata-cal/e-data-cal-view.c | 4 +-
camel/camel-block-file.h | 2 +-
camel/camel-charset-map-private.h | 4 +-
camel/camel-db.c | 24 +-
camel/camel-debug.c | 8 +-
camel/camel-enums.h | 136 +-
camel/camel-file-utils.c | 54 +-
camel/camel-filter-search.h | 6 +-
camel/camel-folder-search.c | 6 +-
camel/camel-folder-summary.c | 12 +-
camel/camel-folder-summary.h | 4 +-
camel/camel-folder-thread.h | 4 +-
camel/camel-gpg-context.c | 36 +-
camel/camel-lock.c | 1 -
camel/camel-mime-filter-gzip.c | 10 +-
camel/camel-mime-filter-tohtml.c | 2 +-
camel/camel-mime-parser.c | 40 +-
camel/camel-mime-utils.c | 18 +-
camel/camel-mime-utils.h | 14 +-
camel/camel-msgport.c | 2 +-
camel/camel-net-utils.c | 144 +-
camel/camel-partition-table.c | 8 +-
camel/camel-provider.h | 42 +-
camel/camel-sasl-ntlm.c | 28 +-
camel/camel-search-private.c | 16 +-
camel/camel-search-sql-sexp.c | 6 +-
camel/camel-service.c | 5 +-
camel/camel-session.c | 2 +-
camel/camel-store-summary.c | 2 +-
camel/camel-store.h | 4 +-
camel/camel-text-index.c | 5 +-
camel/camel-url-scanner.c | 16 +-
camel/camel-url.h | 4 +-
camel/camel-vee-summary.c | 2 +-
camel/providers/imapx/camel-imapx-server.c | 8 +-
camel/providers/imapx/camel-imapx-utils.c | 6 +-
camel/providers/imapx/camel-imapx-utils.h | 32 +-
camel/providers/local/camel-local-summary.c | 2 +-
camel/providers/local/camel-maildir-store.c | 2 +-
camel/providers/local/camel-mbox-summary.c | 7 +-
camel/providers/local/camel-mh-summary.c | 4 +-
camel/providers/nntp/camel-nntp-summary.c | 2 +-
camel/providers/pop3/camel-pop3-engine.h | 2 +-
camel/tests/message/test2.c | 2 +-
examples/cursor/cursor-data.c | 19 +-
examples/cursor/cursor-example.c | 107 +-
examples/cursor/cursor-example.h | 2 +-
examples/cursor/cursor-navigator.c | 63 +-
examples/cursor/cursor-navigator.h | 2 +-
examples/cursor/cursor-search.c | 67 +-
examples/cursor/cursor-search.h | 2 +-
examples/cursor/cursor-slot.c | 16 +-
examples/cursor/cursor-slot.h | 2 +-
examples/cursor/main.c | 5 +-
libebackend/e-authentication-mediator.c | 2 +-
libebackend/e-backend-enums.h | 4 +-
libebackend/e-sqlite3-vfs.c | 24 +-
libedataserver/e-client.c | 1 -
libedataserver/e-collator.c | 204 +-
libedataserver/e-data-server-util.c | 20 +-
libedataserver/e-gdbus-templates.h | 864 ++++----
libedataserver/e-list-iterator.c | 18 +-
libedataserver/e-list.c | 10 +-
libedataserver/e-proxy.c | 6 +-
libedataserver/e-source-enums.h | 10 +-
libedataserver/e-source-registry.c | 6 +-
libedataserver/e-time-utils.c | 86 +-
.../evolution-source-registry-migrate-sources.c | 4 +-
tests/book-migration/test-migration.c | 40 +-
tests/libebook-contacts/test-untyped-phones.c | 14 +-
.../libebook/client/test-book-client-add-contact.c | 2 +-
.../client/test-book-client-cursor-create.c | 118 +-
.../client/test-book-client-cursor-operations.c | 1257 ++++++-----
.../client/test-book-client-custom-summary.c | 23 +-
.../libebook/client/test-book-client-e164-param.c | 2 +-
.../client/test-book-client-get-contact-uids.c | 6 +-
.../libebook/client/test-book-client-get-contact.c | 6 +-
tests/libebook/client/test-book-client-get-view.c | 6 +-
.../client/test-book-client-modify-contact.c | 2 +-
.../client/test-book-client-photo-is-uri.c | 8 +-
.../client/test-book-client-preserve-uid.c | 4 +-
tests/libebook/client/test-book-client-refresh.c | 2 +-
.../test-book-client-remove-contact-by-uid.c | 2 +-
.../client/test-book-client-remove-contact.c | 6 +-
.../client/test-book-client-remove-contacts.c | 2 +-
.../client/test-book-client-revision-view.c | 6 +-
.../test-book-client-suppress-notifications.c | 6 +-
.../client/test-book-client-uid-only-view.c | 14 +-
.../client/test-book-client-view-operations.c | 14 +-
.../libebook/client/test-book-client-write-write.c | 8 +-
tests/libebook/test-ebook-commit-contact.c | 2 +-
.../libecal/client/test-cal-client-revision-view.c | 8 +-
tests/libedata-book/data-test-utils.c | 287 ++--
tests/libedata-book/data-test-utils.h | 3 -
tests/libedata-book/test-sqlite-create-cursor.c | 53 +-
tests/libedata-book/test-sqlite-cursor-calculate.c | 290 ++--
.../test-sqlite-cursor-change-locale.c | 15 +-
.../test-sqlite-cursor-move-by-de-DE.c | 25 +-
.../test-sqlite-cursor-move-by-en-US.c | 39 +-
.../test-sqlite-cursor-move-by-fr-CA.c | 26 +-
.../test-sqlite-cursor-move-by-posix.c | 25 +-
tests/libedata-book/test-sqlite-cursor-set-sexp.c | 29 +-
.../libedata-book/test-sqlite-cursor-set-target.c | 121 +-
tests/libedata-book/test-sqlite-get-contact.c | 20 +-
tests/libedataserver/e-collator-test.c | 23 +-
tests/test-server-utils/e-test-server-utils.c | 31 +-
tests/test-server-utils/test-fixture.c | 4 +-
155 files changed, 5698 insertions(+), 5211 deletions(-)
---
diff --git a/addressbook/backends/file/e-book-backend-file-migrate-bdb.c
b/addressbook/backends/file/e-book-backend-file-migrate-bdb.c
index 55d61c1..a145b5e 100644
--- a/addressbook/backends/file/e-book-backend-file-migrate-bdb.c
+++ b/addressbook/backends/file/e-book-backend-file-migrate-bdb.c
@@ -307,9 +307,9 @@ e_book_backend_file_maybe_upgrade_db (DB *db)
static gboolean
migrate_bdb_to_sqlite (EBookSqlite *sqlitedb,
- DB *db,
- GCancellable *cancellable,
- GError **error)
+ DB *db,
+ GCancellable *cancellable,
+ GError **error)
{
DBC *dbc;
DBT id_dbt, vcard_dbt;
@@ -395,7 +395,7 @@ gboolean
e_book_backend_file_migrate_bdb (EBookSqlite *sqlitedb,
const gchar *dirname,
const gchar *filename,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **error)
{
DB *db = NULL;
diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index 251c9fd..17ae990 100644
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -227,7 +227,7 @@ maybe_delete_unused_uris (EBookBackendFile *bf,
* old uris for those fields from old_contact to delete
*/
uri_photo = check_remove_uri_for_field (old_contact, new_contact, E_CONTACT_PHOTO);
- uri_logo = check_remove_uri_for_field (old_contact, new_contact, E_CONTACT_LOGO);
+ uri_logo = check_remove_uri_for_field (old_contact, new_contact, E_CONTACT_LOGO);
if (uri_photo) {
maybe_delete_uri (bf, uri_photo);
@@ -333,7 +333,7 @@ safe_name_for_photo (EBookBackendFile *bf,
do {
g_free (fullname);
- str = e_filename_mkdir_encoded (bf->priv->photo_dirname, name, NULL, i);
+ str = e_filename_mkdir_encoded (bf->priv->photo_dirname, name, NULL, i);
fullname = g_strdup_printf ("%s.%s", str, suffix);
g_free (str);
@@ -374,7 +374,7 @@ hard_link_photo (EBookBackendFile *bf,
do {
g_free (fullname);
- str = e_filename_mkdir_encoded (bf->priv->photo_dirname, name, NULL, i);
+ str = e_filename_mkdir_encoded (bf->priv->photo_dirname, name, NULL, i);
fullname = g_strdup_printf ("%s.%s", str, suffix);
g_free (str);
@@ -467,8 +467,8 @@ maybe_transform_vcard_field_for_photo (EBookBackendFile *bf,
status = STATUS_ERROR;
} else {
- new_photo = e_contact_photo_new ();
- new_photo->type = E_CONTACT_PHOTO_TYPE_URI;
+ new_photo = e_contact_photo_new ();
+ new_photo->type = E_CONTACT_PHOTO_TYPE_URI;
new_photo->data.uri = g_strdup (uri);
e_contact_set (contact, field, new_photo);
@@ -545,8 +545,8 @@ maybe_transform_vcard_field_for_photo (EBookBackendFile *bf,
status = STATUS_ERROR;
} else {
- new_photo = e_contact_photo_new ();
- new_photo->type = E_CONTACT_PHOTO_TYPE_URI;
+ new_photo = e_contact_photo_new ();
+ new_photo->type = E_CONTACT_PHOTO_TYPE_URI;
new_photo->data.uri = new_uri;
e_contact_set (contact, field, new_photo);
@@ -642,17 +642,18 @@ e_book_backend_file_new_revision (EBookBackendFile *bf)
*/
static gboolean
e_book_backend_file_bump_revision (EBookBackendFile *bf,
- GError **error)
+ GError **error)
{
GError *local_error = NULL;
gchar *new_revision;
gboolean success;
new_revision = e_book_backend_file_new_revision (bf);
- success = e_book_sqlite_set_key_value (bf->priv->sqlitedb,
- SQLITE_REVISION_KEY,
- new_revision,
- &local_error);
+ success = e_book_sqlite_set_key_value (
+ bf->priv->sqlitedb,
+ SQLITE_REVISION_KEY,
+ new_revision,
+ &local_error);
if (success) {
g_free (bf->priv->revision);
@@ -716,13 +717,12 @@ set_revision (EBookBackendFile *bf,
g_free (rev);
}
-
/****************************************************************
* Dealing with cursor updates *
****************************************************************/
static void
cursors_contact_added (EBookBackendFile *bf,
- EContact *contact)
+ EContact *contact)
{
GList *l;
@@ -735,7 +735,7 @@ cursors_contact_added (EBookBackendFile *bf,
static void
cursors_contact_removed (EBookBackendFile *bf,
- EContact *contact)
+ EContact *contact)
{
GList *l;
@@ -760,7 +760,7 @@ static gboolean
do_create (EBookBackendFile *bf,
const gchar * const *vcards,
GQueue *out_contacts,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **error)
{
PhotoModifiedStatus status = STATUS_NORMAL;
@@ -975,12 +975,13 @@ book_view_thread (gpointer data)
e_flag_set (closure->running);
g_rw_lock_reader_lock (&(bf->priv->lock));
- success = e_book_sqlite_search (bf->priv->sqlitedb,
- query,
- meta_contact,
- &summary_list,
- NULL, /* GCancellable */
- &local_error);
+ success = e_book_sqlite_search (
+ bf->priv->sqlitedb,
+ query,
+ meta_contact,
+ &summary_list,
+ NULL, /* GCancellable */
+ &local_error);
g_rw_lock_reader_unlock (&(bf->priv->lock));
if (!success) {
@@ -1126,9 +1127,10 @@ book_backend_file_open_sync (EBookBackend *backend,
g_rw_lock_writer_lock (&(bf->priv->lock));
if (!bf->priv->revision) {
e_book_backend_file_load_revision (bf);
- e_book_backend_notify_property_changed (E_BOOK_BACKEND (backend),
- BOOK_BACKEND_PROPERTY_REVISION,
- bf->priv->revision);
+ e_book_backend_notify_property_changed (
+ E_BOOK_BACKEND (backend),
+ BOOK_BACKEND_PROPERTY_REVISION,
+ bf->priv->revision);
}
g_rw_lock_writer_unlock (&(bf->priv->lock));
@@ -1162,18 +1164,24 @@ book_backend_file_create_contacts_sync (EBookBackend *backend,
success = e_book_backend_file_bump_revision (bf, error);
if (success)
- success = e_book_sqlite_unlock (bf->priv->sqlitedb,
- EBSQL_UNLOCK_COMMIT,
- error);
+ success = e_book_sqlite_unlock (
+ bf->priv->sqlitedb,
+ EBSQL_UNLOCK_COMMIT,
+ error);
else {
GError *local_error = NULL;
/* Rollback transaction */
- if (!e_book_sqlite_unlock (bf->priv->sqlitedb,
- EBSQL_UNLOCK_ROLLBACK,
- &local_error)) {
- g_warning ("Failed to rollback transaction after failing to add contacts: %s",
- local_error->message);
+ e_book_sqlite_unlock (
+ bf->priv->sqlitedb,
+ EBSQL_UNLOCK_ROLLBACK,
+ &local_error);
+
+ if (local_error != NULL) {
+ g_warning (
+ "Failed to rollback transaction "
+ "after failing to add contacts: %s",
+ local_error->message);
g_clear_error (&local_error);
}
}
@@ -1310,10 +1318,15 @@ book_backend_file_modify_contacts_sync (EBookBackend *backend,
}
/* Update summary as well */
- if (!e_book_sqlite_add_contacts (bf->priv->sqlitedb,
- slist, NULL, TRUE,
- cancellable, &local_error)) {
- g_warning ("Failed to modify contacts: %s", local_error->message);
+ e_book_sqlite_add_contacts (
+ bf->priv->sqlitedb,
+ slist, NULL, TRUE,
+ cancellable, &local_error);
+
+ if (local_error != NULL) {
+ g_warning (
+ "Failed to modify contacts: %s",
+ local_error->message);
g_propagate_error (error, local_error);
local_error = NULL;
@@ -1331,19 +1344,27 @@ book_backend_file_modify_contacts_sync (EBookBackend *backend,
/* Commit or rollback transaction */
if (status != STATUS_ERROR) {
+ gboolean success;
- if (!e_book_sqlite_unlock (bf->priv->sqlitedb,
- EBSQL_UNLOCK_COMMIT,
- error))
+ success = e_book_sqlite_unlock (
+ bf->priv->sqlitedb,
+ EBSQL_UNLOCK_COMMIT,
+ error);
+ if (!success)
status = STATUS_ERROR;
} else {
/* Rollback transaction */
- if (!e_book_sqlite_unlock (bf->priv->sqlitedb,
- EBSQL_UNLOCK_ROLLBACK,
- &local_error)) {
- g_warning ("Failed to rollback transaction after failing to modify contacts: %s",
- local_error->message);
+ e_book_sqlite_unlock (
+ bf->priv->sqlitedb,
+ EBSQL_UNLOCK_ROLLBACK,
+ &local_error);
+
+ if (local_error != NULL) {
+ g_warning (
+ "Failed to rollback transaction after "
+ "failing to modify contacts: %s",
+ local_error->message);
g_clear_error (&local_error);
}
}
@@ -1351,8 +1372,8 @@ book_backend_file_modify_contacts_sync (EBookBackend *backend,
if (status != STATUS_ERROR)
e_queue_transfer (&mod_contact_queue, out_contacts);
- /* Now that we've modified the contact(s), notify cursors of the changes
- */
+ /* Now that we've modified the contact(s),
+ * notify cursors of the changes. */
if (status != STATUS_ERROR) {
GList *l;
@@ -1417,7 +1438,7 @@ book_backend_file_remove_contacts_sync (EBookBackend *backend,
if (e_book_sqlite_get_contact (bf->priv->sqlitedb,
uids[ii], FALSE, &contact,
&local_error)) {
- removed_ids = g_slist_prepend (removed_ids, g_strdup (uids[ii]));
+ removed_ids = g_slist_prepend (removed_ids, g_strdup (uids[ii]));
removed_contacts = g_slist_prepend (removed_contacts, contact);
} else {
@@ -1463,8 +1484,9 @@ book_backend_file_remove_contacts_sync (EBookBackend *backend,
} else {
/* Rollback transaction */
if (!e_book_sqlite_unlock (bf->priv->sqlitedb, EBSQL_UNLOCK_ROLLBACK, &local_error)) {
- g_warning ("Failed to rollback transaction after failing to modify contacts: %s",
- local_error->message);
+ g_warning (
+ "Failed to rollback transaction after failing to modify contacts: %s",
+ local_error->message);
g_clear_error (&local_error);
}
}
@@ -1496,13 +1518,13 @@ book_backend_file_get_contact_sync (EBookBackend *backend,
GError *local_error = NULL;
g_rw_lock_reader_lock (&(bf->priv->lock));
- success = e_book_sqlite_get_contact (bf->priv->sqlitedb,
- uid, FALSE, &contact,
- &local_error);
+ success = e_book_sqlite_get_contact (
+ bf->priv->sqlitedb,
+ uid, FALSE, &contact,
+ &local_error);
g_rw_lock_reader_unlock (&(bf->priv->lock));
if (!success) {
-
if (g_error_matches (local_error,
E_BOOK_SQLITE_ERROR,
E_BOOK_SQLITE_ERROR_CONTACT_NOT_FOUND)) {
@@ -1513,7 +1535,6 @@ book_backend_file_get_contact_sync (EBookBackend *backend,
g_error_free (local_error);
} else
g_propagate_error (error, local_error);
-
}
return contact;
@@ -1535,21 +1556,29 @@ book_backend_file_get_contact_list_sync (EBookBackend *backend,
d (printf ("book_backend_file_get_contact_list_sync (%s)\n", query));
g_rw_lock_reader_lock (&(bf->priv->lock));
- if (!e_book_sqlite_lock (bf->priv->sqlitedb,
- EBSQL_LOCK_READ,
- cancellable, error)) {
+
+ success = e_book_sqlite_lock (
+ bf->priv->sqlitedb,
+ EBSQL_LOCK_READ,
+ cancellable, error);
+ if (!success) {
g_rw_lock_writer_unlock (&(bf->priv->lock));
return FALSE;
}
- success = e_book_sqlite_search (bf->priv->sqlitedb,
- query,
- FALSE,
- &summary_list,
- cancellable,
- &local_error);
- e_book_sqlite_unlock (bf->priv->sqlitedb,
- EBSQL_UNLOCK_NONE,
- success ? &local_error : NULL);
+
+ success = e_book_sqlite_search (
+ bf->priv->sqlitedb,
+ query,
+ FALSE,
+ &summary_list,
+ cancellable,
+ &local_error);
+
+ e_book_sqlite_unlock (
+ bf->priv->sqlitedb,
+ EBSQL_UNLOCK_NONE,
+ success ? &local_error : NULL);
+
g_rw_lock_reader_unlock (&(bf->priv->lock));
if (!success) {
@@ -1611,24 +1640,30 @@ book_backend_file_get_contact_list_uids_sync (EBookBackend *backend,
d (printf ("book_backend_file_get_contact_list_sync (%s)\n", query));
g_rw_lock_reader_lock (&(bf->priv->lock));
- if (!e_book_sqlite_lock (bf->priv->sqlitedb,
- EBSQL_LOCK_READ,
- cancellable, error)) {
+
+ success = e_book_sqlite_lock (
+ bf->priv->sqlitedb,
+ EBSQL_LOCK_READ,
+ cancellable, error);
+ if (!success) {
g_rw_lock_writer_unlock (&(bf->priv->lock));
return FALSE;
}
- success = e_book_sqlite_search_uids (bf->priv->sqlitedb,
- query,
- &uids,
- cancellable,
- &local_error);
- e_book_sqlite_unlock (bf->priv->sqlitedb,
- EBSQL_UNLOCK_NONE,
- success ? &local_error : NULL);
+
+ success = e_book_sqlite_search_uids (
+ bf->priv->sqlitedb,
+ query,
+ &uids,
+ cancellable,
+ &local_error);
+ e_book_sqlite_unlock (
+ bf->priv->sqlitedb,
+ EBSQL_UNLOCK_NONE,
+ success ? &local_error : NULL);
+
g_rw_lock_reader_unlock (&(bf->priv->lock));
if (!success) {
-
g_warn_if_fail (uids == NULL);
if (g_error_matches (local_error,
@@ -1641,8 +1676,8 @@ book_backend_file_get_contact_list_uids_sync (EBookBackend *backend,
g_error_free (local_error);
} else if (g_error_matches (local_error,
- E_BOOK_SQLITE_ERROR,
- E_BOOK_SQLITE_ERROR_INVALID_QUERY)) {
+ E_BOOK_SQLITE_ERROR,
+ E_BOOK_SQLITE_ERROR_INVALID_QUERY)) {
g_set_error (
error, E_CLIENT_ERROR,
E_CLIENT_ERROR_INVALID_QUERY,
@@ -1650,7 +1685,9 @@ book_backend_file_get_contact_list_uids_sync (EBookBackend *backend,
g_error_free (local_error);
} else {
- g_warning ("Failed to fetch contact ids: %s", local_error->message);
+ g_warning (
+ "Failed to fetch contact ids: %s",
+ local_error->message);
g_propagate_error (error, local_error);
}
}
@@ -1668,7 +1705,9 @@ static void
book_backend_file_start_view (EBookBackend *backend,
EDataBookView *book_view)
{
- FileBackendSearchClosure *closure = init_closure (book_view, E_BOOK_BACKEND_FILE (backend));
+ FileBackendSearchClosure *closure;
+
+ closure = init_closure (book_view, E_BOOK_BACKEND_FILE (backend));
d (printf ("starting book view thread\n"));
closure->thread = g_thread_new (NULL, book_view_thread, book_view);
@@ -1717,11 +1756,16 @@ book_backend_file_get_direct_book (EBookBackend *backend)
registry, source, GET_PATH_DB_DIR);
/* Support in-tree testing / relocated modules */
- if (modules_env)
- backend_path = g_build_filename (modules_env, "libebookbackendfile.so", NULL);
- else
- backend_path = g_build_filename (BACKENDDIR, "libebookbackendfile.so", NULL);
- direct = e_data_book_direct_new (backend_path, "EBookBackendFileFactory", dirname);
+ if (modules_env) {
+ backend_path = g_build_filename (
+ modules_env, "libebookbackendfile.so", NULL);
+ } else {
+ backend_path = g_build_filename (
+ BACKENDDIR, "libebookbackendfile.so", NULL);
+ }
+
+ direct = e_data_book_direct_new (
+ backend_path, "EBookBackendFileFactory", dirname);
g_free (backend_path);
g_free (dirname);
@@ -1750,11 +1794,11 @@ book_backend_file_sync (EBookBackend *backend)
}
static void
-book_backend_file_vcard_changed (EbSqlChangeType change_type,
- const gchar *uid,
- const gchar *extra,
- const gchar *vcard,
- gpointer user_data)
+book_backend_file_vcard_changed (EbSqlChangeType change_type,
+ const gchar *uid,
+ const gchar *extra,
+ const gchar *vcard,
+ gpointer user_data)
{
EBookBackend *backend = E_BOOK_BACKEND (user_data);
EContact *contact;
@@ -1768,50 +1812,63 @@ book_backend_file_vcard_changed (EbSqlChangeType change_type,
static gboolean
book_backend_file_set_locale (EBookBackend *backend,
- const gchar *locale,
- GCancellable *cancellable,
- GError **error)
+ const gchar *locale,
+ GCancellable *cancellable,
+ GError **error)
{
EBookBackendFile *bf = E_BOOK_BACKEND_FILE (backend);
gboolean success;
GList *l;
g_rw_lock_writer_lock (&(bf->priv->lock));
- if (!e_book_sqlite_lock (bf->priv->sqlitedb,
- EBSQL_LOCK_WRITE,
- cancellable, error)) {
+
+ success = e_book_sqlite_lock (
+ bf->priv->sqlitedb,
+ EBSQL_LOCK_WRITE,
+ cancellable, error);
+ if (!success) {
g_rw_lock_writer_unlock (&(bf->priv->lock));
return FALSE;
}
- success = e_book_sqlite_set_locale (bf->priv->sqlitedb, locale,
- cancellable, error);
+ success = e_book_sqlite_set_locale (
+ bf->priv->sqlitedb, locale,
+ cancellable, error);
if (success)
success = e_book_backend_file_bump_revision (bf, error);
if (success) {
- success = e_book_sqlite_unlock (bf->priv->sqlitedb,
- EBSQL_UNLOCK_COMMIT,
- error);
+ success = e_book_sqlite_unlock (
+ bf->priv->sqlitedb,
+ EBSQL_UNLOCK_COMMIT,
+ error);
} else {
- GError *error = NULL;
+ GError *local_error = NULL;
/* Rollback transaction */
- if (!e_book_sqlite_unlock (bf->priv->sqlitedb, EBSQL_UNLOCK_ROLLBACK, &error)) {
- g_warning ("Failed to rollback transaction after failing to set locale: %s",
- error->message);
- g_clear_error (&error);
+ e_book_sqlite_unlock (
+ bf->priv->sqlitedb,
+ EBSQL_UNLOCK_ROLLBACK,
+ &local_error);
+
+ if (local_error != NULL) {
+ g_warning (
+ "Failed to rollback transaction "
+ "after failing to set locale: %s",
+ local_error->message);
+ g_clear_error (&local_error);
}
}
- /* This must be done outside the EBookSqlite lock, as it may try to acquire the lock as well
- */
+ /* This must be done outside the EBookSqlite lock,
+ * as it may try to acquire the lock as well. */
for (l = bf->priv->cursors; success && l; l = l->next) {
EDataBookCursor *cursor = l->data;
- success = e_data_book_cursor_load_locale (cursor, NULL, cancellable, error);
+ success = e_data_book_cursor_load_locale (
+ cursor, NULL, cancellable, error);
}
/* We set the new locale, now update our local variable */
@@ -1840,27 +1897,29 @@ book_backend_file_dup_locale (EBookBackend *backend)
static EDataBookCursor *
book_backend_file_create_cursor (EBookBackend *backend,
- EContactField *sort_fields,
- EBookCursorSortType *sort_types,
- guint n_fields,
- GError **error)
+ EContactField *sort_fields,
+ EBookCursorSortType *sort_types,
+ guint n_fields,
+ GError **error)
{
EBookBackendFile *bf = E_BOOK_BACKEND_FILE (backend);
- EDataBookCursor *cursor;
+ EDataBookCursor *cursor;
g_rw_lock_writer_lock (&(bf->priv->lock));
- cursor = e_data_book_cursor_sqlite_new (backend,
- bf->priv->sqlitedb,
- SQLITE_REVISION_KEY,
- sort_fields,
- sort_types,
- n_fields,
- error);
+ cursor = e_data_book_cursor_sqlite_new (
+ backend,
+ bf->priv->sqlitedb,
+ SQLITE_REVISION_KEY,
+ sort_fields,
+ sort_types,
+ n_fields,
+ error);
- if (cursor)
+ if (cursor != NULL) {
bf->priv->cursors =
g_list_prepend (bf->priv->cursors, cursor);
+ }
g_rw_lock_writer_unlock (&(bf->priv->lock));
@@ -1869,8 +1928,8 @@ book_backend_file_create_cursor (EBookBackend *backend,
static gboolean
book_backend_file_delete_cursor (EBookBackend *backend,
- EDataBookCursor *cursor,
- GError **error)
+ EDataBookCursor *cursor,
+ GError **error)
{
EBookBackendFile *bf = E_BOOK_BACKEND_FILE (backend);
GList *link;
@@ -1883,10 +1942,11 @@ book_backend_file_delete_cursor (EBookBackend *backend,
bf->priv->cursors = g_list_delete_link (bf->priv->cursors, link);
g_object_unref (cursor);
} else {
- g_set_error_literal (error,
- E_CLIENT_ERROR,
- E_CLIENT_ERROR_INVALID_ARG,
- _("Requested to delete an unrelated cursor"));
+ g_set_error_literal (
+ error,
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_INVALID_ARG,
+ _("Requested to delete an unrelated cursor"));
}
g_rw_lock_writer_unlock (&(bf->priv->lock));
@@ -1924,7 +1984,7 @@ book_backend_file_initable_init (GInitable *initable,
registry, source, GET_PATH_DB_DIR);
filename = g_build_filename (dirname, "addressbook.db", NULL);
- backup = g_build_filename (dirname, "addressbook.db.old", NULL);
+ backup = g_build_filename (dirname, "addressbook.db.old", NULL);
fullpath = g_build_filename (dirname, "contacts.db", NULL);
/* The old BDB exists, lets migrate that to sqlite right away. */
diff --git a/addressbook/backends/google/e-book-backend-google.c
b/addressbook/backends/google/e-book-backend-google.c
index 3769a63..d2079eb 100644
--- a/addressbook/backends/google/e-book-backend-google.c
+++ b/addressbook/backends/google/e-book-backend-google.c
@@ -2302,7 +2302,7 @@ e_book_backend_google_class_init (EBookBackendGoogleClass *class)
g_type_class_add_private (class, sizeof (EBookBackendGooglePrivate));
object_class = G_OBJECT_CLASS (class);
- object_class->dispose = book_backend_google_dispose;
+ object_class->dispose = book_backend_google_dispose;
object_class->finalize = book_backend_google_finalize;
backend_class = E_BOOK_BACKEND_CLASS (class);
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index adec34c..4ff1f17 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -1388,7 +1388,7 @@ build_mods_from_contacts (EBookBackendLDAP *bl,
continue;
}
if (((prop_info[i].prop_type & PROP_TYPE_COMPLEX) ||
- (prop_info[i].prop_type & PROP_TYPE_BINARY)) && is_list) {
+ (prop_info[i].prop_type & PROP_TYPE_BINARY)) && is_list) {
continue;
}
@@ -3916,7 +3916,7 @@ e_book_backend_ldap_build_query (EBookBackendLDAP *bl,
strings[1] = g_strdup_printf ("%s", bl->priv->ldap_search_filter);
strings[2] = data.list->data;
strings[3] = g_strdup (")");
- retval = g_strjoinv (" ", strings);
+ retval = g_strjoinv (" ", strings);
for (i = 0; i < 4; i++)
g_free (strings[i]);
g_free (strings);
diff --git a/addressbook/backends/webdav/e-book-backend-webdav.c
b/addressbook/backends/webdav/e-book-backend-webdav.c
index 24d62ff..e06377d 100644
--- a/addressbook/backends/webdav/e-book-backend-webdav.c
+++ b/addressbook/backends/webdav/e-book-backend-webdav.c
@@ -164,8 +164,8 @@ init_closure (EDataBookView *book_view,
{
WebdavBackendSearchClosure *closure = g_new (WebdavBackendSearchClosure, 1);
- closure->webdav = webdav;
- closure->thread = NULL;
+ closure->webdav = webdav;
+ closure->thread = NULL;
closure->running = e_flag_new ();
g_object_set_data_full (
@@ -336,7 +336,7 @@ upload_contact (EBookBackendWebdav *webdav,
message, "text/vcard", SOUP_MEMORY_TEMPORARY,
request, strlen (request));
- status = send_and_handle_ssl (webdav, message, cancellable);
+ status = send_and_handle_ssl (webdav, message, cancellable);
new_etag = soup_message_headers_get_list (message->response_headers, "ETag");
redir_uri = soup_message_headers_get_list (message->response_headers, "Location");
@@ -456,8 +456,8 @@ static response_element_t *
parse_response_tag (const parser_strings_t *strings,
xmlTextReaderPtr reader)
{
- xmlChar *href = NULL;
- xmlChar *etag = NULL;
+ xmlChar *href = NULL;
+ xmlChar *etag = NULL;
gint depth = xmlTextReaderDepth (reader);
response_element_t *element;
@@ -528,14 +528,13 @@ parse_propfind_response (xmlTextReaderPtr reader)
/* get internalized versions of some strings to avoid strcmp while
* parsing */
- strings.multistatus
- = xmlTextReaderConstString (reader, BAD_CAST "multistatus");
- strings.dav = xmlTextReaderConstString (reader, BAD_CAST "DAV:");
- strings.href = xmlTextReaderConstString (reader, BAD_CAST "href");
- strings.response = xmlTextReaderConstString (reader, BAD_CAST "response");
- strings.propstat = xmlTextReaderConstString (reader, BAD_CAST "propstat");
- strings.prop = xmlTextReaderConstString (reader, BAD_CAST "prop");
- strings.getetag = xmlTextReaderConstString (reader, BAD_CAST "getetag");
+ strings.multistatus = xmlTextReaderConstString (reader, BAD_CAST "multistatus");
+ strings.dav = xmlTextReaderConstString (reader, BAD_CAST "DAV:");
+ strings.href = xmlTextReaderConstString (reader, BAD_CAST "href");
+ strings.response = xmlTextReaderConstString (reader, BAD_CAST "response");
+ strings.propstat = xmlTextReaderConstString (reader, BAD_CAST "propstat");
+ strings.prop = xmlTextReaderConstString (reader, BAD_CAST "prop");
+ strings.getetag = xmlTextReaderConstString (reader, BAD_CAST "getetag");
while (xmlTextReaderRead (reader) == 1 && xmlTextReaderNodeType (reader) != XML_READER_TYPE_ELEMENT) {
}
@@ -564,7 +563,7 @@ parse_propfind_response (xmlTextReaderPtr reader)
continue;
element->next = elements;
- elements = element;
+ elements = element;
}
return elements;
@@ -575,7 +574,7 @@ send_propfind (EBookBackendWebdav *webdav,
GCancellable *cancellable)
{
SoupMessage *message;
- EBookBackendWebdavPrivate *priv = webdav->priv;
+ EBookBackendWebdavPrivate *priv = webdav->priv;
const gchar *request =
"<?xml version=\"1.0\" encoding=\"utf-8\"?>"
"<propfind xmlns=\"DAV:\"><prop><getetag/></prop></propfind>";
@@ -803,7 +802,7 @@ download_contacts (EBookBackendWebdav *webdav,
}
message = send_propfind (webdav, cancellable);
- status = message->status_code;
+ status = message->status_code;
if (status == 401 || status == 407) {
g_object_unref (message);
@@ -890,7 +889,7 @@ download_contacts (EBookBackendWebdav *webdav,
/* uri might be relative, construct complete one */
if (uri[0] == '/') {
SoupURI *soup_uri = soup_uri_new (priv->uri);
- soup_uri->path = g_strdup (uri);
+ soup_uri->path = g_strdup (uri);
complete_uri = soup_uri_to_string (soup_uri, FALSE);
soup_uri_free (soup_uri);
@@ -977,7 +976,7 @@ e_book_backend_webdav_start_view (EBookBackend *backend,
EDataBookView *book_view)
{
EBookBackendWebdav *webdav = E_BOOK_BACKEND_WEBDAV (backend);
- EBookBackendWebdavPrivate *priv = webdav->priv;
+ EBookBackendWebdavPrivate *priv = webdav->priv;
EBookBackendSExp *sexp;
const gchar *query;
GList *contacts;
@@ -1002,11 +1001,13 @@ e_book_backend_webdav_start_view (EBookBackend *backend,
e_data_book_view_notify_complete (book_view, NULL /* Success */);
if (e_backend_get_online (E_BACKEND (backend))) {
- WebdavBackendSearchClosure *closure
- = init_closure (book_view, E_BOOK_BACKEND_WEBDAV (backend));
+ WebdavBackendSearchClosure *closure;
- closure->thread
- = g_thread_new (NULL, book_view_thread, book_view);
+ closure = init_closure (
+ book_view, E_BOOK_BACKEND_WEBDAV (backend));
+
+ closure->thread = g_thread_new (
+ NULL, book_view_thread, book_view);
e_flag_wait (closure->running);
}
@@ -1044,7 +1045,7 @@ soup_authenticate (SoupSession *session,
gpointer data)
{
EBookBackendWebdav *webdav = data;
- EBookBackendWebdavPrivate *priv = webdav->priv;
+ EBookBackendWebdavPrivate *priv = webdav->priv;
if (retrying)
return;
diff --git a/addressbook/libebook-contacts/e-book-contacts-types.h
b/addressbook/libebook-contacts/e-book-contacts-types.h
index b8b66f1..7ee3b79 100644
--- a/addressbook/libebook-contacts/e-book-contacts-types.h
+++ b/addressbook/libebook-contacts/e-book-contacts-types.h
@@ -43,7 +43,7 @@ G_BEGIN_DECLS
* Since: 3.4
*/
typedef enum {
- E_BOOK_CLIENT_VIEW_FLAGS_NONE = 0,
+ E_BOOK_CLIENT_VIEW_FLAGS_NONE = 0,
E_BOOK_CLIENT_VIEW_FLAGS_NOTIFY_INITIAL = (1 << 0),
} EBookClientViewFlags;
@@ -193,7 +193,7 @@ typedef enum {
* Since: 3.12
*/
typedef enum {
- E_BOOK_CURSOR_STEP_MOVE = (1 << 0),
+ E_BOOK_CURSOR_STEP_MOVE = (1 << 0),
E_BOOK_CURSOR_STEP_FETCH = (1 << 1)
} EBookCursorStepFlags;
diff --git a/addressbook/libebook-contacts/e-contact.c b/addressbook/libebook-contacts/e-contact.c
index 1638de3..e8e95be 100644
--- a/addressbook/libebook-contacts/e-contact.c
+++ b/addressbook/libebook-contacts/e-contact.c
@@ -437,7 +437,7 @@ geo_getter (EContact *contact,
GList *p = e_vcard_attribute_get_values (attr);
EContactGeo *geo = g_new0 (EContactGeo, 1);
- geo->latitude = (p && p->data ? g_ascii_strtod (p->data, NULL) : 0); if (p) p = p->next;
+ geo->latitude = (p && p->data ? g_ascii_strtod (p->data, NULL) : 0); if (p) p = p->next;
geo->longitude = (p && p->data ? g_ascii_strtod (p->data, NULL) : 0);
return geo;
@@ -680,11 +680,11 @@ n_getter (EContact *contact,
if (attr) {
GList *p = e_vcard_attribute_get_values (attr);
- name->family = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
- name->given = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+ name->family = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+ name->given = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
name->additional = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
- name->prefixes = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
- name->suffixes = g_strdup (p && p->data ? p->data : "");
+ name->prefixes = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+ name->suffixes = g_strdup (p && p->data ? p->data : "");
}
new_attr = e_vcard_get_attribute (E_VCARD (contact), EVC_FN);
@@ -745,13 +745,13 @@ adr_getter (EContact *contact,
EContactAddress *addr = g_new0 (EContactAddress, 1);
addr->address_format = g_strdup ("");
- addr->po = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
- addr->ext = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
- addr->street = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+ addr->po = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+ addr->ext = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+ addr->street = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
addr->locality = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
- addr->region = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
- addr->code = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
- addr->country = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+ addr->region = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+ addr->code = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
+ addr->country = g_strdup (p && p->data ? p->data : ""); if (p) p = p->next;
return addr;
}
@@ -1393,8 +1393,8 @@ e_contact_field_type (EContactField field_id)
g_return_val_if_fail (field_id >= 1 && field_id < E_CONTACT_FIELD_LAST, G_TYPE_INVALID);
field_name = e_contact_field_name (field_id);
- class = g_type_class_ref (E_TYPE_CONTACT);
- pspec = g_object_class_find_property (G_OBJECT_CLASS (class), field_name);
+ class = g_type_class_ref (E_TYPE_CONTACT);
+ pspec = g_object_class_find_property (G_OBJECT_CLASS (class), field_name);
if (pspec)
type = G_PARAM_SPEC_VALUE_TYPE (pspec);
@@ -1898,11 +1898,11 @@ e_contact_name_from_string (const gchar *name_str)
name = e_contact_name_new ();
western = e_name_western_parse (name_str);
- name->prefixes = g_strdup (western->prefix);
- name->given = g_strdup (western->first );
+ name->prefixes = g_strdup (western->prefix);
+ name->given = g_strdup (western->first );
name->additional = g_strdup (western->middle);
- name->family = g_strdup (western->last );
- name->suffixes = g_strdup (western->suffix);
+ name->family = g_strdup (western->last );
+ name->suffixes = g_strdup (western->suffix);
e_name_western_free (western);
@@ -1926,11 +1926,11 @@ e_contact_name_copy (EContactName *n)
name = e_contact_name_new ();
- name->prefixes = g_strdup (n->prefixes);
- name->given = g_strdup (n->given);
+ name->prefixes = g_strdup (n->prefixes);
+ name->given = g_strdup (n->given);
name->additional = g_strdup (n->additional);
- name->family = g_strdup (n->family);
- name->suffixes = g_strdup (n->suffixes);
+ name->family = g_strdup (n->family);
+ name->suffixes = g_strdup (n->suffixes);
return name;
}
@@ -1956,23 +1956,23 @@ e_contact_name_free (EContactName *name)
g_free (name);
}
-#define E_CONTACT_DEFINE_BOXED_TYPE(_tp,_nm) \
- GType \
- _tp ## _get_type (void) \
- { \
- static volatile gsize type_id__volatile = 0; \
- \
- if (g_once_init_enter (&type_id__volatile)) { \
- GType type_id; \
- \
- type_id = g_boxed_type_register_static (_nm, \
- (GBoxedCopyFunc) _tp ## _copy, \
- (GBoxedFreeFunc) _tp ## _free); \
- \
+#define E_CONTACT_DEFINE_BOXED_TYPE(_tp,_nm) \
+ GType \
+ _tp ## _get_type (void) \
+ { \
+ static volatile gsize type_id__volatile = 0; \
+ \
+ if (g_once_init_enter (&type_id__volatile)) { \
+ GType type_id; \
+ \
+ type_id = g_boxed_type_register_static (_nm, \
+ (GBoxedCopyFunc) _tp ## _copy, \
+ (GBoxedFreeFunc) _tp ## _free); \
+ \
g_once_init_leave (&type_id__volatile, type_id);\
- } \
- \
- return type_id__volatile; \
+ } \
+ \
+ return type_id__volatile; \
}
E_CONTACT_DEFINE_BOXED_TYPE (e_contact_name, "EContactName")
@@ -2331,7 +2331,7 @@ mime_type_from_filename (const gchar *filename)
if (!extension)
return NULL;
- mime_type = g_uri_unescape_string (extension, NULL);
+ mime_type = g_uri_unescape_string (extension, NULL);
content_type = g_content_type_from_mime_type (mime_type);
if (!content_type) {
@@ -2378,8 +2378,8 @@ e_contact_photo_make_inline (EContactPhoto *photo,
g_free (photo->data.uri);
photo->type = E_CONTACT_PHOTO_TYPE_INLINED;
- photo->data.inlined.data = (guchar *) contents;
- photo->data.inlined.length = length;
+ photo->data.inlined.data = (guchar *) contents;
+ photo->data.inlined.length = length;
photo->data.inlined.mime_type = mime_type;
success = TRUE;
@@ -2481,7 +2481,7 @@ static EContactGeo *
e_contact_geo_copy (EContactGeo *geo)
{
EContactGeo *geo2 = g_new0 (EContactGeo, 1);
- geo2->latitude = geo->latitude;
+ geo2->latitude = geo->latitude;
geo2->longitude = geo->longitude;
return geo2;
diff --git a/addressbook/libebook-contacts/e-contact.h b/addressbook/libebook-contacts/e-contact.h
index fe5caf6..af9e295 100644
--- a/addressbook/libebook-contacts/e-contact.h
+++ b/addressbook/libebook-contacts/e-contact.h
@@ -252,18 +252,18 @@ typedef enum {
E_CONTACT_IM_TWITTER, /* Multi-valued */
E_CONTACT_FIELD_LAST,
- E_CONTACT_FIELD_FIRST = E_CONTACT_UID,
+ E_CONTACT_FIELD_FIRST = E_CONTACT_UID,
/* useful constants */
E_CONTACT_LAST_SIMPLE_STRING = E_CONTACT_NAME_OR_ORG,
- E_CONTACT_FIRST_PHONE_ID = E_CONTACT_PHONE_ASSISTANT,
- E_CONTACT_LAST_PHONE_ID = E_CONTACT_PHONE_TTYTDD,
- E_CONTACT_FIRST_EMAIL_ID = E_CONTACT_EMAIL_1,
- E_CONTACT_LAST_EMAIL_ID = E_CONTACT_EMAIL_4,
- E_CONTACT_FIRST_ADDRESS_ID = E_CONTACT_ADDRESS_HOME,
- E_CONTACT_LAST_ADDRESS_ID = E_CONTACT_ADDRESS_OTHER,
- E_CONTACT_FIRST_LABEL_ID = E_CONTACT_ADDRESS_LABEL_HOME,
- E_CONTACT_LAST_LABEL_ID = E_CONTACT_ADDRESS_LABEL_OTHER
+ E_CONTACT_FIRST_PHONE_ID = E_CONTACT_PHONE_ASSISTANT,
+ E_CONTACT_LAST_PHONE_ID = E_CONTACT_PHONE_TTYTDD,
+ E_CONTACT_FIRST_EMAIL_ID = E_CONTACT_EMAIL_1,
+ E_CONTACT_LAST_EMAIL_ID = E_CONTACT_EMAIL_4,
+ E_CONTACT_FIRST_ADDRESS_ID = E_CONTACT_ADDRESS_HOME,
+ E_CONTACT_LAST_ADDRESS_ID = E_CONTACT_ADDRESS_OTHER,
+ E_CONTACT_FIRST_LABEL_ID = E_CONTACT_ADDRESS_LABEL_HOME,
+ E_CONTACT_LAST_LABEL_ID = E_CONTACT_ADDRESS_LABEL_OTHER
} EContactField;
diff --git a/addressbook/libebook-contacts/e-name-western.c b/addressbook/libebook-contacts/e-name-western.c
index b95993a..359ed76 100644
--- a/addressbook/libebook-contacts/e-name-western.c
+++ b/addressbook/libebook-contacts/e-name-western.c
@@ -232,7 +232,7 @@ e_name_western_extract_prefix (ENameWestern *name,
return;
idxs->prefix_idx = 0;
- name->prefix = pfx;
+ name->prefix = pfx;
}
static gboolean
@@ -480,7 +480,7 @@ e_name_western_extract_last (ENameWestern *name,
return;
}
- name->last = g_strdup (name->full);
+ name->last = g_strdup (name->full);
idxs->last_idx = 0;
return;
}
@@ -766,59 +766,59 @@ e_name_western_zap_nil (gchar **str,
*str = NULL;
}
-#define FINISH_CHECK_MIDDLE_NAME_FOR_CONJUNCTION \
- gchar *last_start = NULL; \
- if (name->last) \
- last_start = g_utf8_strchr (name->last, -1, ' '); \
- if (last_start) { \
- gchar *new_last, *new_first; \
- \
- new_last = g_strdup (g_utf8_next_char (last_start)); \
- *last_start = '\0'; \
- \
- idxs->last_idx += (last_start - name->last) + 1; \
- \
- new_first = g_strdup_printf ("%s %s %s", \
- name->first, \
- name->middle, \
- name->last); \
- \
- g_free (name->first); \
- g_free (name->middle); \
- g_free (name->last); \
- \
- name->first = new_first; \
- name->middle = NULL; \
- name->last = new_last; \
- \
- idxs->middle_idx = -1; \
- } else { \
- gchar *new_first; \
- \
- new_first = g_strdup_printf ("%s %s %s", \
- name->first, \
- name->middle, \
- name->last); \
- \
- g_free (name->first); \
- g_free (name->middle); \
- g_free (name->last); \
- \
- name->first = new_first; \
- name->middle = NULL; \
- name->last = NULL; \
- idxs->middle_idx = -1; \
- idxs->last_idx = -1; \
+#define FINISH_CHECK_MIDDLE_NAME_FOR_CONJUNCTION \
+ gchar *last_start = NULL; \
+ if (name->last) \
+ last_start = g_utf8_strchr (name->last, -1, ' '); \
+ if (last_start) { \
+ gchar *new_last, *new_first; \
+ \
+ new_last = g_strdup (g_utf8_next_char (last_start)); \
+ *last_start = '\0'; \
+ \
+ idxs->last_idx += (last_start - name->last) + 1; \
+ \
+ new_first = g_strdup_printf ("%s %s %s", \
+ name->first, \
+ name->middle, \
+ name->last); \
+ \
+ g_free (name->first); \
+ g_free (name->middle); \
+ g_free (name->last); \
+ \
+ name->first = new_first; \
+ name->middle = NULL; \
+ name->last = new_last; \
+ \
+ idxs->middle_idx = -1; \
+ } else { \
+ gchar *new_first; \
+ \
+ new_first = g_strdup_printf ("%s %s %s", \
+ name->first, \
+ name->middle, \
+ name->last); \
+ \
+ g_free (name->first); \
+ g_free (name->middle); \
+ g_free (name->last); \
+ \
+ name->first = new_first; \
+ name->middle = NULL; \
+ name->last = NULL; \
+ idxs->middle_idx = -1; \
+ idxs->last_idx = -1; \
}
#define CHECK_MIDDLE_NAME_FOR_CONJUNCTION(conj) \
- if (idxs->middle_idx != -1 && !strcmp (name->middle, conj)) { \
- FINISH_CHECK_MIDDLE_NAME_FOR_CONJUNCTION \
+ if (idxs->middle_idx != -1 && !strcmp (name->middle, conj)) { \
+ FINISH_CHECK_MIDDLE_NAME_FOR_CONJUNCTION \
}
#define CHECK_MIDDLE_NAME_FOR_CONJUNCTION_CASE(conj) \
- if (idxs->middle_idx != -1 && !g_ascii_strcasecmp (name->middle, conj)) { \
- FINISH_CHECK_MIDDLE_NAME_FOR_CONJUNCTION \
+ if (idxs->middle_idx != -1 && !g_ascii_strcasecmp (name->middle, conj)) { \
+ FINISH_CHECK_MIDDLE_NAME_FOR_CONJUNCTION \
}
static void
@@ -839,9 +839,9 @@ e_name_western_fixup (ENameWestern *name,
* the last name for the middle name.
*/
if (idxs->last_idx == -1 && idxs->middle_idx != -1) {
- idxs->last_idx = idxs->middle_idx;
- name->last = name->middle;
- name->middle = NULL;
+ idxs->last_idx = idxs->middle_idx;
+ name->last = name->middle;
+ name->middle = NULL;
idxs->middle_idx = -1;
}
@@ -878,10 +878,10 @@ e_name_western_fixup (ENameWestern *name,
*/
if (idxs->first_idx != -1 && idxs->prefix_idx != -1 &&
idxs->last_idx == -1) {
- name->last = name->first;
- idxs->last_idx = idxs->first_idx;
+ name->last = name->first;
+ idxs->last_idx = idxs->first_idx;
idxs->first_idx = -1;
- name->first = NULL;
+ name->first = NULL;
}
if (idxs->middle_idx != -1) {
@@ -970,10 +970,10 @@ e_name_western_parse (const gchar *full_name)
idxs = g_new0 (ENameWesternIdxs, 1);
idxs->prefix_idx = -1;
- idxs->first_idx = -1;
+ idxs->first_idx = -1;
idxs->middle_idx = -1;
- idxs->nick_idx = -1;
- idxs->last_idx = -1;
+ idxs->nick_idx = -1;
+ idxs->last_idx = -1;
idxs->suffix_idx = -1;
/*
diff --git a/addressbook/libebook-contacts/e-source-backend-summary-setup.c
b/addressbook/libebook-contacts/e-source-backend-summary-setup.c
index 90e4da8..c01f04a 100644
--- a/addressbook/libebook-contacts/e-source-backend-summary-setup.c
+++ b/addressbook/libebook-contacts/e-source-backend-summary-setup.c
@@ -48,9 +48,9 @@
#include "e-source-backend-summary-setup.h"
#include "e-book-contacts-enumtypes.h"
-#define E_SOURCE_BACKEND_SUMMARY_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE \
- ((obj), E_TYPE_SOURCE_BACKEND_SUMMARY_SETUP, \
+#define E_SOURCE_BACKEND_SUMMARY_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), E_TYPE_SOURCE_BACKEND_SUMMARY_SETUP, \
ESourceBackendSummarySetupPrivate))
struct _ESourceBackendSummarySetupPrivate {
@@ -256,7 +256,7 @@ source_backend_summary_setup_get_fields_array (ESourceBackendSummarySetup *exten
if (split) {
n_ret_fields = g_strv_length (split);
- fields = g_new (EContactField, n_ret_fields);
+ fields = g_new (EContactField, n_ret_fields);
for (i = 0; i < n_ret_fields; i++) {
field = e_contact_field_id (split[i]);
@@ -476,7 +476,7 @@ e_source_backend_summary_setup_get_indexed_fields (ESourceBackendSummarySetup *e
ret_n_fields = g_strv_length (split);
ret_fields = g_new0 (EContactField, ret_n_fields);
- ret_types = g_new0 (EBookIndexType, ret_n_fields);
+ ret_types = g_new0 (EBookIndexType, ret_n_fields);
for (i = 0; i < ret_n_fields && malformed == FALSE; i++) {
@@ -572,7 +572,7 @@ e_source_backend_summary_setup_set_indexed_fieldsv (ESourceBackendSummarySetup *
const gchar *type;
field = e_contact_field_name (fields[i]);
- type = e_enum_to_string (E_TYPE_BOOK_INDEX_TYPE, types[i]);
+ type = e_enum_to_string (E_TYPE_BOOK_INDEX_TYPE, types[i]);
if (!field) {
g_warning ("Invalid contact field specified in indexed fields");
diff --git a/addressbook/libebook-contacts/e-vcard.c b/addressbook/libebook-contacts/e-vcard.c
index f1e37d8..eb3bc2e 100644
--- a/addressbook/libebook-contacts/e-vcard.c
+++ b/addressbook/libebook-contacts/e-vcard.c
@@ -331,7 +331,7 @@ read_attribute_value (EVCardAttribute *attr,
/* read in the value */
str = g_string_new ("");
- for (lp = skip_newline ( *p, quoted_printable);
+ for (lp = skip_newline ( *p, quoted_printable);
*lp != '\n' && *lp != '\r' && *lp != '\0';
lp = skip_newline ( lp, quoted_printable ) ) {
@@ -444,7 +444,7 @@ read_attribute_params (EVCardAttribute *attr,
gboolean in_quote = FALSE;
str = g_string_new ("");
- for (lp = skip_newline ( *p, *quoted_printable);
+ for (lp = skip_newline ( *p, *quoted_printable);
*lp != '\n' && *lp != '\r' && *lp != '\0';
lp = skip_newline ( lp, *quoted_printable ) ) {
@@ -610,7 +610,7 @@ read_attribute (gchar **p)
/* first read in the group/name */
str = g_string_new ("");
- for (lp = skip_newline ( *p, is_qp);
+ for (lp = skip_newline ( *p, is_qp);
*lp != '\n' && *lp != '\r' && *lp != '\0';
lp = skip_newline ( lp, is_qp ) ) {
@@ -977,10 +977,10 @@ e_vcard_construct_with_uid (EVCard *evc,
* Since: 3.12
**/
void
-e_vcard_construct_full (EVCard *evc,
- const gchar *str,
- gssize len,
- const gchar *uid)
+e_vcard_construct_full (EVCard *evc,
+ const gchar *str,
+ gssize len,
+ const gchar *uid)
{
g_return_if_fail (E_IS_VCARD (evc));
g_return_if_fail (str != NULL);
diff --git a/addressbook/libebook/e-book-client-cursor.c b/addressbook/libebook/e-book-client-cursor.c
index 84ba1e7..32539dd 100644
--- a/addressbook/libebook/e-book-client-cursor.c
+++ b/addressbook/libebook/e-book-client-cursor.c
@@ -469,6 +469,10 @@
#include "e-book-client.h"
#include "e-book-client-cursor.h"
+#define E_BOOK_CLIENT_CURSOR_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), E_TYPE_BOOK_CLIENT_CURSOR, EBookClientCursorPrivate))
+
/* Forward declarations */
typedef struct _SetSexpContext SetSexpContext;
typedef struct _StepContext StepContext;
@@ -934,10 +938,8 @@ e_book_client_cursor_class_init (EBookClientCursorClass *class)
static void
e_book_client_cursor_init (EBookClientCursor *cursor)
{
- cursor->priv =
- G_TYPE_INSTANCE_GET_PRIVATE (cursor,
- E_TYPE_BOOK_CLIENT_CURSOR,
- EBookClientCursorPrivate);
+ cursor->priv = E_BOOK_CLIENT_CURSOR_GET_PRIVATE (cursor);
+
g_mutex_init (&cursor->priv->main_context_lock);
g_mutex_init (&cursor->priv->notifications_lock);
}
@@ -994,9 +996,9 @@ book_client_cursor_finalize (GObject *object)
static void
book_client_cursor_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
EBookClientCursor *cursor = E_BOOK_CLIENT_CURSOR (object);
EBookClientCursorPrivate *priv = cursor->priv;
@@ -1044,9 +1046,9 @@ book_client_cursor_set_property (GObject *object,
static void
book_client_cursor_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
switch (property_id) {
case PROP_CLIENT:
@@ -1060,7 +1062,7 @@ book_client_cursor_get_property (GObject *object,
g_value_set_boxed (
value,
e_book_client_cursor_get_alphabet (
- E_BOOK_CLIENT_CURSOR (object),
+ E_BOOK_CLIENT_CURSOR (object),
NULL, NULL, NULL, NULL));
break;
@@ -1096,8 +1098,8 @@ e_book_client_cursor_initable_init (GInitableIface *interface)
static gboolean
book_client_cursor_initable_init (GInitable *initable,
- GCancellable *cancellable,
- GError **error)
+ GCancellable *cancellable,
+ GError **error)
{
EBookClientCursor *cursor = E_BOOK_CLIENT_CURSOR (initable);
EBookClientCursorPrivate *priv = cursor->priv;
@@ -1135,7 +1137,7 @@ book_client_cursor_initable_init (GInitable *initable,
*/
static void
book_client_cursor_set_client (EBookClientCursor *cursor,
- EBookClient *client)
+ EBookClient *client)
{
EBookClientCursorPrivate *priv = cursor->priv;
@@ -1164,26 +1166,29 @@ book_client_cursor_set_client (EBookClientCursor *cursor,
gchar *revision = NULL;
/* Connect signals */
- priv->revision_changed_id =
- g_signal_connect_data (client, "backend-property-changed",
- G_CALLBACK (client_revision_changed_cb),
- e_weak_ref_new (cursor),
- (GClosureNotify) e_weak_ref_free,
- 0);
- priv->locale_changed_id =
- g_signal_connect_data (client, "notify::locale",
- G_CALLBACK (client_locale_changed_cb),
- e_weak_ref_new (cursor),
- (GClosureNotify) e_weak_ref_free,
- 0);
+ priv->revision_changed_id =
+ g_signal_connect_data (
+ client, "backend-property-changed",
+ G_CALLBACK (client_revision_changed_cb),
+ e_weak_ref_new (cursor),
+ (GClosureNotify) e_weak_ref_free,
+ 0);
+ priv->locale_changed_id =
+ g_signal_connect_data (
+ client, "notify::locale",
+ G_CALLBACK (client_locale_changed_cb),
+ e_weak_ref_new (cursor),
+ (GClosureNotify) e_weak_ref_free,
+ 0);
/* Load initial locale & revision */
book_client_cursor_set_locale (cursor, e_book_client_get_locale (priv->client));
/* This loads a cached D-Bus property, no D-Bus activity */
- e_client_get_backend_property_sync (E_CLIENT (priv->client),
- CLIENT_BACKEND_PROPERTY_REVISION,
- &revision, NULL, NULL);
+ e_client_get_backend_property_sync (
+ E_CLIENT (priv->client),
+ CLIENT_BACKEND_PROPERTY_REVISION,
+ &revision, NULL, NULL);
book_client_cursor_set_revision (cursor, revision);
g_free (revision);
@@ -1194,7 +1199,7 @@ book_client_cursor_set_client (EBookClientCursor *cursor,
static void
book_client_cursor_set_connection (EBookClientCursor *cursor,
- GDBusConnection *connection)
+ GDBusConnection *connection)
{
EBookClientCursorPrivate *priv = cursor->priv;
@@ -1214,8 +1219,8 @@ book_client_cursor_set_connection (EBookClientCursor *cursor,
static void
proxy_dispose_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
GError *local_error = NULL;
@@ -1230,8 +1235,8 @@ proxy_dispose_cb (GObject *source_object,
}
static void
-book_client_cursor_set_proxy (EBookClientCursor *cursor,
- EDBusAddressBookCursor *proxy)
+book_client_cursor_set_proxy (EBookClientCursor *cursor,
+ EDBusAddressBookCursor *proxy)
{
EBookClientCursorPrivate *priv = cursor->priv;
@@ -1259,24 +1264,26 @@ book_client_cursor_set_proxy (EBookClientCursor *cursor,
if (priv->dbus_proxy) {
gint position, total;
- priv->proxy_total_changed_id =
- g_signal_connect_data (priv->dbus_proxy, "notify::total",
- G_CALLBACK (proxy_total_changed_cb),
- e_weak_ref_new (cursor),
- (GClosureNotify) e_weak_ref_free,
- 0);
- priv->proxy_position_changed_id =
- g_signal_connect_data (priv->dbus_proxy, "notify::position",
- G_CALLBACK (proxy_position_changed_cb),
- e_weak_ref_new (cursor),
- (GClosureNotify) e_weak_ref_free,
- 0);
+ priv->proxy_total_changed_id =
+ g_signal_connect_data (
+ priv->dbus_proxy, "notify::total",
+ G_CALLBACK (proxy_total_changed_cb),
+ e_weak_ref_new (cursor),
+ (GClosureNotify) e_weak_ref_free,
+ 0);
+ priv->proxy_position_changed_id =
+ g_signal_connect_data (
+ priv->dbus_proxy, "notify::position",
+ G_CALLBACK (proxy_position_changed_cb),
+ e_weak_ref_new (cursor),
+ (GClosureNotify) e_weak_ref_free,
+ 0);
/* Set initial values */
- total = e_dbus_address_book_cursor_get_total (proxy);
+ total = e_dbus_address_book_cursor_get_total (proxy);
position = e_dbus_address_book_cursor_get_position (proxy);
- book_client_cursor_set_total (cursor, total);
- book_client_cursor_set_position (cursor, position);
+ book_client_cursor_set_total (cursor, total);
+ book_client_cursor_set_position (cursor, position);
g_object_ref (priv->dbus_proxy);
}
@@ -1285,7 +1292,7 @@ book_client_cursor_set_proxy (EBookClientCursor *cursor,
static void
book_client_cursor_set_context (EBookClientCursor *cursor,
- GMainContext *context)
+ GMainContext *context)
{
EBookClientCursorPrivate *priv = cursor->priv;
@@ -1353,7 +1360,7 @@ void book_client_delete_direct_cursor (EBookClient *client,
static void
book_client_cursor_set_direct_cursor (EBookClientCursor *cursor,
- EDataBookCursor *direct_cursor)
+ EDataBookCursor *direct_cursor)
{
EBookClientCursorPrivate *priv = cursor->priv;
@@ -1374,8 +1381,9 @@ book_client_cursor_set_direct_cursor (EBookClientCursor *cursor,
* before releasing our strong reference to the EBookClient
*/
g_warn_if_fail (priv->client != NULL);
- book_client_delete_direct_cursor (priv->client,
- priv->direct_cursor);
+ book_client_delete_direct_cursor (
+ priv->client,
+ priv->direct_cursor);
g_object_unref (priv->direct_cursor);
}
@@ -1387,30 +1395,33 @@ book_client_cursor_set_direct_cursor (EBookClientCursor *cursor,
gchar *freeme = NULL;
gint total, position;
- priv->dra_total_changed_id =
- g_signal_connect (priv->direct_cursor, "notify::total",
- G_CALLBACK (dra_total_changed_cb),
- cursor);
- priv->dra_position_changed_id =
- g_signal_connect (priv->direct_cursor, "notify::position",
- G_CALLBACK (dra_position_changed_cb),
- cursor);
+ priv->dra_total_changed_id =
+ g_signal_connect (
+ priv->direct_cursor, "notify::total",
+ G_CALLBACK (dra_total_changed_cb),
+ cursor);
+ priv->dra_position_changed_id =
+ g_signal_connect (
+ priv->direct_cursor, "notify::position",
+ G_CALLBACK (dra_position_changed_cb),
+ cursor);
/* Load initial locale */
if (priv->direct_cursor &&
!e_data_book_cursor_load_locale (priv->direct_cursor,
&freeme, NULL, &error)) {
- g_warning ("Error loading locale in direct read access cursor: %s",
- error->message);
+ g_warning (
+ "Error loading locale in direct read access cursor: %s",
+ error->message);
g_clear_error (&error);
}
g_free (freeme);
/* Set initial values */
- total = e_data_book_cursor_get_total (priv->direct_cursor);
+ total = e_data_book_cursor_get_total (priv->direct_cursor);
position = e_data_book_cursor_get_position (priv->direct_cursor);
- book_client_cursor_set_total (cursor, total);
- book_client_cursor_set_position (cursor, position);
+ book_client_cursor_set_total (cursor, total);
+ book_client_cursor_set_position (cursor, position);
g_object_ref (priv->direct_cursor);
}
@@ -1419,7 +1430,7 @@ book_client_cursor_set_direct_cursor (EBookClientCursor *cursor,
static void
book_client_cursor_set_object_path (EBookClientCursor *cursor,
- const gchar *object_path)
+ const gchar *object_path)
{
g_return_if_fail (cursor->priv->object_path == NULL);
@@ -1428,7 +1439,7 @@ book_client_cursor_set_object_path (EBookClientCursor *cursor,
static void
book_client_cursor_set_locale (EBookClientCursor *cursor,
- const gchar *locale)
+ const gchar *locale)
{
EBookClientCursorPrivate *priv = cursor->priv;
GError *error = NULL;
@@ -1444,15 +1455,17 @@ book_client_cursor_set_locale (EBookClientCursor *cursor,
priv->collator = e_collator_new (locale, &error);
if (!priv->collator) {
- g_warning ("Error loading collator for locale '%s': %s",
- locale, error->message);
+ g_warning (
+ "Error loading collator for locale '%s': %s",
+ locale, error->message);
g_clear_error (&error);
return;
}
- e_collator_get_index_labels (priv->collator,
- &priv->n_labels,
- NULL, NULL, NULL);
+ e_collator_get_index_labels (
+ priv->collator,
+ &priv->n_labels,
+ NULL, NULL, NULL);
/* The server side EDataBookCursor should have already
* reset its cursor values internally and notified
@@ -1461,8 +1474,9 @@ book_client_cursor_set_locale (EBookClientCursor *cursor,
*/
if (priv->direct_cursor &&
!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_warning (
+ "Error loading locale in direct read access cursor: %s",
+ error->message);
g_clear_error (&error);
}
@@ -1476,8 +1490,8 @@ book_client_cursor_set_locale (EBookClientCursor *cursor,
}
static void
-book_client_cursor_set_revision (EBookClientCursor *cursor,
- const gchar *revision)
+book_client_cursor_set_revision (EBookClientCursor *cursor,
+ const gchar *revision)
{
EBookClientCursorPrivate *priv = cursor->priv;
@@ -1509,7 +1523,7 @@ book_client_cursor_set_revision (EBookClientCursor *cursor,
static void
book_client_cursor_set_total (EBookClientCursor *cursor,
- gint total)
+ gint total)
{
EBookClientCursorPrivate *priv = cursor->priv;
@@ -1521,7 +1535,7 @@ book_client_cursor_set_total (EBookClientCursor *cursor,
static void
book_client_cursor_set_position (EBookClientCursor *cursor,
- gint position)
+ gint position)
{
EBookClientCursorPrivate *priv = cursor->priv;
@@ -1548,8 +1562,8 @@ book_client_cursor_set_position (EBookClientCursor *cursor,
static void
notification_new_string (EBookClientCursor *cursor,
- NotificationType type,
- const gchar *value)
+ NotificationType type,
+ const gchar *value)
{
Notification *notification = g_slice_new0 (Notification);
@@ -1564,8 +1578,8 @@ notification_new_string (EBookClientCursor *cursor,
static void
notification_new_int (EBookClientCursor *cursor,
- NotificationType type,
- gint value)
+ NotificationType type,
+ gint value)
{
Notification *notification = g_slice_new0 (Notification);
@@ -1590,7 +1604,7 @@ notification_free (Notification *notification)
static void
notification_queue (EBookClientCursor *cursor,
- Notification *notification)
+ Notification *notification)
{
EBookClientCursorPrivate *priv = cursor->priv;
GMainContext *context;
@@ -1605,10 +1619,11 @@ notification_queue (EBookClientCursor *cursor,
if (context && priv->notification_source == NULL) {
/* Hold on to a reference, release our reference in dispatch() */
priv->notification_source = g_idle_source_new ();
- g_source_set_callback (priv->notification_source,
- (GSourceFunc) notification_dispatch,
- e_weak_ref_new (cursor),
- (GDestroyNotify) e_weak_ref_free);
+ g_source_set_callback (
+ priv->notification_source,
+ (GSourceFunc) notification_dispatch,
+ e_weak_ref_new (cursor),
+ (GDestroyNotify) e_weak_ref_free);
g_source_attach (priv->notification_source, context);
g_main_context_unref (context);
}
@@ -1680,10 +1695,10 @@ notification_dispatch (GWeakRef *weak_ref)
* Callbacks from EBookClient *
****************************************************/
static void
-client_revision_changed_cb (EClient *client,
- const gchar *prop_name,
- const gchar *prop_value,
- GWeakRef *weak_ref)
+client_revision_changed_cb (EClient *client,
+ const gchar *prop_name,
+ const gchar *prop_value,
+ GWeakRef *weak_ref)
{
EBookClientCursor *cursor;
@@ -1698,9 +1713,9 @@ client_revision_changed_cb (EClient *client,
}
static void
-client_locale_changed_cb (EBookClient *book_client,
- GParamSpec *pspec,
- GWeakRef *weak_ref)
+client_locale_changed_cb (EBookClient *book_client,
+ GParamSpec *pspec,
+ GWeakRef *weak_ref)
{
EBookClientCursor *cursor;
@@ -1716,8 +1731,8 @@ client_locale_changed_cb (EBookClient *book_client,
****************************************************/
static void
proxy_total_changed_cb (EDBusAddressBookCursor *proxy,
- GParamSpec *pspec,
- GWeakRef *weak_ref)
+ GParamSpec *pspec,
+ GWeakRef *weak_ref)
{
EBookClientCursor *cursor;
@@ -1731,8 +1746,8 @@ proxy_total_changed_cb (EDBusAddressBookCursor *proxy,
static void
proxy_position_changed_cb (EDBusAddressBookCursor *proxy,
- GParamSpec *pspec,
- GWeakRef *weak_ref)
+ GParamSpec *pspec,
+ GWeakRef *weak_ref)
{
EBookClientCursor *cursor;
@@ -1748,18 +1763,18 @@ proxy_position_changed_cb (EDBusAddressBookCursor *proxy,
* Callbacks from EDBusAddressBookCursor *
****************************************************/
static void
-dra_total_changed_cb (EDataBookCursor *direct_cursor,
- GParamSpec *pspec,
- EBookClientCursor *cursor)
+dra_total_changed_cb (EDataBookCursor *direct_cursor,
+ GParamSpec *pspec,
+ EBookClientCursor *cursor)
{
notification_new_int (cursor, TOTAL_CHANGED,
e_data_book_cursor_get_total (direct_cursor));
}
static void
-dra_position_changed_cb (EDataBookCursor *direct_cursor,
- GParamSpec *pspec,
- EBookClientCursor *cursor)
+dra_position_changed_cb (EDataBookCursor *direct_cursor,
+ GParamSpec *pspec,
+ EBookClientCursor *cursor)
{
notification_new_int (cursor, POSITION_CHANGED,
e_data_book_cursor_get_position (direct_cursor));
@@ -1820,12 +1835,12 @@ set_sexp_context_free (SetSexpContext *context)
}
static gboolean
-set_sexp_sync_internal (EBookClientCursor *cursor,
- const gchar *sexp,
- guint *new_total,
- guint *new_position,
- GCancellable *cancellable,
- GError **error)
+set_sexp_sync_internal (EBookClientCursor *cursor,
+ const gchar *sexp,
+ guint *new_total,
+ guint *new_position,
+ GCancellable *cancellable,
+ GError **error)
{
EBookClientCursorPrivate *priv;
gchar *utf8_sexp;
@@ -1866,37 +1881,38 @@ set_sexp_sync_internal (EBookClientCursor *cursor,
static void
set_sexp_thread (GSimpleAsyncResult *simple,
- GObject *source_object,
- GCancellable *cancellable)
+ GObject *source_object,
+ GCancellable *cancellable)
{
SetSexpContext *context;
GError *local_error = NULL;
context = g_simple_async_result_get_op_res_gpointer (simple);
- set_sexp_sync_internal (E_BOOK_CLIENT_CURSOR (source_object),
- context->sexp,
- &context->new_total,
- &context->new_position,
- cancellable,
- &local_error);
+ set_sexp_sync_internal (
+ E_BOOK_CLIENT_CURSOR (source_object),
+ context->sexp,
+ &context->new_total,
+ &context->new_position,
+ cancellable,
+ &local_error);
if (local_error != NULL)
g_simple_async_result_take_error (simple, local_error);
}
static StepContext *
-step_context_new (const gchar *revision,
- EBookCursorStepFlags flags,
- EBookCursorOrigin origin,
- gint count)
+step_context_new (const gchar *revision,
+ EBookCursorStepFlags flags,
+ EBookCursorOrigin origin,
+ gint count)
{
StepContext *context = g_slice_new0 (StepContext);
- context->revision = g_strdup (revision);
- context->flags = flags;
- context->origin = origin;
- context->count = count;
- context->n_results = 0;
+ context->revision = g_strdup (revision);
+ context->flags = flags;
+ context->origin = origin;
+ context->count = count;
+ context->n_results = 0;
return context;
}
@@ -1912,16 +1928,16 @@ step_context_free (StepContext *context)
}
static gint
-step_sync_internal (EBookClientCursor *cursor,
- const gchar *revision,
- EBookCursorStepFlags flags,
- EBookCursorOrigin origin,
- gint count,
- GSList **out_contacts,
- guint *new_total,
- guint *new_position,
- GCancellable *cancellable,
- GError **error)
+step_sync_internal (EBookClientCursor *cursor,
+ const gchar *revision,
+ EBookCursorStepFlags flags,
+ EBookCursorOrigin origin,
+ gint count,
+ GSList **out_contacts,
+ guint *new_total,
+ guint *new_position,
+ GCancellable *cancellable,
+ GError **error)
{
EBookClientCursorPrivate *priv;
GError *local_error = NULL;
@@ -1934,14 +1950,15 @@ step_sync_internal (EBookClientCursor *cursor,
GSList *results = NULL, *l;
GSList *contacts = NULL;
- n_results = e_data_book_cursor_step (priv->direct_cursor,
- revision,
- flags,
- origin,
- count,
- &results,
- cancellable,
- error);
+ n_results = e_data_book_cursor_step (
+ priv->direct_cursor,
+ revision,
+ flags,
+ origin,
+ count,
+ &results,
+ cancellable,
+ error);
if (n_results < 0)
return n_results;
@@ -1953,7 +1970,7 @@ step_sync_internal (EBookClientCursor *cursor,
contacts = g_slist_prepend (contacts, contact);
}
- g_slist_free_full (results, (GDestroyNotify)g_free);
+ g_slist_free_full (results, (GDestroyNotify) g_free);
if (out_contacts)
*out_contacts = g_slist_reverse (contacts);
@@ -2008,32 +2025,32 @@ step_sync_internal (EBookClientCursor *cursor,
static void
step_thread (GSimpleAsyncResult *simple,
- GObject *source_object,
- GCancellable *cancellable)
+ GObject *source_object,
+ GCancellable *cancellable)
{
StepContext *context;
GError *local_error = NULL;
context = g_simple_async_result_get_op_res_gpointer (simple);
- context->n_results =
- step_sync_internal (E_BOOK_CLIENT_CURSOR (source_object),
- context->revision,
- context->flags,
- context->origin,
- context->count,
- &(context->contacts),
- &context->new_total,
- &context->new_position,
- cancellable, &local_error);
+ context->n_results = step_sync_internal (
+ E_BOOK_CLIENT_CURSOR (source_object),
+ context->revision,
+ context->flags,
+ context->origin,
+ context->count,
+ &(context->contacts),
+ &context->new_total,
+ &context->new_position,
+ cancellable, &local_error);
if (local_error != NULL)
g_simple_async_result_take_error (simple, local_error);
}
static AlphabetIndexContext *
-alphabet_index_context_new (gint index,
- const gchar *locale)
+alphabet_index_context_new (gint index,
+ const gchar *locale)
{
AlphabetIndexContext *context = g_slice_new0 (AlphabetIndexContext);
@@ -2053,13 +2070,13 @@ alphabet_index_context_free (AlphabetIndexContext *context)
}
static gboolean
-set_alphabetic_index_sync_internal (EBookClientCursor *cursor,
- gint index,
- const gchar *locale,
- guint *new_total,
- guint *new_position,
- GCancellable *cancellable,
- GError **error)
+set_alphabetic_index_sync_internal (EBookClientCursor *cursor,
+ gint index,
+ const gchar *locale,
+ guint *new_total,
+ guint *new_position,
+ GCancellable *cancellable,
+ GError **error)
{
EBookClientCursorPrivate *priv;
GError *local_error = NULL;
@@ -2100,21 +2117,22 @@ set_alphabetic_index_sync_internal (EBookClientCursor *cursor,
static void
alphabet_index_thread (GSimpleAsyncResult *simple,
- GObject *source_object,
- GCancellable *cancellable)
+ GObject *source_object,
+ GCancellable *cancellable)
{
AlphabetIndexContext *context;
GError *local_error = NULL;
context = g_simple_async_result_get_op_res_gpointer (simple);
- set_alphabetic_index_sync_internal (E_BOOK_CLIENT_CURSOR (source_object),
- context->index,
- context->locale,
- &context->new_total,
- &context->new_position,
- cancellable,
- &local_error);
+ set_alphabetic_index_sync_internal (
+ E_BOOK_CLIENT_CURSOR (source_object),
+ context->index,
+ context->locale,
+ &context->new_total,
+ &context->new_position,
+ cancellable,
+ &local_error);
if (local_error != NULL)
g_simple_async_result_take_error (simple, local_error);
@@ -2180,11 +2198,11 @@ e_book_client_cursor_ref_client (EBookClientCursor *cursor)
* Since: 3.12
*/
const gchar * const *
-e_book_client_cursor_get_alphabet (EBookClientCursor *cursor,
- gint *n_labels,
- gint *underflow,
- gint *inflow,
- gint *overflow)
+e_book_client_cursor_get_alphabet (EBookClientCursor *cursor,
+ gint *n_labels,
+ gint *underflow,
+ gint *inflow,
+ gint *overflow)
{
EBookClientCursorPrivate *priv;
@@ -2192,11 +2210,12 @@ e_book_client_cursor_get_alphabet (EBookClientCursor *cursor,
priv = cursor->priv;
- return e_collator_get_index_labels (priv->collator,
- n_labels,
- underflow,
- inflow,
- overflow);
+ return e_collator_get_index_labels (
+ priv->collator,
+ n_labels,
+ underflow,
+ inflow,
+ overflow);
}
/**
@@ -2211,7 +2230,7 @@ e_book_client_cursor_get_alphabet (EBookClientCursor *cursor,
* Since: 3.12
*/
gint
-e_book_client_cursor_get_total (EBookClientCursor *cursor)
+e_book_client_cursor_get_total (EBookClientCursor *cursor)
{
g_return_val_if_fail (E_IS_BOOK_CLIENT_CURSOR (cursor), -1);
@@ -2238,7 +2257,7 @@ e_book_client_cursor_get_total (EBookClientCursor *cursor)
* Since: 3.12
*/
gint
-e_book_client_cursor_get_position (EBookClientCursor *cursor)
+e_book_client_cursor_get_position (EBookClientCursor *cursor)
{
g_return_val_if_fail (E_IS_BOOK_CLIENT_CURSOR (cursor), -1);
@@ -2263,14 +2282,13 @@ e_book_client_cursor_get_position (EBookClientCursor *cursor)
* Since: 3.12
*/
void
-e_book_client_cursor_set_sexp (EBookClientCursor *cursor,
- const gchar *sexp,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+e_book_client_cursor_set_sexp (EBookClientCursor *cursor,
+ const gchar *sexp,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
-
GSimpleAsyncResult *simple;
SetSexpContext *context;
@@ -2278,13 +2296,15 @@ e_book_client_cursor_set_sexp (EBookClientCursor *cursor,
g_return_if_fail (callback != NULL);
context = set_sexp_context_new (sexp);
- simple = g_simple_async_result_new (G_OBJECT (cursor),
- callback, user_data,
- e_book_client_cursor_set_sexp);
+ simple = g_simple_async_result_new (
+ G_OBJECT (cursor),
+ callback, user_data,
+ e_book_client_cursor_set_sexp);
g_simple_async_result_set_check_cancellable (simple, cancellable);
- g_simple_async_result_set_op_res_gpointer (simple, context,
- (GDestroyNotify) set_sexp_context_free);
+ g_simple_async_result_set_op_res_gpointer (
+ simple, context,
+ (GDestroyNotify) set_sexp_context_free);
g_simple_async_result_run_in_thread (
simple, set_sexp_thread,
@@ -2307,9 +2327,9 @@ e_book_client_cursor_set_sexp (EBookClientCursor *cursor,
* Since: 3.12
*/
gboolean
-e_book_client_cursor_set_sexp_finish (EBookClientCursor *cursor,
- GAsyncResult *result,
- GError **error)
+e_book_client_cursor_set_sexp_finish (EBookClientCursor *cursor,
+ GAsyncResult *result,
+ GError **error)
{
GSimpleAsyncResult *simple;
SetSexpContext *context;
@@ -2366,22 +2386,23 @@ e_book_client_cursor_set_sexp_finish (EBookClientCursor *cursor,
* Since: 3.12
*/
gboolean
-e_book_client_cursor_set_sexp_sync (EBookClientCursor *cursor,
- const gchar *sexp,
- GCancellable *cancellable,
- GError **error)
+e_book_client_cursor_set_sexp_sync (EBookClientCursor *cursor,
+ const gchar *sexp,
+ GCancellable *cancellable,
+ GError **error)
{
gboolean success;
guint new_total = 0, new_position = 0;
g_return_val_if_fail (E_IS_BOOK_CLIENT_CURSOR (cursor), FALSE);
- success = set_sexp_sync_internal (cursor,
- sexp,
- &new_total,
- &new_position,
- cancellable,
- error);
+ success = set_sexp_sync_internal (
+ cursor,
+ sexp,
+ &new_total,
+ &new_position,
+ cancellable,
+ error);
/* If we are in the thread where the cursor was created,
* then synchronize the new total & position right away
@@ -2417,13 +2438,13 @@ e_book_client_cursor_set_sexp_sync (EBookClientCursor *cursor,
* Since: 3.12
*/
void
-e_book_client_cursor_step (EBookClientCursor *cursor,
- EBookCursorStepFlags flags,
- EBookCursorOrigin origin,
- gint count,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+e_book_client_cursor_step (EBookClientCursor *cursor,
+ EBookCursorStepFlags flags,
+ EBookCursorOrigin origin,
+ gint count,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
GSimpleAsyncResult *simple;
StepContext *context;
@@ -2431,15 +2452,18 @@ e_book_client_cursor_step (EBookClientCursor *cursor,
g_return_if_fail (E_IS_BOOK_CLIENT_CURSOR (cursor));
g_return_if_fail (callback != NULL);
- context = step_context_new (cursor->priv->revision,
- flags, origin, count);
- simple = g_simple_async_result_new (G_OBJECT (cursor),
- callback, user_data,
- e_book_client_cursor_step);
+ context = step_context_new (
+ cursor->priv->revision,
+ flags, origin, count);
+ simple = g_simple_async_result_new (
+ G_OBJECT (cursor),
+ callback, user_data,
+ e_book_client_cursor_step);
g_simple_async_result_set_check_cancellable (simple, cancellable);
- g_simple_async_result_set_op_res_gpointer (simple, context,
- (GDestroyNotify) step_context_free);
+ g_simple_async_result_set_op_res_gpointer (
+ simple, context,
+ (GDestroyNotify) step_context_free);
g_simple_async_result_run_in_thread (
simple, step_thread,
@@ -2464,10 +2488,10 @@ e_book_client_cursor_step (EBookClientCursor *cursor,
* Since: 3.12
*/
gint
-e_book_client_cursor_step_finish (EBookClientCursor *cursor,
- GAsyncResult *result,
- GSList **out_contacts,
- GError **error)
+e_book_client_cursor_step_finish (EBookClientCursor *cursor,
+ GAsyncResult *result,
+ GSList **out_contacts,
+ GError **error)
{
GSimpleAsyncResult *simple;
StepContext *context;
@@ -2548,23 +2572,24 @@ e_book_client_cursor_step_finish (EBookClientCursor *cursor,
* Since: 3.12
*/
gint
-e_book_client_cursor_step_sync (EBookClientCursor *cursor,
- EBookCursorStepFlags flags,
- EBookCursorOrigin origin,
- gint count,
- GSList **out_contacts,
- GCancellable *cancellable,
- GError **error)
+e_book_client_cursor_step_sync (EBookClientCursor *cursor,
+ EBookCursorStepFlags flags,
+ EBookCursorOrigin origin,
+ gint count,
+ GSList **out_contacts,
+ GCancellable *cancellable,
+ GError **error)
{
guint new_total = 0, new_position = 0;
gint retval;
g_return_val_if_fail (E_IS_BOOK_CLIENT_CURSOR (cursor), FALSE);
- retval = step_sync_internal (cursor, cursor->priv->revision,
- flags, origin, count,
- out_contacts, &new_total, &new_position,
- cancellable, error);
+ retval = step_sync_internal (
+ cursor, cursor->priv->revision,
+ flags, origin, count,
+ out_contacts, &new_total, &new_position,
+ cancellable, error);
/* If we are in the thread where the cursor was created,
* then synchronize the new total & position right away
@@ -2597,11 +2622,11 @@ e_book_client_cursor_step_sync (EBookClientCursor *cursor,
* Since: 3.12
*/
void
-e_book_client_cursor_set_alphabetic_index (EBookClientCursor *cursor,
- gint index,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+e_book_client_cursor_set_alphabetic_index (EBookClientCursor *cursor,
+ gint index,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
GSimpleAsyncResult *simple;
AlphabetIndexContext *context;
@@ -2611,13 +2636,15 @@ e_book_client_cursor_set_alphabetic_index (EBookClientCursor *cursor,
g_return_if_fail (callback != NULL);
context = alphabet_index_context_new (index, cursor->priv->locale);
- simple = g_simple_async_result_new (G_OBJECT (cursor),
- callback, user_data,
- e_book_client_cursor_set_alphabetic_index);
+ simple = g_simple_async_result_new (
+ G_OBJECT (cursor),
+ callback, user_data,
+ e_book_client_cursor_set_alphabetic_index);
g_simple_async_result_set_check_cancellable (simple, cancellable);
- g_simple_async_result_set_op_res_gpointer (simple, context,
- (GDestroyNotify) alphabet_index_context_free);
+ g_simple_async_result_set_op_res_gpointer (
+ simple, context,
+ (GDestroyNotify) alphabet_index_context_free);
g_simple_async_result_run_in_thread (
simple, alphabet_index_thread,
@@ -2639,9 +2666,9 @@ e_book_client_cursor_set_alphabetic_index (EBookClientCursor *cursor,
* Since: 3.12
*/
gboolean
-e_book_client_cursor_set_alphabetic_index_finish (EBookClientCursor *cursor,
- GAsyncResult *result,
- GError **error)
+e_book_client_cursor_set_alphabetic_index_finish (EBookClientCursor *cursor,
+ GAsyncResult *result,
+ GError **error)
{
GSimpleAsyncResult *simple;
AlphabetIndexContext *context;
@@ -2706,10 +2733,10 @@ e_book_client_cursor_set_alphabetic_index_finish (EBookClientCursor *cursor,
* Since: 3.12
*/
gboolean
-e_book_client_cursor_set_alphabetic_index_sync (EBookClientCursor *cursor,
- gint index,
- GCancellable *cancellable,
- GError **error)
+e_book_client_cursor_set_alphabetic_index_sync (EBookClientCursor *cursor,
+ gint index,
+ GCancellable *cancellable,
+ GError **error)
{
guint new_total = 0, new_position = 0;
gboolean success;
@@ -2717,8 +2744,9 @@ e_book_client_cursor_set_alphabetic_index_sync (EBookClientCursor *cursor,
g_return_val_if_fail (E_IS_BOOK_CLIENT_CURSOR (cursor), FALSE);
g_return_val_if_fail (index >= 0 && index < cursor->priv->n_labels, FALSE);
- success = set_alphabetic_index_sync_internal (cursor, index, cursor->priv->locale,
- &new_total, &new_position, cancellable, error);
+ success = set_alphabetic_index_sync_internal (
+ cursor, index, cursor->priv->locale,
+ &new_total, &new_position, cancellable, error);
/* If we are in the thread where the cursor was created,
* then synchronize the new total & position right away
@@ -2754,8 +2782,8 @@ e_book_client_cursor_set_alphabetic_index_sync (EBookClientCursor *cursor,
* Since: 3.12
*/
gint
-e_book_client_cursor_get_contact_alphabetic_index (EBookClientCursor *cursor,
- EContact *contact)
+e_book_client_cursor_get_contact_alphabetic_index (EBookClientCursor *cursor,
+ EContact *contact)
{
EBookClientCursorPrivate *priv;
EContactField field;
diff --git a/addressbook/libebook/e-book-client-cursor.h b/addressbook/libebook/e-book-client-cursor.h
index e8a5420..848f664 100644
--- a/addressbook/libebook/e-book-client-cursor.h
+++ b/addressbook/libebook/e-book-client-cursor.h
@@ -86,59 +86,70 @@ struct _EBookClientCursorClass {
void (* refresh) (EBookClientCursor *cursor);
};
-GType e_book_client_cursor_get_type (void) G_GNUC_CONST;
-struct _EBookClient *e_book_client_cursor_ref_client (EBookClientCursor *cursor);
-const gchar * const *e_book_client_cursor_get_alphabet (EBookClientCursor *cursor,
- gint *n_labels,
- gint *underflow,
- gint *inflow,
- gint *overflow);
-gint e_book_client_cursor_get_total (EBookClientCursor *cursor);
-gint e_book_client_cursor_get_position (EBookClientCursor *cursor);
-void e_book_client_cursor_set_sexp (EBookClientCursor *cursor,
- const gchar *sexp,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gboolean e_book_client_cursor_set_sexp_finish (EBookClientCursor *cursor,
- GAsyncResult *result,
- GError **error);
-gboolean e_book_client_cursor_set_sexp_sync (EBookClientCursor *cursor,
- const gchar *sexp,
- GCancellable *cancellable,
- GError **error);
-void e_book_client_cursor_step (EBookClientCursor *cursor,
- EBookCursorStepFlags flags,
- EBookCursorOrigin origin,
- gint count,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gint e_book_client_cursor_step_finish (EBookClientCursor *cursor,
- GAsyncResult *result,
- GSList **out_contacts,
- GError **error);
-gint e_book_client_cursor_step_sync (EBookClientCursor *cursor,
- EBookCursorStepFlags flags,
- EBookCursorOrigin origin,
- gint count,
- GSList **out_contacts,
- GCancellable *cancellable,
- GError **error);
-void e_book_client_cursor_set_alphabetic_index (EBookClientCursor *cursor,
- gint index,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gboolean e_book_client_cursor_set_alphabetic_index_finish (EBookClientCursor *cursor,
- GAsyncResult *result,
- GError **error);
-gboolean e_book_client_cursor_set_alphabetic_index_sync (EBookClientCursor *cursor,
- gint index,
- GCancellable *cancellable,
- GError **error);
-gint e_book_client_cursor_get_contact_alphabetic_index(EBookClientCursor *cursor,
- EContact *contact);
+GType e_book_client_cursor_get_type (void) G_GNUC_CONST;
+struct _EBookClient *
+ e_book_client_cursor_ref_client (EBookClientCursor *cursor);
+const gchar * const *
+ e_book_client_cursor_get_alphabet
+ (EBookClientCursor *cursor,
+ gint *n_labels,
+ gint *underflow,
+ gint *inflow,
+ gint *overflow);
+gint e_book_client_cursor_get_total (EBookClientCursor *cursor);
+gint e_book_client_cursor_get_position
+ (EBookClientCursor *cursor);
+void e_book_client_cursor_set_sexp (EBookClientCursor *cursor,
+ const gchar *sexp,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean e_book_client_cursor_set_sexp_finish
+ (EBookClientCursor *cursor,
+ GAsyncResult *result,
+ GError **error);
+gboolean e_book_client_cursor_set_sexp_sync
+ (EBookClientCursor *cursor,
+ const gchar *sexp,
+ GCancellable *cancellable,
+ GError **error);
+void e_book_client_cursor_step (EBookClientCursor *cursor,
+ EBookCursorStepFlags flags,
+ EBookCursorOrigin origin,
+ gint count,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gint e_book_client_cursor_step_finish
+ (EBookClientCursor *cursor,
+ GAsyncResult *result,
+ GSList **out_contacts,
+ GError **error);
+gint e_book_client_cursor_step_sync (EBookClientCursor *cursor,
+ EBookCursorStepFlags flags,
+ EBookCursorOrigin origin,
+ gint count,
+ GSList **out_contacts,
+ GCancellable *cancellable,
+ GError **error);
+void e_book_client_cursor_set_alphabetic_index
+ (EBookClientCursor *cursor,
+ gint index,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean e_book_client_cursor_set_alphabetic_index_finish
+ (EBookClientCursor *cursor,
+ GAsyncResult *result,
+ GError **error);
+gboolean e_book_client_cursor_set_alphabetic_index_sync
+ (EBookClientCursor *cursor,
+ gint index,
+ GCancellable *cancellable,
+ GError **error);
+gint e_book_client_cursor_get_contact_alphabetic_index
+ (EBookClientCursor *cursor,
+ EContact *contact);
G_END_DECLS
diff --git a/addressbook/libebook/e-book-client.c b/addressbook/libebook/e-book-client.c
index 8ab9698..e0246c5 100644
--- a/addressbook/libebook/e-book-client.c
+++ b/addressbook/libebook/e-book-client.c
@@ -114,7 +114,6 @@ static void e_book_client_async_initable_init
static void book_client_set_locale (EBookClient *client,
const gchar *locale);
-
enum {
PROP_0,
PROP_LOCALE
@@ -471,13 +470,13 @@ book_client_emit_backend_property_changed_idle_cb (gpointer user_data)
/* XXX Despite appearances, this function does not block. */
e_client_get_backend_property_sync (
- client,
+ client,
signal_closure->property_name,
&prop_value, NULL, NULL);
if (prop_value != NULL) {
g_signal_emit_by_name (
- client,
+ client,
"backend-property-changed",
signal_closure->property_name,
prop_value);
@@ -1004,8 +1003,9 @@ book_client_init_in_dbus_thread (GSimpleAsyncResult *simple,
g_object_notify (G_OBJECT (proxy), "writable");
g_object_notify (G_OBJECT (proxy), "capabilities");
- book_client_set_locale (E_BOOK_CLIENT (client),
- e_dbus_address_book_get_locale (priv->dbus_proxy));
+ book_client_set_locale (
+ E_BOOK_CLIENT (client),
+ e_dbus_address_book_get_locale (priv->dbus_proxy));
g_object_unref (connection);
}
@@ -1078,9 +1078,9 @@ book_client_initable_init_finish (GAsyncInitable *initable,
static void
book_client_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
EBookClient *book_client;
@@ -1877,9 +1877,10 @@ book_client_add_contact_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -2048,9 +2049,10 @@ book_client_add_contacts_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -2260,9 +2262,10 @@ book_client_modify_contact_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -2390,9 +2393,10 @@ book_client_modify_contacts_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -2548,9 +2552,10 @@ book_client_remove_contact_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -2681,9 +2686,10 @@ book_client_remove_contact_by_uid_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -2811,9 +2817,10 @@ book_client_remove_contacts_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -2968,9 +2975,10 @@ book_client_get_contact_thread (GSimpleAsyncResult *simple,
&async_context->contact,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -3005,7 +3013,7 @@ e_book_client_get_contact (EBookClient *client,
g_return_if_fail (uid != NULL);
async_context = g_slice_new0 (AsyncContext);
- async_context->uid = g_strdup (uid);
+ async_context->uid = g_strdup (uid);
simple = g_simple_async_result_new (
G_OBJECT (client), callback, user_data,
@@ -3162,9 +3170,10 @@ book_client_get_contacts_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -3379,9 +3388,10 @@ book_client_get_contacts_uids_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -3785,13 +3795,13 @@ e_book_client_get_view_sync (EBookClient *client,
/* Helper for e_book_client_get_cursor() */
static const gchar **
sort_param_to_strv (gpointer param,
- gint n_fields,
- gboolean keys)
+ gint n_fields,
+ gboolean keys)
{
const gchar **array;
gint i;
- array = (const gchar **)g_new0 (gchar *, n_fields + 1);
+ array = (const gchar **) g_new0 (gchar *, n_fields + 1);
/* string arrays are shallow allocated, the strings themselves
* are intern strings and don't need to be dupped.
@@ -3799,14 +3809,15 @@ sort_param_to_strv (gpointer param,
for (i = 0; i < n_fields; i++) {
if (keys) {
- EContactField *fields = (EContactField *)param;
+ EContactField *fields = (EContactField *) param;
array[i] = e_contact_field_name (fields[i]);
} else {
- EBookCursorSortType *types = (EBookCursorSortType *)param;
+ EBookCursorSortType *types = (EBookCursorSortType *) param;
- array[i] = e_enum_to_string (E_TYPE_BOOK_CURSOR_SORT_TYPE,
- types[i]);
+ array[i] = e_enum_to_string (
+ E_TYPE_BOOK_CURSOR_SORT_TYPE,
+ types[i]);
}
}
@@ -3823,7 +3834,7 @@ void book_client_delete_direct_cursor (EBookClient *client,
void
book_client_delete_direct_cursor (EBookClient *client,
- EDataBookCursor *cursor)
+ EDataBookCursor *cursor)
{
g_return_if_fail (E_IS_BOOK_CLIENT (client));
g_return_if_fail (E_IS_DATA_BOOK_CURSOR (cursor));
@@ -3833,15 +3844,15 @@ book_client_delete_direct_cursor (EBookClient *client,
return;
}
- e_book_backend_delete_cursor (client->priv->direct_backend,
- cursor, NULL);
+ e_book_backend_delete_cursor (
+ client->priv->direct_backend,
+ cursor, NULL);
}
-
static void
book_client_get_cursor_in_dbus_thread (GSimpleAsyncResult *simple,
- GObject *source_object,
- GCancellable *cancellable)
+ GObject *source_object,
+ GCancellable *cancellable)
{
EBookClient *client = E_BOOK_CLIENT (source_object);
AsyncContext *async_context;
@@ -3852,29 +3863,37 @@ book_client_get_cursor_in_dbus_thread (GSimpleAsyncResult *simple,
const gchar **sort_types;
async_context = g_simple_async_result_get_op_res_gpointer (simple);
- sort_fields = sort_param_to_strv (async_context->sort_fields, async_context->n_sort_fields, TRUE);
- sort_types = sort_param_to_strv (async_context->sort_types, async_context->n_sort_fields, FALSE);
- /* Direct Read Access cursor don't need any
- * D-Bus connection themselves, just give them
- * an EDataBookCursor directly
- */
+ sort_fields = sort_param_to_strv (
+ async_context->sort_fields,
+ async_context->n_sort_fields, TRUE);
+ sort_types = sort_param_to_strv (
+ async_context->sort_types,
+ async_context->n_sort_fields, FALSE);
+
+ /* Direct Read Access cursor don't need any D-Bus connection
+ * themselves, just give them an EDataBookCursor directly. */
if (client->priv->direct_backend) {
EDataBookCursor *cursor;
- cursor = e_book_backend_create_cursor (client->priv->direct_backend,
- async_context->sort_fields,
- async_context->sort_types,
- async_context->n_sort_fields,
- &local_error);
-
- if (cursor) {
- if (!e_data_book_cursor_set_sexp (cursor,
- async_context->sexp,
- cancellable, &local_error)) {
- e_book_backend_delete_cursor (client->priv->direct_backend,
- cursor,
- NULL);
+ cursor = e_book_backend_create_cursor (
+ client->priv->direct_backend,
+ async_context->sort_fields,
+ async_context->sort_types,
+ async_context->n_sort_fields,
+ &local_error);
+
+ if (cursor != NULL) {
+ e_data_book_cursor_set_sexp (
+ cursor,
+ async_context->sexp,
+ cancellable, &local_error);
+
+ if (local_error != NULL) {
+ e_book_backend_delete_cursor (
+ client->priv->direct_backend,
+ cursor,
+ NULL);
cursor = NULL;
}
}
@@ -3882,7 +3901,7 @@ book_client_get_cursor_in_dbus_thread (GSimpleAsyncResult *simple,
if (cursor != NULL) {
EBookClientCursor *client_cursor;
- /* The client cursor will take a ref, but
+ /* The client cursor will take a ref, but
* e_book_backend_create_cursor() returns
* a pointer to a cursor owned by the backend,
* don't unref the returned pointer here.
@@ -3909,8 +3928,8 @@ book_client_get_cursor_in_dbus_thread (GSimpleAsyncResult *simple,
e_dbus_address_book_call_get_cursor_sync (
client->priv->dbus_proxy, utf8_sexp,
- (const gchar *const *)sort_fields,
- (const gchar *const *)sort_types,
+ (const gchar *const *) sort_fields,
+ (const gchar *const *) sort_types,
&object_path, cancellable, &local_error);
g_free (utf8_sexp);
@@ -3964,14 +3983,14 @@ book_client_get_cursor_in_dbus_thread (GSimpleAsyncResult *simple,
*/
static void
e_book_client_get_cursor_with_context (EBookClient *client,
- const gchar *sexp,
- const EContactField *sort_fields,
- const EBookCursorSortType *sort_types,
- guint n_fields,
- GMainContext *context,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+ const gchar *sexp,
+ const EContactField *sort_fields,
+ const EBookCursorSortType *sort_types,
+ guint n_fields,
+ GMainContext *context,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
GSimpleAsyncResult *simple;
AsyncContext *async_context;
@@ -4026,25 +4045,26 @@ e_book_client_get_cursor_with_context (EBookClient *client,
*/
void
e_book_client_get_cursor (EBookClient *client,
- const gchar *sexp,
- const EContactField *sort_fields,
- const EBookCursorSortType *sort_types,
- guint n_fields,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+ const gchar *sexp,
+ const EContactField *sort_fields,
+ const EBookCursorSortType *sort_types,
+ guint n_fields,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
GMainContext *context;
context = g_main_context_ref_thread_default ();
- e_book_client_get_cursor_with_context (client, sexp,
- sort_fields,
- sort_types,
- n_fields,
- context,
- cancellable,
- callback,
- user_data);
+ e_book_client_get_cursor_with_context (
+ client, sexp,
+ sort_fields,
+ sort_types,
+ n_fields,
+ context,
+ cancellable,
+ callback,
+ user_data);
g_main_context_unref (context);
}
@@ -4066,9 +4086,9 @@ e_book_client_get_cursor (EBookClient *client,
*/
gboolean
e_book_client_get_cursor_finish (EBookClient *client,
- GAsyncResult *result,
- EBookClientCursor **out_cursor,
- GError **error)
+ GAsyncResult *result,
+ EBookClientCursor **out_cursor,
+ GError **error)
{
GSimpleAsyncResult *simple;
AsyncContext *async_context;
@@ -4117,13 +4137,13 @@ e_book_client_get_cursor_finish (EBookClient *client,
*/
gboolean
e_book_client_get_cursor_sync (EBookClient *client,
- const gchar *sexp,
- const EContactField *sort_fields,
- const EBookCursorSortType *sort_types,
- guint n_fields,
- EBookClientCursor **out_cursor,
- GCancellable *cancellable,
- GError **error)
+ const gchar *sexp,
+ const EContactField *sort_fields,
+ const EBookCursorSortType *sort_types,
+ guint n_fields,
+ EBookClientCursor **out_cursor,
+ GCancellable *cancellable,
+ GError **error)
{
EAsyncClosure *closure;
GAsyncResult *result;
@@ -4141,13 +4161,14 @@ e_book_client_get_cursor_sync (EBookClient *client,
closure = e_async_closure_new ();
- e_book_client_get_cursor_with_context (client, sexp,
- sort_fields,
- sort_types,
- n_fields,
- context,
- cancellable,
- e_async_closure_callback, closure);
+ e_book_client_get_cursor_with_context (
+ client, sexp,
+ sort_fields,
+ sort_types,
+ n_fields,
+ context,
+ cancellable,
+ e_async_closure_callback, closure);
g_main_context_unref (context);
@@ -4163,12 +4184,12 @@ e_book_client_get_cursor_sync (EBookClient *client,
static void
book_client_set_locale (EBookClient *client,
- const gchar *locale)
+ const gchar *locale)
{
if (g_strcmp0 (client->priv->locale, locale) != 0) {
g_free (client->priv->locale);
client->priv->locale = g_strdup (locale);
-
+
g_object_notify (G_OBJECT (client), "locale");
}
}
diff --git a/addressbook/libebook/e-book-client.h b/addressbook/libebook/e-book-client.h
index fa0d396..79eabac 100644
--- a/addressbook/libebook/e-book-client.h
+++ b/addressbook/libebook/e-book-client.h
@@ -72,8 +72,8 @@
G_BEGIN_DECLS
-typedef struct _EBookClient EBookClient;
-typedef struct _EBookClientClass EBookClientClass;
+typedef struct _EBookClient EBookClient;
+typedef struct _EBookClientClass EBookClientClass;
typedef struct _EBookClientPrivate EBookClientPrivate;
/**
@@ -112,8 +112,8 @@ void e_book_client_connect (ESource *source,
gpointer user_data);
EClient * e_book_client_connect_finish (GAsyncResult *result,
GError **error);
-EClient * e_book_client_connect_direct_sync
- (ESourceRegistry *registry,
+EClient * e_book_client_connect_direct_sync
+ (ESourceRegistry *registry,
ESource *source,
GCancellable *cancellable,
GError **error);
@@ -122,7 +122,7 @@ void e_book_client_connect_direct (ESource *source,
GAsyncReadyCallback callback,
gpointer user_data);
EClient * e_book_client_connect_direct_finish
- (GAsyncResult *result,
+ (GAsyncResult *result,
GError **error);
gboolean e_book_client_get_self (ESourceRegistry *registry,
EContact **out_contact,
@@ -313,8 +313,7 @@ gboolean e_book_client_get_cursor_sync (EBookClient *client,
EBookClientCursor **out_cursor,
GCancellable *cancellable,
GError **error);
-const gchar *e_book_client_get_locale (EBookClient *client);
-
+const gchar * e_book_client_get_locale (EBookClient *client);
#ifndef EDS_DISABLE_DEPRECATED
/**
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index 018b98c..78a8570 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -1073,9 +1073,10 @@ get_contact_reply (GObject *source_object,
E_BOOK_CLIENT (source_object), result, &contact, &error)) {
if (!error)
- error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (cb != NULL && error == NULL)
diff --git a/addressbook/libebook/e-destination.c b/addressbook/libebook/e-destination.c
index 2fa08d6..a6c5942 100644
--- a/addressbook/libebook/e-destination.c
+++ b/addressbook/libebook/e-destination.c
@@ -197,19 +197,19 @@ e_destination_copy (const EDestination *dest)
new_dest = e_destination_new ();
- new_dest->priv->source_uid = g_strdup (dest->priv->source_uid);
- new_dest->priv->contact_uid = g_strdup (dest->priv->contact_uid);
- new_dest->priv->name = g_strdup (dest->priv->name);
- new_dest->priv->email = g_strdup (dest->priv->email);
- new_dest->priv->addr = g_strdup (dest->priv->addr);
- new_dest->priv->email_num = dest->priv->email_num;
- new_dest->priv->ignored = dest->priv->ignored;
+ new_dest->priv->source_uid = g_strdup (dest->priv->source_uid);
+ new_dest->priv->contact_uid = g_strdup (dest->priv->contact_uid);
+ new_dest->priv->name = g_strdup (dest->priv->name);
+ new_dest->priv->email = g_strdup (dest->priv->email);
+ new_dest->priv->addr = g_strdup (dest->priv->addr);
+ new_dest->priv->email_num = dest->priv->email_num;
+ new_dest->priv->ignored = dest->priv->ignored;
if (dest->priv->contact)
new_dest->priv->contact = g_object_ref (dest->priv->contact);
new_dest->priv->html_mail_override = dest->priv->html_mail_override;
- new_dest->priv->wants_html_mail = dest->priv->wants_html_mail;
+ new_dest->priv->wants_html_mail = dest->priv->wants_html_mail;
/* deep copy, recursively copy our children */
for (iter = dest->priv->list_dests; iter != NULL; iter = g_list_next (iter)) {
@@ -1101,7 +1101,7 @@ e_destination_get_textrep (const EDestination *dest,
if (dest->priv->raw)
return dest->priv->raw;
- name = e_destination_get_name (dest);
+ name = e_destination_get_name (dest);
email = e_destination_get_email (dest);
if (e_destination_from_contact (dest) && name != NULL && (!include_email || !email || !*email))
@@ -1664,7 +1664,7 @@ e_destination_exportv (EDestination **destv)
if (destv == NULL || *destv == NULL)
return NULL;
- destv_doc = xmlNewDoc ((xmlChar *) XML_DEFAULT_VERSION);
+ destv_doc = xmlNewDoc ((xmlChar *) XML_DEFAULT_VERSION);
destv_node = xmlNewNode (NULL, (xmlChar *)"destinations");
xmlDocSetRootElement (destv_doc, destv_node);
diff --git a/addressbook/libebook/e-error.h b/addressbook/libebook/e-error.h
index 0c5655c..6b08733 100644
--- a/addressbook/libebook/e-error.h
+++ b/addressbook/libebook/e-error.h
@@ -11,23 +11,23 @@
*
* Since: 2.30
**/
-#define e_return_error_if_fail(expr,error_code) G_STMT_START{ \
- if G_LIKELY (expr) { } else \
- { \
- g_log (G_LOG_DOMAIN, \
- G_LOG_LEVEL_CRITICAL, \
- "file %s: line %d (%s): assertion `%s' failed", \
- __FILE__, \
- __LINE__, \
- G_STRFUNC, \
- #expr); \
- g_set_error (error, E_BOOK_ERROR, (error_code), \
- "file %s: line %d (%s): assertion `%s' failed", \
- __FILE__, \
- __LINE__, \
- G_STRFUNC, \
- #expr); \
- return FALSE; \
+#define e_return_error_if_fail(expr,error_code) G_STMT_START{ \
+ if G_LIKELY (expr) { } else \
+ { \
+ g_log (G_LOG_DOMAIN, \
+ G_LOG_LEVEL_CRITICAL, \
+ "file %s: line %d (%s): assertion `%s' failed", \
+ __FILE__, \
+ __LINE__, \
+ G_STRFUNC, \
+ #expr); \
+ g_set_error (error, E_BOOK_ERROR, (error_code), \
+ "file %s: line %d (%s): assertion `%s' failed", \
+ __FILE__, \
+ __LINE__, \
+ G_STRFUNC, \
+ #expr); \
+ return FALSE; \
} \
} G_STMT_END
@@ -39,38 +39,38 @@
* Since: 2.32
**/
#define e_return_async_error_if_fail(expr, error) G_STMT_START { \
- if G_LIKELY (expr) {} else { \
- g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \
- "file %s: line %d (%s): assertion `%s' failed", \
- __FILE__, __LINE__, G_STRFUNC, #expr); \
- cb (book, error, closure); \
- return TRUE; \
- } \
+ if G_LIKELY (expr) {} else { \
+ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \
+ "file %s: line %d (%s): assertion `%s' failed", \
+ __FILE__, __LINE__, G_STRFUNC, #expr); \
+ cb (book, error, closure); \
+ return TRUE; \
+ } \
} G_STMT_END
#define e_return_async_error_val_if_fail(expr, error) G_STMT_START { \
- if G_LIKELY (expr) {} else { \
- g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \
- "file %s: line %d (%s): assertion `%s' failed", \
- __FILE__, __LINE__, G_STRFUNC, #expr); \
- cb (book, error, NULL, closure); \
- return TRUE; \
- } \
+ if G_LIKELY (expr) {} else { \
+ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \
+ "file %s: line %d (%s): assertion `%s' failed", \
+ __FILE__, __LINE__, G_STRFUNC, #expr); \
+ cb (book, error, NULL, closure); \
+ return TRUE; \
+ } \
} G_STMT_END
-#define e_return_ex_async_error_if_fail(expr, error) G_STMT_START { \
- if G_LIKELY (expr) {} else { \
- GError *err; \
- g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \
- "file %s: line %d (%s): assertion `%s' failed", \
- __FILE__, __LINE__, G_STRFUNC, #expr); \
- err = g_error_new (E_BOOK_ERROR, (error), \
- "file %s: line %d (%s): assertion `%s' failed", \
- __FILE__, __LINE__, G_STRFUNC, #expr); \
- cb (book, err, closure); \
- g_error_free (err); \
- return FALSE; \
- } \
+#define e_return_ex_async_error_if_fail(expr, error) G_STMT_START { \
+ if G_LIKELY (expr) {} else { \
+ GError *err; \
+ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \
+ "file %s: line %d (%s): assertion `%s' failed", \
+ __FILE__, __LINE__, G_STRFUNC, #expr); \
+ err = g_error_new (E_BOOK_ERROR, (error), \
+ "file %s: line %d (%s): assertion `%s' failed", \
+ __FILE__, __LINE__, G_STRFUNC, #expr); \
+ cb (book, err, closure); \
+ g_error_free (err); \
+ return FALSE; \
+ } \
} G_STMT_END
/**
@@ -80,17 +80,17 @@
*
* Since: 2.32
**/
-#define e_return_ex_async_error_val_if_fail(expr, error) G_STMT_START { \
- if G_LIKELY (expr) {} else { \
- GError *err; \
- g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \
- "file %s: line %d (%s): assertion `%s' failed", \
- __FILE__, __LINE__, G_STRFUNC, #expr); \
- err = g_error_new (E_BOOK_ERROR, (error), \
- "file %s: line %d (%s): assertion `%s' failed", \
- __FILE__, __LINE__, G_STRFUNC, #expr); \
- cb (book, err, NULL, closure); \
- g_error_free (err); \
- return TRUE; \
- } \
+#define e_return_ex_async_error_val_if_fail(expr, error) G_STMT_START { \
+ if G_LIKELY (expr) {} else { \
+ GError *err; \
+ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, \
+ "file %s: line %d (%s): assertion `%s' failed", \
+ __FILE__, __LINE__, G_STRFUNC, #expr); \
+ err = g_error_new (E_BOOK_ERROR, (error), \
+ "file %s: line %d (%s): assertion `%s' failed", \
+ __FILE__, __LINE__, G_STRFUNC, #expr); \
+ cb (book, err, NULL, closure); \
+ g_error_free (err); \
+ return TRUE; \
+ } \
} G_STMT_END
diff --git a/addressbook/libedata-book/e-book-backend-sexp.c b/addressbook/libedata-book/e-book-backend-sexp.c
index 51da41a..b6dd34a 100644
--- a/addressbook/libedata-book/e-book-backend-sexp.c
+++ b/addressbook/libedata-book/e-book-backend-sexp.c
@@ -23,7 +23,6 @@
* 02110-1301, USA.
*/
-
/**
* SECTION: e-book-backend-sexp
* @include: libedata-book/libedata-book.h
@@ -275,7 +274,7 @@ compare_address (EContact *contact,
for (i = E_CONTACT_FIRST_ADDRESS_ID; i <= E_CONTACT_LAST_ADDRESS_ID; i++) {
EContactAddress *address = e_contact_get (contact, i);
if (address) {
- rv = (address->po && compare (address->po, str, region)) ||
+ rv = (address->po && compare (address->po, str, region)) ||
(address->street && compare (address->street, str, region)) ||
(address->ext && compare (address->ext, str, region)) ||
(address->locality && compare (address->locality, str, region)) ||
@@ -560,7 +559,7 @@ try_contains_word (const gchar *s1,
w = word->data;
first_w_char = g_utf8_get_char (w->str);
- o = s1;
+ o = s1;
for (p = e_util_unicode_get_utf8 (o, &unival); p && unival; p = e_util_unicode_get_utf8 (p, &unival))
{
if (unival == first_w_char) {
gunichar unival2;
diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb.c
b/addressbook/libedata-book/e-book-backend-sqlitedb.c
index 296c88c..91c9d8c 100644
--- a/addressbook/libedata-book/e-book-backend-sqlitedb.c
+++ b/addressbook/libedata-book/e-book-backend-sqlitedb.c
@@ -22,7 +22,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
/**
* SECTION: e-book-backend-sqlitedb
* @include: libedata-book/libedata-book.h
@@ -52,18 +51,18 @@
#define d(x)
#if d(1)+0
-# define LOCK_MUTEX(mutex) \
- G_STMT_START { \
- g_message ("%s: DB Locking ", G_STRFUNC); \
- g_mutex_lock (mutex); \
- g_message ("%s: DB Locked ", G_STRFUNC); \
+# define LOCK_MUTEX(mutex) \
+ G_STMT_START { \
+ g_message ("%s: DB Locking ", G_STRFUNC); \
+ g_mutex_lock (mutex); \
+ g_message ("%s: DB Locked ", G_STRFUNC); \
} G_STMT_END
-# define UNLOCK_MUTEX(mutex) \
- G_STMT_START { \
- g_message ("%s: Unlocking ", G_STRFUNC); \
- g_mutex_unlock (mutex); \
- g_message ("%s: DB Unlocked ", G_STRFUNC); \
+# define UNLOCK_MUTEX(mutex) \
+ G_STMT_START { \
+ g_message ("%s: Unlocking ", G_STRFUNC); \
+ g_mutex_unlock (mutex); \
+ g_message ("%s: DB Unlocked ", G_STRFUNC); \
} G_STMT_END
#else
# define LOCK_MUTEX(mutex) g_mutex_lock (mutex)
@@ -85,7 +84,7 @@
typedef enum {
INDEX_PREFIX = (1 << 0),
INDEX_SUFFIX = (1 << 1),
- INDEX_PHONE = (1 << 2)
+ INDEX_PHONE = (1 << 2)
} IndexFlags;
typedef struct {
@@ -183,7 +182,7 @@ summary_dbname_from_field (EBookBackendSqliteDB *ebsdb,
static gint
summary_index_from_field (EBookBackendSqliteDB *ebsdb,
- EContactField field)
+ EContactField field)
{
gint i;
@@ -516,11 +515,11 @@ typedef struct {
static gint
find_locale_columns (gpointer data,
- gint n_cols,
- gchar **cols,
- gchar **name)
+ gint n_cols,
+ gchar **cols,
+ gchar **name)
{
- LocaleColumns *columns = (LocaleColumns *)data;
+ LocaleColumns *columns = (LocaleColumns *) data;
gint i;
for (i = 0; i < n_cols; i++) {
@@ -569,7 +568,7 @@ create_folders_table (EBookBackendSqliteDB *ebsdb,
goto rollback;
/* Create a child table to store key/value pairs for a folder. */
- stmt = "CREATE TABLE IF NOT EXISTS keys"
+ stmt = "CREATE TABLE IF NOT EXISTS keys"
"( key TEXT PRIMARY KEY, value TEXT,"
" folder_id TEXT REFERENCES folders)";
if (!book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL, error))
@@ -768,7 +767,7 @@ static gboolean
add_folder_into_db (EBookBackendSqliteDB *ebsdb,
const gchar *folderid,
const gchar *folder_name,
- gboolean *already_exists,
+ gboolean *already_exists,
GError **error)
{
gchar *stmt;
@@ -993,7 +992,7 @@ static gboolean
create_contacts_table (EBookBackendSqliteDB *ebsdb,
const gchar *folderid,
gint previous_schema,
- gboolean already_exists,
+ gboolean already_exists,
GError **error)
{
gint i;
@@ -1089,7 +1088,7 @@ create_contacts_table (EBookBackendSqliteDB *ebsdb,
g_string_append (string, "_localized TEXT");
success = book_backend_sql_exec (
- ebsdb->priv->db, string->str, NULL, NULL , error);
+ ebsdb->priv->db, string->str, NULL, NULL , error);
g_string_free (string, TRUE);
}
@@ -1162,11 +1161,11 @@ create_contacts_table (EBookBackendSqliteDB *ebsdb,
/* For any indexed column, also index the localized column */
if (ebsdb->priv->summary_fields[i].field != E_CONTACT_REV) {
tmp = g_strdup_printf (
- "INDEX_%s_localized_%s",
+ "INDEX_%s_localized_%s",
summary_dbname_from_field (ebsdb,
ebsdb->priv->summary_fields[i].field),
folderid);
stmt = sqlite3_mprintf (
- "CREATE INDEX IF NOT EXISTS %Q ON %Q (%s_localized)", tmp, folderid,
+ "CREATE INDEX IF NOT EXISTS %Q ON %Q (%s_localized)", tmp, folderid,
summary_dbname_from_field (ebsdb,
ebsdb->priv->summary_fields[i].field));
success = book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL, error);
sqlite3_free (stmt);
@@ -1733,10 +1732,10 @@ append_summary_field (GArray *array,
if (type == E_TYPE_CONTACT_ATTR_LIST && have_attr_list)
*have_attr_list = TRUE;
- new_field.field = field;
+ new_field.field = field;
new_field.dbname = dbname;
- new_field.type = type;
- new_field.index = 0;
+ new_field.type = type;
+ new_field.index = 0;
g_array_append_val (array, new_field);
return &g_array_index (array, SummaryField, array->len - 1);
@@ -1830,7 +1829,7 @@ e_book_backend_sqlitedb_new_full (const gchar *path,
GArray *summary_fields;
gint n_fields = 0, n_indexed_fields = 0, i;
- fields = e_source_backend_summary_setup_get_summary_fields (setup, &n_fields);
+ fields = e_source_backend_summary_setup_get_summary_fields (setup, &n_fields);
indexed_fields = e_source_backend_summary_setup_get_indexed_fields (setup, &index_types,
&n_indexed_fields);
/* No specified summary fields indicates the default summary configuration should be used */
@@ -1996,7 +1995,7 @@ e_book_backend_sqlitedb_unlock_updates (EBookBackendSqliteDB *ebsdb,
* Deprecated: 3.12: Use #EBookSqlite instead
*/
ECollator *
-e_book_backend_sqlitedb_ref_collator(EBookBackendSqliteDB *ebsdb)
+e_book_backend_sqlitedb_ref_collator (EBookBackendSqliteDB *ebsdb)
{
g_return_val_if_fail (E_IS_BOOK_BACKEND_SQLITEDB (ebsdb), NULL);
@@ -2863,8 +2862,8 @@ e_book_backend_sqlitedb_is_summary_fields (GHashTable *fields_of_interest)
g_hash_table_iter_init (&iter, fields_of_interest);
while (g_hash_table_iter_next (&iter, &key, &value)) {
const gchar *field_name = key;
- EContactField field = e_contact_field_id (field_name);
- gboolean found = FALSE;
+ EContactField field = e_contact_field_id (field_name);
+ gboolean found = FALSE;
for (i = 0; i < G_N_ELEMENTS (default_summary_fields); i++) {
if (field == default_summary_fields[i]) {
@@ -2917,7 +2916,7 @@ e_book_backend_sqlitedb_check_summary_fields (EBookBackendSqliteDB *ebsdb,
g_hash_table_iter_init (&iter, fields_of_interest);
while (g_hash_table_iter_next (&iter, &key, &value)) {
const gchar *field_name = key;
- EContactField field = e_contact_field_id (field_name);
+ EContactField field = e_contact_field_id (field_name);
if (summary_dbname_from_field (ebsdb, field) == NULL) {
summary_fields = FALSE;
@@ -3082,10 +3081,10 @@ e_book_backend_sqlitedb_get_vcard_string (EBookBackendSqliteDB *ebsdb,
}
enum {
- CHECK_IS_SUMMARY = (1 << 0),
+ CHECK_IS_SUMMARY = (1 << 0),
CHECK_IS_LIST_ATTR = (1 << 1),
- CHECK_UNSUPPORTED = (1 << 2),
- CHECK_INVALID = (1 << 3)
+ CHECK_UNSUPPORTED = (1 << 2),
+ CHECK_INVALID = (1 << 3)
};
static ESExpResult *
@@ -3469,10 +3468,10 @@ typedef enum {
} MatchType;
typedef enum {
- CONVERT_NOTHING = 0,
+ CONVERT_NOTHING = 0,
CONVERT_NORMALIZE = (1 << 0),
- CONVERT_REVERSE = (1 << 1),
- CONVERT_PHONE = (1 << 2)
+ CONVERT_REVERSE = (1 << 1),
+ CONVERT_PHONE = (1 << 2)
} ConvertFlags;
static gchar *
@@ -5263,10 +5262,10 @@ e_book_backend_sqlitedb_remove (EBookBackendSqliteDB *ebsdb,
static gboolean
upgrade_contacts_table (EBookBackendSqliteDB *ebsdb,
- const gchar *folderid,
- const gchar *region,
- const gchar *lc_collate,
- GError **error)
+ const gchar *folderid,
+ const gchar *region,
+ const gchar *lc_collate,
+ GError **error)
{
gchar *stmt;
gboolean success = FALSE;
@@ -5324,8 +5323,8 @@ upgrade_contacts_table (EBookBackendSqliteDB *ebsdb,
static gboolean
sqlitedb_set_locale_internal (EBookBackendSqliteDB *ebsdb,
- const gchar *locale,
- GError **error)
+ const gchar *locale,
+ GError **error)
{
EBookBackendSqliteDBPrivate *priv = ebsdb->priv;
ECollator *collator;
@@ -5371,9 +5370,9 @@ sqlitedb_set_locale_internal (EBookBackendSqliteDB *ebsdb,
*/
gboolean
e_book_backend_sqlitedb_set_locale (EBookBackendSqliteDB *ebsdb,
- const gchar *folderid,
- const gchar *lc_collate,
- GError **error)
+ const gchar *folderid,
+ const gchar *lc_collate,
+ GError **error)
{
gboolean success;
gchar *stmt;
@@ -5457,9 +5456,9 @@ e_book_backend_sqlitedb_set_locale (EBookBackendSqliteDB *ebsdb,
*/
gboolean
e_book_backend_sqlitedb_get_locale (EBookBackendSqliteDB *ebsdb,
- const gchar *folderid,
- gchar **locale_out,
- GError **error)
+ const gchar *folderid,
+ gchar **locale_out,
+ GError **error)
{
gchar *stmt;
gboolean success;
@@ -5505,7 +5504,7 @@ struct _CursorState {
struct _EbSdbCursor {
gchar *folderid; /* The folderid for this cursor */
- EBookBackendSExp *sexp; /* An EBookBackendSExp based on the query, used by
e_book_backend_sqlitedb_cursor_compare() */
+ EBookBackendSExp *sexp; /* An EBookBackendSExp based on the query, used by
e_book_backend_sqlitedb_cursor_compare () */
gchar *select_vcards; /* The first fragment when querying results */
gchar *select_count; /* The first fragment when querying contact counts */
gchar *query; /* The SQL query expression derived from the passed search expression */
@@ -5536,8 +5535,8 @@ static void cursor_state_set_from_vcard (EBookBackendSqliteDB *ebsdb,
const gchar *vcard);
static CursorState *
-cursor_state_copy (EbSdbCursor *cursor,
- CursorState *state)
+cursor_state_copy (EbSdbCursor *cursor,
+ CursorState *state)
{
CursorState *copy;
gint i;
@@ -5555,8 +5554,8 @@ cursor_state_copy (EbSdbCursor *cursor,
}
static void
-cursor_state_free (EbSdbCursor *cursor,
- CursorState *state)
+cursor_state_free (EbSdbCursor *cursor,
+ CursorState *state)
{
if (state) {
cursor_state_clear (cursor, state, EBSDB_CURSOR_ORIGIN_BEGIN);
@@ -5566,9 +5565,9 @@ cursor_state_free (EbSdbCursor *cursor,
}
static void
-cursor_state_clear (EbSdbCursor *cursor,
- CursorState *state,
- EbSdbCursorOrigin position)
+cursor_state_clear (EbSdbCursor *cursor,
+ CursorState *state,
+ EbSdbCursorOrigin position)
{
gint i;
@@ -5584,23 +5583,27 @@ cursor_state_clear (EbSdbCursor *cursor,
static void
cursor_state_set_from_contact (EBookBackendSqliteDB *ebsdb,
- EbSdbCursor *cursor,
- CursorState *state,
- EContact *contact)
+ EbSdbCursor *cursor,
+ CursorState *state,
+ EContact *contact)
{
gint i;
cursor_state_clear (cursor, state, EBSDB_CURSOR_ORIGIN_BEGIN);
for (i = 0; i < cursor->n_sort_fields; i++) {
- const gchar *string = e_contact_get_const (contact, cursor->sort_fields[i]);
+ const gchar *string;
- if (string)
- state->values[i] =
- e_collator_generate_key (ebsdb->priv->collator,
- string, NULL);
- else
+ string = e_contact_get_const (
+ contact, cursor->sort_fields[i]);
+
+ if (string != NULL) {
+ state->values[i] = e_collator_generate_key (
+ ebsdb->priv->collator,
+ string, NULL);
+ } else {
state->values[i] = g_strdup ("");
+ }
}
state->last_uid = e_contact_get (contact, E_CONTACT_UID);
@@ -5609,9 +5612,9 @@ cursor_state_set_from_contact (EBookBackendSqliteDB *ebsdb,
static void
cursor_state_set_from_vcard (EBookBackendSqliteDB *ebsdb,
- EbSdbCursor *cursor,
- CursorState *state,
- const gchar *vcard)
+ EbSdbCursor *cursor,
+ CursorState *state,
+ const gchar *vcard)
{
EContact *contact;
@@ -5622,9 +5625,9 @@ cursor_state_set_from_vcard (EBookBackendSqliteDB *ebsdb,
static void
ebsdb_cursor_setup_query (EBookBackendSqliteDB *ebsdb,
- EbSdbCursor *cursor,
- const gchar *sexp,
- gboolean query_with_list_attrs)
+ EbSdbCursor *cursor,
+ const gchar *sexp,
+ gboolean query_with_list_attrs)
{
gchar *stmt;
gchar *count_stmt;
@@ -5642,8 +5645,8 @@ ebsdb_cursor_setup_query (EBookBackendSqliteDB *ebsdb,
cursor->folderid, list_table);
count_stmt = sqlite3_mprintf ("SELECT count(DISTINCT summary.uid), vcard, bdata FROM %Q AS
summary "
- "LEFT OUTER JOIN %Q AS multi ON summary.uid = multi.uid",
- cursor->folderid, list_table);
+ "LEFT OUTER JOIN %Q AS multi ON summary.uid = multi.uid",
+ cursor->folderid, list_table);
g_free (list_table);
} else {
stmt = sqlite3_mprintf ("SELECT uid, vcard, bdata FROM %Q AS summary", cursor->folderid);
@@ -5657,19 +5660,19 @@ ebsdb_cursor_setup_query (EBookBackendSqliteDB *ebsdb,
if (sexp) {
cursor->query = sexp_to_sql_query (ebsdb, cursor->folderid, sexp);
- cursor->sexp = e_book_backend_sexp_new (sexp);
+ cursor->sexp = e_book_backend_sexp_new (sexp);
} else {
cursor->query = NULL;
- cursor->sexp = NULL;
+ cursor->sexp = NULL;
}
}
static gchar *
ebsdb_cursor_order_by_fragment (EBookBackendSqliteDB *ebsdb,
- EContactField *sort_fields,
- EBookCursorSortType *sort_types,
- guint n_sort_fields,
- gboolean reverse)
+ EContactField *sort_fields,
+ EBookCursorSortType *sort_types,
+ guint n_sort_fields,
+ gboolean reverse)
{
GString *string;
const gchar *field_name;
@@ -5684,28 +5687,31 @@ ebsdb_cursor_order_by_fragment (EBookBackendSqliteDB *ebsdb,
if (i > 0)
g_string_append (string, ", ");
- g_string_append_printf (string, "summary.%s_localized %s", field_name,
- reverse ?
- (sort_types[i] == E_BOOK_CURSOR_SORT_ASCENDING ? "DESC" : "ASC") :
- (sort_types[i] == E_BOOK_CURSOR_SORT_ASCENDING ? "ASC" : "DESC"));
+ g_string_append_printf (
+ string, "summary.%s_localized %s", field_name,
+ reverse ?
+ (sort_types[i] == E_BOOK_CURSOR_SORT_ASCENDING ? "DESC" : "ASC") :
+ (sort_types[i] == E_BOOK_CURSOR_SORT_ASCENDING ? "ASC" : "DESC"));
}
- /* Also order the UID, since it's our tie breaker, we must also order the UID field */
+ /* Also order the UID, since it's our tie
+ * breaker, we must also order the UID field. */
if (n_sort_fields > 0)
g_string_append (string, ", ");
- g_string_append_printf (string, "summary.uid %s", reverse ? "DESC" : "ASC");
+ g_string_append_printf (
+ string, "summary.uid %s", reverse ? "DESC" : "ASC");
return g_string_free (string, FALSE);
}
static EbSdbCursor *
ebsdb_cursor_new (EBookBackendSqliteDB *ebsdb,
- const gchar *folderid,
- const gchar *sexp,
- gboolean query_with_list_attrs,
- EContactField *sort_fields,
- EBookCursorSortType *sort_types,
- guint n_sort_fields)
+ const gchar *folderid,
+ const gchar *sexp,
+ gboolean query_with_list_attrs,
+ EContactField *sort_fields,
+ EBookCursorSortType *sort_types,
+ guint n_sort_fields)
{
EbSdbCursor *cursor = g_slice_new0 (EbSdbCursor);
@@ -5714,24 +5720,28 @@ ebsdb_cursor_new (EBookBackendSqliteDB *ebsdb,
/* Setup the initial query fragments */
ebsdb_cursor_setup_query (ebsdb, cursor, sexp, query_with_list_attrs);
- cursor->order = ebsdb_cursor_order_by_fragment (ebsdb,
- sort_fields,
- sort_types,
- n_sort_fields,
- FALSE);
- cursor->reverse_order = ebsdb_cursor_order_by_fragment (ebsdb,
- sort_fields,
- sort_types,
- n_sort_fields,
- TRUE);
+ cursor->order = ebsdb_cursor_order_by_fragment (
+ ebsdb,
+ sort_fields,
+ sort_types,
+ n_sort_fields,
+ FALSE);
+ cursor->reverse_order = ebsdb_cursor_order_by_fragment (
+ ebsdb,
+ sort_fields,
+ sort_types,
+ n_sort_fields,
+ TRUE);
/* Sort parameters */
- cursor->n_sort_fields = n_sort_fields;
- cursor->sort_fields = g_memdup (sort_fields, sizeof (EContactField) * n_sort_fields);
- cursor->sort_types = g_memdup (sort_types, sizeof (EBookCursorSortType) * n_sort_fields);
+ cursor->n_sort_fields = n_sort_fields;
+ cursor->sort_fields = g_memdup (
+ sort_fields, sizeof (EContactField) * n_sort_fields);
+ cursor->sort_types = g_memdup (
+ sort_types, sizeof (EBookCursorSortType) * n_sort_fields);
/* Cursor state */
- cursor->state.values = g_new0 (gchar *, n_sort_fields);
+ cursor->state.values = g_new0 (gchar *, n_sort_fields);
cursor->state.last_uid = NULL;
cursor->state.position = EBSDB_CURSOR_ORIGIN_BEGIN;
@@ -5741,8 +5751,10 @@ ebsdb_cursor_new (EBookBackendSqliteDB *ebsdb,
static void
ebsdb_cursor_free (EbSdbCursor *cursor)
{
- if (cursor) {
- cursor_state_clear (cursor, &(cursor->state), EBSDB_CURSOR_ORIGIN_BEGIN);
+ if (cursor != NULL) {
+ cursor_state_clear (
+ cursor, &(cursor->state),
+ EBSDB_CURSOR_ORIGIN_BEGIN);
g_free (cursor->state.values);
g_clear_object (&(cursor->sexp));
@@ -5759,17 +5771,17 @@ ebsdb_cursor_free (EbSdbCursor *cursor)
}
}
-#define GREATER_OR_LESS(cursor, index, reverse) \
- (reverse ? \
- (((EbSdbCursor *)cursor)->sort_types[index] == E_BOOK_CURSOR_SORT_ASCENDING ? '<' : '>') : \
- (((EbSdbCursor *)cursor)->sort_types[index] == E_BOOK_CURSOR_SORT_ASCENDING ? '>' : '<'))
+#define GREATER_OR_LESS(cursor, index, reverse) \
+ (reverse ? \
+ (((EbSdbCursor *) cursor)->sort_types[index] == E_BOOK_CURSOR_SORT_ASCENDING ? '<' : '>') : \
+ (((EbSdbCursor *) cursor)->sort_types[index] == E_BOOK_CURSOR_SORT_ASCENDING ? '>' : '<'))
static gchar *
ebsdb_cursor_constraints (EBookBackendSqliteDB *ebsdb,
- EbSdbCursor *cursor,
- CursorState *state,
- gboolean reverse,
- gboolean include_current_uid)
+ EbSdbCursor *cursor,
+ CursorState *state,
+ gboolean reverse,
+ gboolean include_current_uid)
{
GString *string;
const gchar *field_name;
@@ -5802,8 +5814,8 @@ ebsdb_cursor_constraints (EBookBackendSqliteDB *ebsdb,
gchar *stmt;
/* Break once we hit a NULL value */
- if ((i < cursor->n_sort_fields && state->values[i] == NULL) ||
- (i == cursor->n_sort_fields && state->last_uid == NULL))
+ if ((i < cursor->n_sort_fields && state->values[i] == NULL) ||
+ (i == cursor->n_sort_fields && state->last_uid == NULL))
break;
/* Between each qualifier, add an 'OR' */
@@ -5817,8 +5829,9 @@ ebsdb_cursor_constraints (EBookBackendSqliteDB *ebsdb,
for (j = 0; j < i; j++) {
field_name = summary_dbname_from_field (ebsdb, cursor->sort_fields[j]);
- stmt = sqlite3_mprintf ("summary.%s_localized = %Q",
- field_name, state->values[j]);
+ stmt = sqlite3_mprintf (
+ "summary.%s_localized = %Q",
+ field_name, state->values[j]);
g_string_append (string, stmt);
g_string_append (string, " AND ");
@@ -5837,15 +5850,17 @@ ebsdb_cursor_constraints (EBookBackendSqliteDB *ebsdb,
g_string_append_c (string, '(');
/* Append the UID tie breaker */
- stmt = sqlite3_mprintf ("summary.uid %c %Q",
- reverse ? '<' : '>',
- state->last_uid);
+ stmt = sqlite3_mprintf (
+ "summary.uid %c %Q",
+ reverse ? '<' : '>',
+ state->last_uid);
g_string_append (string, stmt);
sqlite3_free (stmt);
if (include_current_uid) {
- stmt = sqlite3_mprintf (" OR summary.uid = %Q",
- state->last_uid);
+ stmt = sqlite3_mprintf (
+ " OR summary.uid = %Q",
+ state->last_uid);
g_string_append (string, stmt);
g_string_append_c (string, ')');
sqlite3_free (stmt);
@@ -5870,18 +5885,20 @@ ebsdb_cursor_constraints (EBookBackendSqliteDB *ebsdb,
/* Append the final qualifier for this field */
field_name = summary_dbname_from_field (ebsdb, cursor->sort_fields[i]);
- stmt = sqlite3_mprintf ("summary.%s_localized %c %Q",
- field_name,
- GREATER_OR_LESS (cursor, i, reverse),
- state->values[i]);
+ stmt = sqlite3_mprintf (
+ "summary.%s_localized %c %Q",
+ field_name,
+ GREATER_OR_LESS (cursor, i, reverse),
+ state->values[i]);
g_string_append (string, stmt);
sqlite3_free (stmt);
if (include_exact_match) {
- stmt = sqlite3_mprintf (" OR summary.%s_localized = %Q",
- field_name, state->values[i]);
+ stmt = sqlite3_mprintf (
+ " OR summary.%s_localized = %Q",
+ field_name, state->values[i]);
g_string_append (string, stmt);
g_string_append_c (string, ')');
@@ -5898,9 +5915,9 @@ ebsdb_cursor_constraints (EBookBackendSqliteDB *ebsdb,
static gboolean
cursor_count_total_locked (EBookBackendSqliteDB *ebsdb,
- EbSdbCursor *cursor,
- gint *total,
- GError **error)
+ EbSdbCursor *cursor,
+ gint *total,
+ GError **error)
{
GString *query;
gboolean success;
@@ -5917,8 +5934,9 @@ cursor_count_total_locked (EBookBackendSqliteDB *ebsdb,
}
/* Execute the query */
- success = book_backend_sql_exec (ebsdb->priv->db, query->str,
- get_count_cb, total, error);
+ success = book_backend_sql_exec (
+ ebsdb->priv->db, query->str,
+ get_count_cb, total, error);
g_string_free (query, TRUE);
@@ -5927,9 +5945,9 @@ cursor_count_total_locked (EBookBackendSqliteDB *ebsdb,
static gboolean
cursor_count_position_locked (EBookBackendSqliteDB *ebsdb,
- EbSdbCursor *cursor,
- gint *position,
- GError **error)
+ EbSdbCursor *cursor,
+ gint *position,
+ GError **error)
{
GString *query;
gboolean success;
@@ -5956,11 +5974,11 @@ cursor_count_position_locked (EBookBackendSqliteDB *ebsdb,
/* Here we do a reverse query, we're looking for all the
* results leading up to the current cursor value, including
- * the cursor value
- */
- constraints = ebsdb_cursor_constraints (ebsdb, cursor,
- &(cursor->state),
- TRUE, TRUE);
+ * the cursor value. */
+ constraints = ebsdb_cursor_constraints (
+ ebsdb, cursor,
+ &(cursor->state),
+ TRUE, TRUE);
g_string_append_c (query, '(');
g_string_append (query, constraints);
@@ -5970,8 +5988,9 @@ cursor_count_position_locked (EBookBackendSqliteDB *ebsdb,
}
/* Execute the query */
- success = book_backend_sql_exec (ebsdb->priv->db, query->str,
- get_count_cb, position, error);
+ success = book_backend_sql_exec (
+ ebsdb->priv->db, query->str,
+ get_count_cb, position, error);
g_string_free (query, TRUE);
@@ -6000,12 +6019,12 @@ cursor_count_position_locked (EBookBackendSqliteDB *ebsdb,
*/
EbSdbCursor *
e_book_backend_sqlitedb_cursor_new (EBookBackendSqliteDB *ebsdb,
- const gchar *folderid,
- const gchar *sexp,
- EContactField *sort_fields,
- EBookCursorSortType *sort_types,
- guint n_sort_fields,
- GError **error)
+ const gchar *folderid,
+ const gchar *sexp,
+ EContactField *sort_fields,
+ EBookCursorSortType *sort_types,
+ guint n_sort_fields,
+ GError **error)
{
gboolean query_with_list_attrs = FALSE;
gint i;
@@ -6019,14 +6038,16 @@ e_book_backend_sqlitedb_cursor_new (EBookBackendSqliteDB *ebsdb,
/* We only support cursors for summary fields in the query */
if (sexp && !e_book_backend_sqlitedb_check_summary_query (ebsdb, sexp, &query_with_list_attrs)) {
- g_set_error (error, E_BOOK_SDB_ERROR, E_BOOK_SDB_ERROR_INVALID_QUERY,
- _("Only summary queries are supported by EbSdbCursor"));
+ g_set_error (
+ error, E_BOOK_SDB_ERROR, E_BOOK_SDB_ERROR_INVALID_QUERY,
+ _("Only summary queries are supported by EbSdbCursor"));
return NULL;
}
if (n_sort_fields == 0) {
- g_set_error (error, E_BOOK_SDB_ERROR, E_BOOK_SDB_ERROR_INVALID_QUERY,
- _("At least one sort field must be specified to use an EbSdbCursor"));
+ g_set_error (
+ error, E_BOOK_SDB_ERROR, E_BOOK_SDB_ERROR_INVALID_QUERY,
+ _("At least one sort field must be specified to use an EbSdbCursor"));
return NULL;
}
@@ -6038,20 +6059,23 @@ e_book_backend_sqlitedb_cursor_new (EBookBackendSqliteDB *ebsdb,
support = func_check_field_test (ebsdb, e_contact_field_name (sort_fields[i]), NULL);
if ((support & CHECK_IS_SUMMARY) == 0) {
- g_set_error (error, E_BOOK_SDB_ERROR, E_BOOK_SDB_ERROR_INVALID_QUERY,
- _("Cannot sort by a field that is not in the summary"));
+ g_set_error (
+ error, E_BOOK_SDB_ERROR, E_BOOK_SDB_ERROR_INVALID_QUERY,
+ _("Cannot sort by a field that is not in the summary"));
return NULL;
}
if ((support & CHECK_IS_LIST_ATTR) != 0) {
- g_set_error (error, E_BOOK_SDB_ERROR, E_BOOK_SDB_ERROR_INVALID_QUERY,
- _("Cannot sort by a field which may have multiple values"));
+ g_set_error (
+ error, E_BOOK_SDB_ERROR, E_BOOK_SDB_ERROR_INVALID_QUERY,
+ _("Cannot sort by a field which may have multiple values"));
return NULL;
}
}
- return ebsdb_cursor_new (ebsdb, folderid, sexp, query_with_list_attrs,
- sort_fields, sort_types, n_sort_fields);
+ return ebsdb_cursor_new (
+ ebsdb, folderid, sexp, query_with_list_attrs,
+ sort_fields, sort_types, n_sort_fields);
}
/**
@@ -6067,7 +6091,7 @@ e_book_backend_sqlitedb_cursor_new (EBookBackendSqliteDB *ebsdb,
*/
void
e_book_backend_sqlitedb_cursor_free (EBookBackendSqliteDB *ebsdb,
- EbSdbCursor *cursor)
+ EbSdbCursor *cursor)
{
g_return_if_fail (E_IS_BOOK_BACKEND_SQLITEDB (ebsdb));
@@ -6085,9 +6109,9 @@ typedef struct {
static gint
collect_results_for_cursor_cb (gpointer ref,
- gint col,
- gchar **cols,
- gchar **name)
+ gint col,
+ gchar **cols,
+ gchar **name)
{
CursorCollectData *data = ref;
@@ -6149,12 +6173,12 @@ collect_results_for_cursor_cb (gpointer ref,
*/
gint
e_book_backend_sqlitedb_cursor_step (EBookBackendSqliteDB *ebsdb,
- EbSdbCursor *cursor,
- EbSdbCursorStepFlags flags,
- EbSdbCursorOrigin origin,
- gint count,
- GSList **results,
- GError **error)
+ EbSdbCursor *cursor,
+ EbSdbCursorStepFlags flags,
+ EbSdbCursorOrigin origin,
+ gint count,
+ GSList **results,
+ GError **error)
{
CursorCollectData data = { NULL, NULL, NULL, FALSE, 0 };
CursorState *state;
@@ -6167,7 +6191,6 @@ e_book_backend_sqlitedb_cursor_step (EBookBackendSqliteDB *ebsdb,
g_return_val_if_fail ((flags & EBSDB_CURSOR_STEP_FETCH) == 0 ||
(results != NULL && *results == NULL), -1);
-
/* Check if this step should result in an end of list error first */
try_position = cursor->state.position;
if (origin != EBSDB_CURSOR_ORIGIN_CURRENT)
@@ -6175,17 +6198,19 @@ e_book_backend_sqlitedb_cursor_step (EBookBackendSqliteDB *ebsdb,
/* Report errors for requests to run off the end of the list */
if (try_position == EBSDB_CURSOR_ORIGIN_BEGIN && count < 0) {
- g_set_error (error, E_BOOK_SDB_ERROR,
- E_BOOK_SDB_ERROR_END_OF_LIST,
- _("Tried to step a cursor in reverse, "
- "but cursor is already at the beginning of the contact list"));
+ g_set_error (
+ error, E_BOOK_SDB_ERROR,
+ E_BOOK_SDB_ERROR_END_OF_LIST,
+ _("Tried to step a cursor in reverse, "
+ "but cursor is already at the beginning of the contact list"));
return -1;
} else if (try_position == EBSDB_CURSOR_ORIGIN_END && count > 0) {
- g_set_error (error, E_BOOK_SDB_ERROR,
- E_BOOK_SDB_ERROR_END_OF_LIST,
- _("Tried to step a cursor forwards, "
- "but cursor is already at the end of the contact list"));
+ g_set_error (
+ error, E_BOOK_SDB_ERROR,
+ E_BOOK_SDB_ERROR_END_OF_LIST,
+ _("Tried to step a cursor forwards, "
+ "but cursor is already at the end of the contact list"));
return -1;
}
@@ -6252,11 +6277,8 @@ e_book_backend_sqlitedb_cursor_step (EBookBackendSqliteDB *ebsdb,
else
g_string_append (query, " AND ");
- constraints = ebsdb_cursor_constraints (ebsdb,
- cursor,
- state,
- count < 0,
- FALSE);
+ constraints = ebsdb_cursor_constraints (
+ ebsdb, cursor, state, count < 0, FALSE);
g_string_append_c (query, '(');
g_string_append (query, constraints);
@@ -6280,9 +6302,10 @@ e_book_backend_sqlitedb_cursor_step (EBookBackendSqliteDB *ebsdb,
/* Execute the query */
LOCK_MUTEX (&ebsdb->priv->lock);
- success = book_backend_sql_exec (ebsdb->priv->db, query->str,
- collect_results_for_cursor_cb, &data,
- error);
+ success = book_backend_sql_exec (
+ ebsdb->priv->db, query->str,
+ collect_results_for_cursor_cb, &data,
+ error);
UNLOCK_MUTEX (&ebsdb->priv->lock);
g_string_free (query, TRUE);
@@ -6316,8 +6339,9 @@ e_book_backend_sqlitedb_cursor_step (EBookBackendSqliteDB *ebsdb,
/* Cleanup what was allocated by collect_results_for_cursor_cb() */
if (data.results)
- g_slist_free_full (data.results,
- (GDestroyNotify)e_book_backend_sqlitedb_search_data_free);
+ g_slist_free_full (
+ data.results,
+ (GDestroyNotify) e_book_backend_sqlitedb_search_data_free);
g_free (data.alloc_vcard);
/* Free the copy state if we were working with a copy */
@@ -6357,8 +6381,8 @@ e_book_backend_sqlitedb_cursor_step (EBookBackendSqliteDB *ebsdb,
*/
void
e_book_backend_sqlitedb_cursor_set_target_alphabetic_index (EBookBackendSqliteDB *ebsdb,
- EbSdbCursor *cursor,
- gint index)
+ EbSdbCursor *cursor,
+ gint index)
{
gint n_labels = 0;
@@ -6366,8 +6390,9 @@ e_book_backend_sqlitedb_cursor_set_target_alphabetic_index (EBookBackendSqliteDB
g_return_if_fail (cursor != NULL);
g_return_if_fail (index >= 0);
- e_collator_get_index_labels (ebsdb->priv->collator, &n_labels,
- NULL, NULL, NULL);
+ e_collator_get_index_labels (
+ ebsdb->priv->collator, &n_labels,
+ NULL, NULL, NULL);
g_return_if_fail (index < n_labels);
cursor_state_clear (cursor, &(cursor->state), EBSDB_CURSOR_ORIGIN_CURRENT);
@@ -6398,9 +6423,9 @@ e_book_backend_sqlitedb_cursor_set_target_alphabetic_index (EBookBackendSqliteDB
*/
gboolean
e_book_backend_sqlitedb_cursor_set_sexp (EBookBackendSqliteDB *ebsdb,
- EbSdbCursor *cursor,
- const gchar *sexp,
- GError **error)
+ EbSdbCursor *cursor,
+ const gchar *sexp,
+ GError **error)
{
gboolean query_with_list_attrs = FALSE;
@@ -6413,8 +6438,9 @@ e_book_backend_sqlitedb_cursor_set_sexp (EBookBackendSqliteDB *ebsdb,
/* We only support cursors for summary fields in the query */
if (sexp && !e_book_backend_sqlitedb_check_summary_query (ebsdb, sexp, &query_with_list_attrs)) {
- g_set_error (error, E_BOOK_SDB_ERROR, E_BOOK_SDB_ERROR_INVALID_QUERY,
- _("Only summary queries are supported by EbSdbCursor"));
+ g_set_error (
+ error, E_BOOK_SDB_ERROR, E_BOOK_SDB_ERROR_INVALID_QUERY,
+ _("Only summary queries are supported by EbSdbCursor"));
return FALSE;
}
@@ -6445,10 +6471,10 @@ e_book_backend_sqlitedb_cursor_set_sexp (EBookBackendSqliteDB *ebsdb,
*/
gboolean
e_book_backend_sqlitedb_cursor_calculate (EBookBackendSqliteDB *ebsdb,
- EbSdbCursor *cursor,
- gint *total,
- gint *position,
- GError **error)
+ EbSdbCursor *cursor,
+ gint *total,
+ gint *position,
+ GError **error)
{
gboolean success = TRUE;
gint local_total = 0;
@@ -6496,7 +6522,6 @@ e_book_backend_sqlitedb_cursor_calculate (EBookBackendSqliteDB *ebsdb,
/* The GError is already set. */
book_backend_sqlitedb_rollback_transaction (ebsdb, NULL);
-
UNLOCK_MUTEX (&ebsdb->priv->lock);
/* In the case we're at the end, we just set the position
@@ -6528,9 +6553,9 @@ e_book_backend_sqlitedb_cursor_calculate (EBookBackendSqliteDB *ebsdb,
*/
gint
e_book_backend_sqlitedb_cursor_compare_contact (EBookBackendSqliteDB *ebsdb,
- EbSdbCursor *cursor,
- EContact *contact,
- gboolean *matches_sexp)
+ EbSdbCursor *cursor,
+ EContact *contact,
+ gboolean *matches_sexp)
{
EBookBackendSqliteDBPrivate *priv;
gint i;
@@ -6579,7 +6604,7 @@ e_book_backend_sqlitedb_cursor_compare_contact (EBookBackendSqliteDB *ebsdb,
if (comparison == 0) {
const gchar *uid;
- uid = (const gchar *)e_contact_get_const (contact, E_CONTACT_UID);
+ uid = (const gchar *) e_contact_get_const (contact, E_CONTACT_UID);
if (cursor->state.last_uid == NULL)
comparison = 1;
diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb.h
b/addressbook/libedata-book/e-book-backend-sqlitedb.h
index c17e4d7..bb6a2ef 100644
--- a/addressbook/libedata-book/e-book-backend-sqlitedb.h
+++ b/addressbook/libedata-book/e-book-backend-sqlitedb.h
@@ -191,7 +191,7 @@ typedef enum {
* Deprecated: 3.12: Use #EBookSqlite instead
*/
typedef enum {
- EBSDB_CURSOR_STEP_MOVE = (1 << 0),
+ EBSDB_CURSOR_STEP_MOVE = (1 << 0),
EBSDB_CURSOR_STEP_FETCH = (1 << 1)
} EbSdbCursorStepFlags;
diff --git a/addressbook/libedata-book/e-book-backend-summary.c
b/addressbook/libedata-book/e-book-backend-summary.c
index 686391e..0a1de56 100644
--- a/addressbook/libedata-book/e-book-backend-summary.c
+++ b/addressbook/libedata-book/e-book-backend-summary.c
@@ -450,8 +450,9 @@ e_book_backend_summary_open (EBookBackendSummary *summary)
}
else {
if (g_rename (new_filename, summary->priv->summary_path) == -1) {
- g_warning ("%s: Failed to rename '%s' to '%s': %s", G_STRFUNC,
- new_filename, summary->priv->summary_path, g_strerror (errno));
+ g_warning (
+ "%s: Failed to rename '%s' to '%s': %s", G_STRFUNC,
+ new_filename, summary->priv->summary_path, g_strerror (errno));
}
g_free (new_filename);
}
@@ -704,8 +705,9 @@ e_book_backend_summary_save (EBookBackendSummary *summary)
/* unlink the old summary and rename the new one */
g_unlink (summary->priv->summary_path);
if (g_rename (new_filename, summary->priv->summary_path) == -1) {
- g_warning ("%s: Failed to rename '%s' to '%s': %s", G_STRFUNC,
- new_filename, summary->priv->summary_path, g_strerror (errno));
+ g_warning (
+ "%s: Failed to rename '%s' to '%s': %s", G_STRFUNC,
+ new_filename, summary->priv->summary_path, g_strerror (errno));
}
g_free (new_filename);
@@ -764,17 +766,17 @@ e_book_backend_summary_add_contact (EBookBackendSummary *summary,
new_item = g_new0 (EBookBackendSummaryItem, 1);
- new_item->id = id;
- new_item->nickname = e_contact_get (contact, E_CONTACT_NICKNAME);
- new_item->full_name = e_contact_get (contact, E_CONTACT_FULL_NAME);
+ new_item->id = id;
+ new_item->nickname = e_contact_get (contact, E_CONTACT_NICKNAME);
+ new_item->full_name = e_contact_get (contact, E_CONTACT_FULL_NAME);
new_item->given_name = e_contact_get (contact, E_CONTACT_GIVEN_NAME);
- new_item->surname = e_contact_get (contact, E_CONTACT_FAMILY_NAME);
- new_item->file_as = e_contact_get (contact, E_CONTACT_FILE_AS);
- new_item->email_1 = e_contact_get (contact, E_CONTACT_EMAIL_1);
- new_item->email_2 = e_contact_get (contact, E_CONTACT_EMAIL_2);
- new_item->email_3 = e_contact_get (contact, E_CONTACT_EMAIL_3);
- new_item->email_4 = e_contact_get (contact, E_CONTACT_EMAIL_4);
- new_item->list = GPOINTER_TO_INT (e_contact_get (contact, E_CONTACT_IS_LIST));
+ new_item->surname = e_contact_get (contact, E_CONTACT_FAMILY_NAME);
+ new_item->file_as = e_contact_get (contact, E_CONTACT_FILE_AS);
+ new_item->email_1 = e_contact_get (contact, E_CONTACT_EMAIL_1);
+ new_item->email_2 = e_contact_get (contact, E_CONTACT_EMAIL_2);
+ new_item->email_3 = e_contact_get (contact, E_CONTACT_EMAIL_3);
+ new_item->email_4 = e_contact_get (contact, E_CONTACT_EMAIL_4);
+ new_item->list = GPOINTER_TO_INT (e_contact_get (contact, E_CONTACT_IS_LIST));
new_item->list_show_addresses = GPOINTER_TO_INT (e_contact_get (contact,
E_CONTACT_LIST_SHOW_ADDRESSES));
new_item->wants_html = GPOINTER_TO_INT (e_contact_get (contact, E_CONTACT_WANTS_HTML));
diff --git a/addressbook/libedata-book/e-book-backend.c b/addressbook/libedata-book/e-book-backend.c
index ddd210d..4d28fe7 100644
--- a/addressbook/libedata-book/e-book-backend.c
+++ b/addressbook/libedata-book/e-book-backend.c
@@ -3310,9 +3310,9 @@ e_book_backend_sync (EBookBackend *backend)
*/
gboolean
e_book_backend_set_locale (EBookBackend *backend,
- const gchar *locale,
- GCancellable *cancellable,
- GError **error)
+ const gchar *locale,
+ GCancellable *cancellable,
+ GError **error)
{
/* If the backend does not support locales, just happily return */
gboolean success = TRUE;
@@ -3567,10 +3567,10 @@ e_book_backend_prepare_for_completion (EBookBackend *backend,
*/
EDataBookCursor *
e_book_backend_create_cursor (EBookBackend *backend,
- EContactField *sort_fields,
- EBookCursorSortType *sort_types,
- guint n_fields,
- GError **error)
+ EContactField *sort_fields,
+ EBookCursorSortType *sort_types,
+ guint n_fields,
+ GError **error)
{
EDataBookCursor *cursor = NULL;
@@ -3585,10 +3585,11 @@ e_book_backend_create_cursor (EBookBackend *backend,
n_fields,
error);
else
- g_set_error (error,
- E_CLIENT_ERROR,
- E_CLIENT_ERROR_NOT_SUPPORTED,
- "Addressbook backend does not support cursors");
+ g_set_error (
+ error,
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_NOT_SUPPORTED,
+ "Addressbook backend does not support cursors");
g_object_unref (backend);
@@ -3611,8 +3612,8 @@ e_book_backend_create_cursor (EBookBackend *backend,
*/
gboolean
e_book_backend_delete_cursor (EBookBackend *backend,
- EDataBookCursor *cursor,
- GError **error)
+ EDataBookCursor *cursor,
+ GError **error)
{
gboolean success = FALSE;
diff --git a/addressbook/libedata-book/e-book-backend.h b/addressbook/libedata-book/e-book-backend.h
index 5212b9c..edafbc0 100644
--- a/addressbook/libedata-book/e-book-backend.h
+++ b/addressbook/libedata-book/e-book-backend.h
@@ -112,7 +112,6 @@ struct _EBookBackend {
EBookBackendPrivate *priv;
};
-
/**
* EBookBackendClass:
* @use_serial_dispatch_queue: Whether a serial dispatch queue should
@@ -271,18 +270,18 @@ struct _EBookBackendClass {
void (*sync) (EBookBackend *backend);
- gboolean (*set_locale) (EBookBackend *backend,
- const gchar *locale,
+ gboolean (*set_locale) (EBookBackend *backend,
+ const gchar *locale,
GCancellable *cancellable,
GError **error);
- gchar *(*dup_locale) (EBookBackend *backend);
+ gchar * (*dup_locale) (EBookBackend *backend);
EDataBookCursor *
- (*create_cursor) (EBookBackend *backend,
+ (*create_cursor) (EBookBackend *backend,
EContactField *sort_fields,
EBookCursorSortType *sort_types,
guint n_fields,
GError **error);
- gboolean (* delete_cursor) (EBookBackend *backend,
+ gboolean (*delete_cursor) (EBookBackend *backend,
EDataBookCursor *cursor,
GError **error);
@@ -457,19 +456,19 @@ void e_book_backend_configure_direct (EBookBackend *backend,
void e_book_backend_sync (EBookBackend *backend);
-gboolean 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);
+ GError **error);
+gchar * e_book_backend_dup_locale (EBookBackend *backend);
EDataBookCursor *
- e_book_backend_create_cursor (EBookBackend *backend,
+ e_book_backend_create_cursor (EBookBackend *backend,
EContactField *sort_fields,
EBookCursorSortType *sort_types,
guint n_fields,
GError **error);
-gboolean e_book_backend_delete_cursor (EBookBackend *backend,
+gboolean e_book_backend_delete_cursor (EBookBackend *backend,
EDataBookCursor *cursor,
GError **error);
diff --git a/addressbook/libedata-book/e-book-sqlite.c b/addressbook/libedata-book/e-book-sqlite.c
index 675fdca..002c0a5 100644
--- a/addressbook/libedata-book/e-book-sqlite.c
+++ b/addressbook/libedata-book/e-book-sqlite.c
@@ -61,6 +61,10 @@
#include "e-book-backend-sexp.h"
+#define E_BOOK_SQLITE_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), E_TYPE_BOOK_SQLITE, EBookSqlitePrivate))
+
/******************************************************
* Debugging Macros *
******************************************************
@@ -115,7 +119,7 @@ ebsql_init_debug (void)
env_string = g_getenv (EBSQL_ENV_DEBUG);
if (env_string != NULL)
- ebsql_debug_flags =
+ ebsql_debug_flags =
g_parse_debug_string (
env_string,
ebsql_debug_keys,
@@ -123,70 +127,70 @@ ebsql_init_debug (void)
}
}
-#define EBSQL_NOTE(type,action) \
- G_STMT_START { \
- if (ebsql_debug_flags & EBSQL_DEBUG_##type) \
- { action; }; \
+#define EBSQL_NOTE(type,action) \
+ G_STMT_START { \
+ if (ebsql_debug_flags & EBSQL_DEBUG_##type) \
+ { action; }; \
} G_STMT_END
-#define EBSQL_ERROR_STR(code) \
- ((code) == E_BOOK_SQLITE_ERROR_ENGINE ? "engine" : \
- (code) == E_BOOK_SQLITE_ERROR_CONSTRAINT ? "constraint" : \
+#define EBSQL_ERROR_STR(code) \
+ ((code) == E_BOOK_SQLITE_ERROR_ENGINE ? "engine" : \
+ (code) == E_BOOK_SQLITE_ERROR_CONSTRAINT ? "constraint" : \
(code) == E_BOOK_SQLITE_ERROR_CONTACT_NOT_FOUND ? "contact not found" : \
- (code) == E_BOOK_SQLITE_ERROR_INVALID_QUERY ? "invalid query" : \
+ (code) == E_BOOK_SQLITE_ERROR_INVALID_QUERY ? "invalid query" : \
(code) == E_BOOK_SQLITE_ERROR_UNSUPPORTED_QUERY ? "unsupported query" : \
(code) == E_BOOK_SQLITE_ERROR_UNSUPPORTED_FIELD ? "unsupported field" : \
- (code) == E_BOOK_SQLITE_ERROR_END_OF_LIST ? "end of list" : \
- (code) == E_BOOK_SQLITE_ERROR_LOAD ? "load" : "(unknown)")
+ (code) == E_BOOK_SQLITE_ERROR_END_OF_LIST ? "end of list" : \
+ (code) == E_BOOK_SQLITE_ERROR_LOAD ? "load" : "(unknown)")
-#define EBSQL_ORIGIN_STR(origin) \
- ((origin) == EBSQL_CURSOR_ORIGIN_CURRENT ? "current" : \
- (origin) == EBSQL_CURSOR_ORIGIN_BEGIN ? "begin" : \
- (origin) == EBSQL_CURSOR_ORIGIN_END ? "end" : "(invalid)")
+#define EBSQL_ORIGIN_STR(origin) \
+ ((origin) == EBSQL_CURSOR_ORIGIN_CURRENT ? "current" : \
+ (origin) == EBSQL_CURSOR_ORIGIN_BEGIN ? "begin" : \
+ (origin) == EBSQL_CURSOR_ORIGIN_END ? "end" : "(invalid)")
-#define EBSQL_LOCK_MUTEX(mutex) \
- G_STMT_START { \
- if (ebsql_debug_flags & EBSQL_DEBUG_LOCKS) { \
+#define EBSQL_LOCK_MUTEX(mutex) \
+ G_STMT_START { \
+ if (ebsql_debug_flags & EBSQL_DEBUG_LOCKS) { \
g_printerr ("%s: Locking %s\n", G_STRFUNC, #mutex); \
- g_mutex_lock (mutex); \
+ g_mutex_lock (mutex); \
g_printerr ("%s: Locked %s\n", G_STRFUNC, #mutex); \
- } else { \
- g_mutex_lock (mutex); \
- } \
+ } else { \
+ g_mutex_lock (mutex); \
+ } \
} G_STMT_END
-#define EBSQL_UNLOCK_MUTEX(mutex) \
- G_STMT_START { \
- if (ebsql_debug_flags & EBSQL_DEBUG_LOCKS) { \
+#define EBSQL_UNLOCK_MUTEX(mutex) \
+ G_STMT_START { \
+ if (ebsql_debug_flags & EBSQL_DEBUG_LOCKS) { \
g_printerr ("%s: Unlocking %s\n", G_STRFUNC, #mutex); \
- g_mutex_unlock (mutex); \
- g_printerr ("%s: Unlocked %s\n", G_STRFUNC, #mutex); \
- } else { \
- g_mutex_unlock (mutex); \
- } \
+ g_mutex_unlock (mutex); \
+ g_printerr ("%s: Unlocked %s\n", G_STRFUNC, #mutex); \
+ } else { \
+ g_mutex_unlock (mutex); \
+ } \
} G_STMT_END
/* Format strings are passed through dgettext(), need to be reformatted */
-#define EBSQL_SET_ERROR(error, code, fmt, args...) \
- G_STMT_START { \
- if (ebsql_debug_flags & EBSQL_DEBUG_ERRORS) { \
- gchar *format = g_strdup_printf ( \
- "ERR [%%s]: Set error code '%%s': %s\n", fmt); \
- g_printerr (format, G_STRFUNC, \
- EBSQL_ERROR_STR (code), ## args); \
- g_free (format); \
- } \
+#define EBSQL_SET_ERROR(error, code, fmt, args...) \
+ G_STMT_START { \
+ if (ebsql_debug_flags & EBSQL_DEBUG_ERRORS) { \
+ gchar *format = g_strdup_printf ( \
+ "ERR [%%s]: Set error code '%%s': %s\n", fmt); \
+ g_printerr (format, G_STRFUNC, \
+ EBSQL_ERROR_STR (code), ## args); \
+ g_free (format); \
+ } \
g_set_error (error, E_BOOK_SQLITE_ERROR, code, fmt, ## args); \
} G_STMT_END
-#define EBSQL_SET_ERROR_LITERAL(error, code, detail) \
- G_STMT_START { \
- if (ebsql_debug_flags & EBSQL_DEBUG_ERRORS) { \
- g_printerr ("ERR [%s]: " \
- "Set error code %s: %s\n", \
- G_STRFUNC, \
- EBSQL_ERROR_STR (code), detail); \
- } \
+#define EBSQL_SET_ERROR_LITERAL(error, code, detail) \
+ G_STMT_START { \
+ if (ebsql_debug_flags & EBSQL_DEBUG_ERRORS) { \
+ g_printerr ("ERR [%s]: " \
+ "Set error code %s: %s\n", \
+ G_STRFUNC, \
+ EBSQL_ERROR_STR (code), detail); \
+ } \
g_set_error_literal (error, E_BOOK_SQLITE_ERROR, code, detail); \
} G_STMT_END
@@ -203,42 +207,42 @@ ebsql_init_debug (void)
* If the check fails, the lock is released and then
* @val is returned.
*/
-#define EBSQL_LOCK_OR_RETURN(ebsql, cancellable, val) \
- G_STMT_START { \
- EBSQL_LOCK_MUTEX (&(ebsql)->priv->lock); \
- if (cancellable != NULL && \
- (ebsql)->priv->cancel != cancellable) { \
- g_warning ("The GCancellable passed to `%s' " \
+#define EBSQL_LOCK_OR_RETURN(ebsql, cancellable, val) \
+ G_STMT_START { \
+ EBSQL_LOCK_MUTEX (&(ebsql)->priv->lock); \
+ if (cancellable != NULL && \
+ (ebsql)->priv->cancel != cancellable) { \
+ g_warning ("The GCancellable passed to `%s' " \
"is not the same as the cancel object " \
- "passed to e_book_sqlite_lock()", \
- G_STRFUNC); \
- EBSQL_UNLOCK_MUTEX (&(ebsql)->priv->lock); \
- return val; \
- } \
+ "passed to e_book_sqlite_lock()", \
+ G_STRFUNC); \
+ EBSQL_UNLOCK_MUTEX (&(ebsql)->priv->lock); \
+ return val; \
+ } \
} G_STMT_END
/* Set an error code from an sqlite_exec() or sqlite_step() return value & error message */
-#define EBSQL_SET_ERROR_FROM_SQLITE(error, code, message) \
- G_STMT_START { \
- if (code == SQLITE_CONSTRAINT) { \
- EBSQL_SET_ERROR_LITERAL (error, \
+#define EBSQL_SET_ERROR_FROM_SQLITE(error, code, message) \
+ G_STMT_START { \
+ if (code == SQLITE_CONSTRAINT) { \
+ EBSQL_SET_ERROR_LITERAL (error, \
E_BOOK_SQLITE_ERROR_CONSTRAINT, \
- errmsg); \
- } else if (code == SQLITE_ABORT) { \
- if (ebsql_debug_flags & EBSQL_DEBUG_ERRORS) { \
+ errmsg); \
+ } else if (code == SQLITE_ABORT) { \
+ if (ebsql_debug_flags & EBSQL_DEBUG_ERRORS) { \
g_printerr ("ERR [%s]: Set cancelled error\n", \
- G_STRFUNC); \
- } \
- g_set_error (error, \
- G_IO_ERROR, \
- G_IO_ERROR_CANCELLED, \
+ G_STRFUNC); \
+ } \
+ g_set_error (error, \
+ G_IO_ERROR, \
+ G_IO_ERROR_CANCELLED, \
"Operation cancelled: %s", errmsg); \
- } else { \
- EBSQL_SET_ERROR (error, \
- E_BOOK_SQLITE_ERROR_ENGINE, \
- "SQLite error code `%d': %s", \
- code, errmsg); \
- } \
+ } else { \
+ EBSQL_SET_ERROR (error, \
+ E_BOOK_SQLITE_ERROR_ENGINE, \
+ "SQLite error code `%d': %s", \
+ code, errmsg); \
+ } \
} G_STMT_END
#define FOLDER_VERSION 8
@@ -291,31 +295,31 @@ ebsql_init_debug (void)
#define INDEX_FLAG(type) (1 << E_BOOK_INDEX_##type)
/* This macro is used to reffer to vcards in statements */
-#define EBSQL_VCARD_FRAGMENT(ebsql) \
- ((ebsql)->priv->vcard_callback ? \
- EBSQL_FUNC_FETCH_VCARD " (summary.uid, summary.bdata)" : \
+#define EBSQL_VCARD_FRAGMENT(ebsql) \
+ ((ebsql)->priv->vcard_callback ? \
+ EBSQL_FUNC_FETCH_VCARD " (summary.uid, summary.bdata)" : \
"summary.vcard")
/* Signatures for some of the SQLite callbacks which we pass around */
-typedef void (* EbSqlCustomFunc) (sqlite3_context *context,
- gint argc,
- sqlite3_value **argv);
-typedef gint (* EbSqlRowFunc) (gpointer ref,
- gint n_cols,
- gchar **cols,
- gchar **names);
+typedef void (*EbSqlCustomFunc) (sqlite3_context *context,
+ gint argc,
+ sqlite3_value **argv);
+typedef gint (*EbSqlRowFunc) (gpointer ref,
+ gint n_cols,
+ gchar **cols,
+ gchar **names);
/* Some forward declarations */
-static gboolean ebsql_init_statements (EBookSqlite *ebsql,
+static gboolean ebsql_init_statements (EBookSqlite *ebsql,
GError **error);
-static gboolean ebsql_insert_contact (EBookSqlite *ebsql,
+static gboolean ebsql_insert_contact (EBookSqlite *ebsql,
EbSqlChangeType change_type,
EContact *contact,
const gchar *original_vcard,
const gchar *extra,
gboolean replace,
GError **error);
-static gboolean ebsql_exec (EBookSqlite *ebsql,
+static gboolean ebsql_exec (EBookSqlite *ebsql,
const gchar *stmt,
EbSqlRowFunc callback,
gpointer data,
@@ -431,16 +435,16 @@ static EBookIndexType default_index_types[] = {
******************************************************/
static ColumnInfo *
column_info_new (SummaryField *field,
- const gchar *folderid,
- const gchar *column_suffix,
- const gchar *column_type,
- const gchar *column_extra,
- const gchar *idx_prefix)
+ const gchar *folderid,
+ const gchar *column_suffix,
+ const gchar *column_type,
+ const gchar *column_extra,
+ const gchar *idx_prefix)
{
ColumnInfo *info;
- info = g_slice_new0 (ColumnInfo);
- info->type = column_type;
+ info = g_slice_new0 (ColumnInfo);
+ info->type = column_type;
info->extra = column_extra;
if (!info->type) {
@@ -456,23 +460,25 @@ column_info_new (SummaryField *field,
if (field->type == E_TYPE_CONTACT_ATTR_LIST)
/* Attribute lists are on their own table */
- info->name = g_strconcat ("value",
- column_suffix ? "_" : NULL,
- column_suffix,
- NULL);
+ info->name = g_strconcat (
+ "value",
+ column_suffix ? "_" : NULL,
+ column_suffix,
+ NULL);
else
/* Regular fields are named by their 'dbname' */
- info->name = g_strconcat (field->dbname,
- column_suffix ? "_" : NULL,
- column_suffix,
- NULL);
+ info->name = g_strconcat (
+ field->dbname,
+ column_suffix ? "_" : NULL,
+ column_suffix,
+ NULL);
if (idx_prefix)
- info->index =
- g_strconcat (idx_prefix,
- "_", field->dbname,
- "_", folderid,
- NULL);
+ info->index = g_strconcat (
+ idx_prefix,
+ "_", field->dbname,
+ "_", folderid,
+ NULL);
return info;
}
@@ -489,7 +495,7 @@ column_info_free (ColumnInfo *info)
static gint
summary_field_array_index (GArray *array,
- EContactField field)
+ EContactField field)
{
gint i;
@@ -504,7 +510,7 @@ summary_field_array_index (GArray *array,
static SummaryField *
summary_field_append (GArray *array,
- const gchar *folderid,
+ const gchar *folderid,
EContactField field_id,
GError **error)
{
@@ -514,9 +520,10 @@ summary_field_append (GArray *array,
SummaryField new_field = { 0, };
if (field_id < 1 || field_id >= E_CONTACT_FIELD_LAST) {
- EBSQL_SET_ERROR (error, E_BOOK_SQLITE_ERROR_UNSUPPORTED_FIELD,
- _("Unsupported contact field '%d' specified in summary"),
- field_id);
+ EBSQL_SET_ERROR (
+ error, E_BOOK_SQLITE_ERROR_UNSUPPORTED_FIELD,
+ _("Unsupported contact field '%d' specified in summary"),
+ field_id);
return NULL;
}
@@ -546,10 +553,11 @@ summary_field_append (GArray *array,
if (type != G_TYPE_STRING &&
type != G_TYPE_BOOLEAN &&
type != E_TYPE_CONTACT_ATTR_LIST) {
- EBSQL_SET_ERROR (error, E_BOOK_SQLITE_ERROR_UNSUPPORTED_FIELD,
- _("Contact field '%s' of type '%s' specified in summary, "
- "but only boolean, string and string list field types are supported"),
- e_contact_pretty_name (field_id), g_type_name (type));
+ EBSQL_SET_ERROR (
+ error, E_BOOK_SQLITE_ERROR_UNSUPPORTED_FIELD,
+ _("Contact field '%s' of type '%s' specified in summary, "
+ "but only boolean, string and string list field types are supported"),
+ e_contact_pretty_name (field_id), g_type_name (type));
return NULL;
}
@@ -559,9 +567,9 @@ summary_field_append (GArray *array,
}
new_field.field_id = field_id;
- new_field.dbname = dbname;
- new_field.type = type;
- new_field.index = 0;
+ new_field.dbname = dbname;
+ new_field.type = type;
+ new_field.index = 0;
g_array_append_val (array, new_field);
return &g_array_index (array, SummaryField, array->len - 1);
@@ -602,7 +610,7 @@ summary_fields_add_indexes (GArray *array,
static inline gint
summary_field_get_index (EBookSqlite *ebsql,
- EContactField field_id)
+ EContactField field_id)
{
gint i;
@@ -616,7 +624,7 @@ summary_field_get_index (EBookSqlite *ebsql,
static inline SummaryField *
summary_field_get (EBookSqlite *ebsql,
- EContactField field_id)
+ EContactField field_id)
{
gint index;
@@ -629,32 +637,34 @@ summary_field_get (EBookSqlite *ebsql,
static GSList *
summary_field_list_columns (SummaryField *field,
- const gchar *folderid)
+ const gchar *folderid)
{
GSList *columns = NULL;
ColumnInfo *info;
/* Doesn't hurt to verify a bit more here, this shouldn't happen though */
- g_return_val_if_fail (field->type == G_TYPE_STRING ||
- field->type == G_TYPE_BOOLEAN ||
- field->type == E_TYPE_CONTACT_ATTR_LIST,
- NULL);
+ g_return_val_if_fail (
+ field->type == G_TYPE_STRING ||
+ field->type == G_TYPE_BOOLEAN ||
+ field->type == E_TYPE_CONTACT_ATTR_LIST,
+ NULL);
/* Normal / default column */
- info = column_info_new (field, folderid, NULL, NULL,
- (field->field_id == E_CONTACT_UID) ? "PRIMARY KEY" : NULL,
- (field->index & INDEX_FLAG (PREFIX)) != 0 ? "INDEX" : NULL);
+ info = column_info_new (
+ field, folderid, NULL, NULL,
+ (field->field_id == E_CONTACT_UID) ? "PRIMARY KEY" : NULL,
+ (field->index & INDEX_FLAG (PREFIX)) != 0 ? "INDEX" : NULL);
columns = g_slist_prepend (columns, info);
/* Localized column, for storing sort keys */
if (field->type == G_TYPE_STRING && (field->index & INDEX_FLAG (SORT_KEY))) {
- info = column_info_new (field, folderid, EBSQL_SUFFIX_SORT_KEY, "TEXT", NULL, "SINDEX");
+ info = column_info_new (field, folderid, EBSQL_SUFFIX_SORT_KEY, "TEXT", NULL, "SINDEX");
columns = g_slist_prepend (columns, info);
}
/* Suffix match column */
if (field->type != G_TYPE_BOOLEAN && (field->index & INDEX_FLAG (SUFFIX)) != 0) {
- info = column_info_new (field, folderid, EBSQL_SUFFIX_REVERSE, "TEXT", NULL, "RINDEX");
+ info = column_info_new (field, folderid, EBSQL_SUFFIX_REVERSE, "TEXT", NULL, "RINDEX");
columns = g_slist_prepend (columns, info);
}
@@ -662,11 +672,11 @@ summary_field_list_columns (SummaryField *field,
if (field->type != G_TYPE_BOOLEAN && (field->index & INDEX_FLAG (PHONE)) != 0) {
/* One indexed column for storing the national number */
- info = column_info_new (field, folderid, EBSQL_SUFFIX_PHONE, "TEXT", NULL, "PINDEX");
+ info = column_info_new (field, folderid, EBSQL_SUFFIX_PHONE, "TEXT", NULL, "PINDEX");
columns = g_slist_prepend (columns, info);
/* One integer column for storing the country code */
- info = column_info_new (field, folderid, EBSQL_SUFFIX_COUNTRY, "INTEGER", "DEFAULT 0",
NULL);
+ info = column_info_new (field, folderid, EBSQL_SUFFIX_COUNTRY, "INTEGER", "DEFAULT 0", NULL);
columns = g_slist_prepend (columns, info);
}
@@ -675,7 +685,7 @@ summary_field_list_columns (SummaryField *field,
static void
summary_fields_array_free (SummaryField *fields,
- gint n_fields)
+ gint n_fields)
{
gint i;
@@ -712,7 +722,7 @@ ebsql_ref_from_hash (const gchar *path)
static void
ebsql_register_to_hash (EBookSqlite *ebsql,
- const gchar *path)
+ const gchar *path)
{
if (db_connections == NULL)
db_connections = g_hash_table_new_full (
@@ -750,9 +760,9 @@ ebsql_unregister_from_hash (EBookSqlite *ebsql)
/* For EBSQL_DEBUG_EXPLAIN */
static gint
ebsql_debug_query_plan_cb (gpointer ref,
- gint n_cols,
- gchar **cols,
- gchar **name)
+ gint n_cols,
+ gchar **cols,
+ gchar **name)
{
gint i;
@@ -769,9 +779,9 @@ ebsql_debug_query_plan_cb (gpointer ref,
/* Collect a GList of column names in the main summary table */
static gint
get_columns_cb (gpointer ref,
- gint col,
- gchar **cols,
- gchar **name)
+ gint col,
+ gchar **cols,
+ gchar **name)
{
GSList **columns = (GSList **) ref;
gint i;
@@ -809,9 +819,9 @@ get_string_cb (gpointer ref,
/* Collect the first integer result */
static gint
get_int_cb (gpointer ref,
- gint col,
- gchar **cols,
- gchar **name)
+ gint col,
+ gchar **cols,
+ gchar **name)
{
gint *ret = ref;
@@ -847,9 +857,9 @@ get_count_cb (gpointer ref,
/* Report if there was at least one result */
static gint
get_exists_cb (gpointer ref,
- gint col,
- gchar **cols,
- gchar **name)
+ gint col,
+ gchar **cols,
+ gchar **name)
{
gboolean *exists = ref;
@@ -860,8 +870,8 @@ get_exists_cb (gpointer ref,
static EbSqlSearchData *
search_data_from_results (gint ncol,
- gchar **cols,
- gchar **names)
+ gchar **cols,
+ gchar **names)
{
EbSqlSearchData *data = g_slice_new0 (EbSqlSearchData);
gint i;
@@ -889,9 +899,9 @@ search_data_from_results (gint ncol,
static gint
collect_full_results_cb (gpointer ref,
- gint ncol,
- gchar **cols,
- gchar **names)
+ gint ncol,
+ gchar **cols,
+ gchar **names)
{
EbSqlSearchData *data;
GSList **vcard_data = ref;
@@ -905,9 +915,9 @@ collect_full_results_cb (gpointer ref,
static gint
collect_uid_results_cb (gpointer ref,
- gint ncol,
- gchar **cols,
- gchar **names)
+ gint ncol,
+ gchar **cols,
+ gchar **names)
{
GSList **uids = ref;
@@ -919,9 +929,9 @@ collect_uid_results_cb (gpointer ref,
static gint
collect_lean_results_cb (gpointer ref,
- gint ncol,
- gchar **cols,
- gchar **names)
+ gint ncol,
+ gchar **cols,
+ gchar **names)
{
GSList **vcard_data = ref;
EbSqlSearchData *search_data = g_slice_new0 (EbSqlSearchData);
@@ -955,8 +965,8 @@ collect_lean_results_cb (gpointer ref,
static void
ebsql_string_append_vprintf (GString *string,
- const gchar *fmt,
- va_list args)
+ const gchar *fmt,
+ va_list args)
{
gchar *stmt;
@@ -972,8 +982,8 @@ ebsql_string_append_vprintf (GString *string,
static void
ebsql_string_append_printf (GString *string,
- const gchar *fmt,
- ...)
+ const gchar *fmt,
+ ...)
{
va_list args;
@@ -990,8 +1000,8 @@ ebsql_string_append_printf (GString *string,
*/
static void
ebsql_string_append_column (GString *string,
- SummaryField *field,
- const gchar *suffix)
+ SummaryField *field,
+ const gchar *suffix)
{
if (field->aux_table) {
g_string_append (string, field->aux_table_symbolic);
@@ -1009,12 +1019,12 @@ ebsql_string_append_column (GString *string,
static gboolean
ebsql_exec_vprintf (EBookSqlite *ebsql,
- const gchar *fmt,
- EbSqlRowFunc callback,
- gpointer data,
- GCancellable *cancellable,
- GError **error,
- va_list args)
+ const gchar *fmt,
+ EbSqlRowFunc callback,
+ gpointer data,
+ GCancellable *cancellable,
+ GError **error,
+ va_list args)
{
gboolean success;
gchar *stmt;
@@ -1028,12 +1038,12 @@ ebsql_exec_vprintf (EBookSqlite *ebsql,
static gboolean
ebsql_exec_printf (EBookSqlite *ebsql,
- const gchar *fmt,
- EbSqlRowFunc callback,
- gpointer data,
- GCancellable *cancellable,
- GError **error,
- ...)
+ const gchar *fmt,
+ EbSqlRowFunc callback,
+ gpointer data,
+ GCancellable *cancellable,
+ GError **error,
+ ...)
{
gboolean success;
va_list args;
@@ -1047,7 +1057,7 @@ ebsql_exec_printf (EBookSqlite *ebsql,
static inline void
ebsql_exec_maybe_debug (EBookSqlite *ebsql,
- const gchar *stmt)
+ const gchar *stmt)
{
if (ebsql_debug_flags & EBSQL_DEBUG_EXPLAIN &&
strncmp (stmt, "SELECT", 6) == 0) {
@@ -1063,11 +1073,11 @@ ebsql_exec_maybe_debug (EBookSqlite *ebsql,
static gboolean
ebsql_exec (EBookSqlite *ebsql,
- const gchar *stmt,
- EbSqlRowFunc callback,
- gpointer data,
- GCancellable *cancellable,
- GError **error)
+ const gchar *stmt,
+ EbSqlRowFunc callback,
+ gpointer data,
+ GCancellable *cancellable,
+ GError **error)
{
gboolean had_cancel;
gchar *errmsg = NULL;
@@ -1115,9 +1125,9 @@ ebsql_exec (EBookSqlite *ebsql,
static gboolean
ebsql_start_transaction (EBookSqlite *ebsql,
- EbSqlLockType lock_type,
- GCancellable *cancel,
- GError **error)
+ EbSqlLockType lock_type,
+ GCancellable *cancel,
+ GError **error)
{
gboolean success = TRUE;
@@ -1132,8 +1142,9 @@ ebsql_start_transaction (EBookSqlite *ebsql,
/* No cancellable should be set at transaction start time */
if (ebsql->priv->cancel) {
- g_warning ("Starting a transaction with a cancellable already set. "
- "Clearing previously set cancellable");
+ g_warning (
+ "Starting a transaction with a cancellable already set. "
+ "Clearing previously set cancellable");
g_clear_object (&ebsql->priv->cancel);
}
@@ -1167,9 +1178,10 @@ ebsql_start_transaction (EBookSqlite *ebsql,
/* Warn about cases where where a read transaction might be upgraded */
if (lock_type == EBSQL_LOCK_WRITE && ebsql->priv->lock_type == EBSQL_LOCK_READ)
- g_warning ("A nested transaction wants to write, "
- "but the outermost transaction was started "
- "without a writer lock.");
+ g_warning (
+ "A nested transaction wants to write, "
+ "but the outermost transaction was started "
+ "without a writer lock.");
}
return success;
@@ -1177,7 +1189,7 @@ ebsql_start_transaction (EBookSqlite *ebsql,
static gboolean
ebsql_commit_transaction (EBookSqlite *ebsql,
- GError **error)
+ GError **error)
{
gboolean success = TRUE;
@@ -1202,7 +1214,7 @@ ebsql_commit_transaction (EBookSqlite *ebsql,
static gboolean
ebsql_rollback_transaction (EBookSqlite *ebsql,
- GError **error)
+ GError **error)
{
gboolean success = TRUE;
@@ -1226,8 +1238,8 @@ ebsql_rollback_transaction (EBookSqlite *ebsql,
static sqlite3_stmt *
ebsql_prepare_statement (EBookSqlite *ebsql,
- const gchar *stmt_str,
- GError **error)
+ const gchar *stmt_str,
+ GError **error)
{
sqlite3_stmt *stmt;
const gchar *stmt_tail = NULL;
@@ -1237,13 +1249,15 @@ ebsql_prepare_statement (EBookSqlite *ebsql,
if (ret != SQLITE_OK) {
const gchar *errmsg = sqlite3_errmsg (ebsql->priv->db);
- EBSQL_SET_ERROR_LITERAL (error,
- E_BOOK_SQLITE_ERROR_ENGINE,
- errmsg);
+ EBSQL_SET_ERROR_LITERAL (
+ error,
+ E_BOOK_SQLITE_ERROR_ENGINE,
+ errmsg);
} else if (stmt == NULL) {
- EBSQL_SET_ERROR_LITERAL (error,
- E_BOOK_SQLITE_ERROR_ENGINE,
- "Unknown error preparing SQL statement");
+ EBSQL_SET_ERROR_LITERAL (
+ error,
+ E_BOOK_SQLITE_ERROR_ENGINE,
+ "Unknown error preparing SQL statement");
}
if (stmt_tail && stmt_tail[0])
@@ -1257,9 +1271,9 @@ ebsql_prepare_statement (EBookSqlite *ebsql,
*/
static gboolean
ebsql_complete_statement (EBookSqlite *ebsql,
- sqlite3_stmt *stmt,
- gint ret,
- GError **error)
+ sqlite3_stmt *stmt,
+ gint ret,
+ GError **error)
{
if (ret == SQLITE_OK)
ret = sqlite3_step (stmt);
@@ -1267,7 +1281,7 @@ ebsql_complete_statement (EBookSqlite *ebsql,
if (ret != SQLITE_OK && ret != SQLITE_DONE) {
const gchar *errmsg = sqlite3_errmsg (ebsql->priv->db);
EBSQL_SET_ERROR_FROM_SQLITE (error, ret, errmsg);
- }
+ }
/* Reset / Clear at the end, regardless of error state */
sqlite3_reset (stmt);
@@ -1300,16 +1314,17 @@ ebsql_regexp (sqlite3_context *context,
regex = g_regex_new (expression, 0, 0, &error);
if (!regex) {
- sqlite3_result_error (context,
- error ? error->message :
- _("Error parsing regular expression"),
- -1);
+ sqlite3_result_error (
+ context,
+ error ? error->message :
+ _("Error parsing regular expression"),
+ -1);
g_clear_error (&error);
return;
}
/* SQLite will take care of freeing the GRegex when we're done with the query */
- sqlite3_set_auxdata (context, 0, regex, (GDestroyNotify)g_regex_unref);
+ sqlite3_set_auxdata (context, 0, regex, (GDestroyNotify) g_regex_unref);
}
/* Now perform the comparison */
@@ -1325,8 +1340,8 @@ ebsql_regexp (sqlite3_context *context,
/* Implementation of EBSQL_FUNC_COMPARE_VCARD (fallback for non-summary queries) */
static void
ebsql_compare_vcard (sqlite3_context *context,
- gint argc,
- sqlite3_value **argv)
+ gint argc,
+ sqlite3_value **argv)
{
EBookBackendSExp *sexp = NULL;
const gchar *text;
@@ -1340,9 +1355,10 @@ ebsql_compare_vcard (sqlite3_context *context,
text = (const gchar *) sqlite3_value_text (argv[0]);
if (text) {
sexp = e_book_backend_sexp_new (text);
- sqlite3_set_auxdata (context, 0,
- sexp,
- g_object_unref);
+ sqlite3_set_auxdata (
+ context, 0,
+ sexp,
+ g_object_unref);
}
/* This shouldn't happen, catch invalid sexp in preflight */
@@ -1384,9 +1400,9 @@ ebsql_compare_vcard (sqlite3_context *context,
static void
ebsql_eqphone (sqlite3_context *context,
- gint argc,
- sqlite3_value **argv,
- EPhoneNumberMatch requested_match)
+ gint argc,
+ sqlite3_value **argv,
+ EPhoneNumberMatch requested_match)
{
EBookSqlite *ebsql = sqlite3_user_data (context);
EPhoneNumber *input_phone = NULL, *row_phone = NULL;
@@ -1406,9 +1422,10 @@ ebsql_eqphone (sqlite3_context *context,
/* SQLite will take care of freeing the EPhoneNumber when we're done with the
expression */
if (input_phone)
- sqlite3_set_auxdata (context, 0,
- input_phone,
- (GDestroyNotify)e_phone_number_free);
+ sqlite3_set_auxdata (
+ context, 0,
+ input_phone,
+ (GDestroyNotify) e_phone_number_free);
}
}
@@ -1443,8 +1460,8 @@ ebsql_eqphone (sqlite3_context *context,
/* Exact phone number match function: EBSQL_FUNC_EQPHONE_EXACT */
static void
ebsql_eqphone_exact (sqlite3_context *context,
- gint argc,
- sqlite3_value **argv)
+ gint argc,
+ sqlite3_value **argv)
{
ebsql_eqphone (context, argc, argv, E_PHONE_NUMBER_MATCH_EXACT);
}
@@ -1452,8 +1469,8 @@ ebsql_eqphone_exact (sqlite3_context *context,
/* National phone number match function: EBSQL_FUNC_EQPHONE_NATIONAL */
static void
ebsql_eqphone_national (sqlite3_context *context,
- gint argc,
- sqlite3_value **argv)
+ gint argc,
+ sqlite3_value **argv)
{
ebsql_eqphone (context, argc, argv, E_PHONE_NUMBER_MATCH_NATIONAL);
}
@@ -1461,8 +1478,8 @@ ebsql_eqphone_national (sqlite3_context *context,
/* Short phone number match function: EBSQL_FUNC_EQPHONE_SHORT */
static void
ebsql_eqphone_short (sqlite3_context *context,
- gint argc,
- sqlite3_value **argv)
+ gint argc,
+ sqlite3_value **argv)
{
ebsql_eqphone (context, argc, argv, E_PHONE_NUMBER_MATCH_SHORT);
}
@@ -1470,26 +1487,27 @@ ebsql_eqphone_short (sqlite3_context *context,
/* Implementation of EBSQL_FUNC_FETCH_VCARD (fallback for shallow addressbooks) */
static void
ebsql_fetch_vcard (sqlite3_context *context,
- gint argc,
- sqlite3_value **argv)
+ gint argc,
+ sqlite3_value **argv)
{
EBookSqlite *ebsql = sqlite3_user_data (context);
const gchar *uid;
const gchar *extra;
gchar *vcard = NULL;
- uid = (const gchar *) sqlite3_value_text (argv[0]);
+ uid = (const gchar *) sqlite3_value_text (argv[0]);
extra = (const gchar *) sqlite3_value_text (argv[1]);
/* Call our delegate to generate the vcard */
if (ebsql->priv->vcard_callback)
- vcard = ebsql->priv->vcard_callback (uid,
- extra,
- ebsql->priv->user_data);
+ vcard = ebsql->priv->vcard_callback (
+ uid, extra, ebsql->priv->user_data);
- EBSQL_NOTE (FETCH_VCARD,
- g_printerr ("fetch_vcard (%s, %s) %s",
- uid, extra, vcard ? "Got VCard" : "No VCard"));
+ EBSQL_NOTE (
+ FETCH_VCARD,
+ g_printerr (
+ "fetch_vcard (%s, %s) %s",
+ uid, extra, vcard ? "Got VCard" : "No VCard"));
sqlite3_result_text (context, vcard, -1, g_free);
}
@@ -1518,17 +1536,18 @@ static EbSqlCustomFuncTab ebsql_custom_functions[] = {
* utilities encode & decode that key).
*/
static gchar *
-ebsql_encode_vcard_sort_key (const gchar *sort_key)
+ebsql_encode_vcard_sort_key (const gchar *sort_key)
{
EVCard *vcard = e_vcard_new ();
gchar *base64;
gchar *encoded;
/* Encode this otherwise e-vcard messes it up */
- base64 = g_base64_encode ((const guchar *)sort_key, strlen (sort_key));
- e_vcard_append_attribute_with_value (vcard,
- e_vcard_attribute_new (NULL, EBSQL_VCARD_SORT_KEY),
- base64);
+ base64 = g_base64_encode ((const guchar *) sort_key, strlen (sort_key));
+ e_vcard_append_attribute_with_value (
+ vcard,
+ e_vcard_attribute_new (NULL, EBSQL_VCARD_SORT_KEY),
+ base64);
encoded = e_vcard_to_string (vcard, EVC_FORMAT_VCARD_30);
g_free (base64);
@@ -1554,7 +1573,7 @@ ebsql_decode_vcard_sort_key_from_vcard (EVCard *vcard)
base64 = g_strdup (values->data);
- sort_key = (gchar *)g_base64_decode (base64, &len);
+ sort_key = (gchar *) g_base64_decode (base64, &len);
g_free (base64);
}
@@ -1580,13 +1599,13 @@ typedef struct {
} EbSqlCollData;
static gint
-ebsql_fallback_collator (gpointer ref,
- gint len1,
- const void *data1,
- gint len2,
- const void *data2)
+ebsql_fallback_collator (gpointer ref,
+ gint len1,
+ gconstpointer data1,
+ gint len2,
+ gconstpointer data2)
{
- EbSqlCollData *data = (EbSqlCollData *)ref;
+ EbSqlCollData *data = (EbSqlCollData *) ref;
EBookSqlitePrivate *priv;
EContact *contact1, *contact2;
const gchar *str1, *str2;
@@ -1596,8 +1615,8 @@ ebsql_fallback_collator (gpointer ref,
priv = data->ebsql->priv;
- str1 = (const gchar *)data1;
- str2 = (const gchar *)data2;
+ str1 = (const gchar *) data1;
+ str2 = (const gchar *) data2;
/* Construct 2 contacts (we're comparing vcards) */
contact1 = e_contact_new ();
@@ -1638,8 +1657,8 @@ ebsql_fallback_collator (gpointer ref,
}
static EbSqlCollData *
-ebsql_coll_data_new (EBookSqlite *ebsql,
- EContactField field)
+ebsql_coll_data_new (EBookSqlite *ebsql,
+ EContactField field)
{
EbSqlCollData *data = g_slice_new (EbSqlCollData);
@@ -1658,18 +1677,18 @@ ebsql_coll_data_free (EbSqlCollData *data)
/* COLLATE functions are generated on demand only */
static void
-ebsql_generate_collator (gpointer ref,
- sqlite3 *db,
- gint eTextRep,
- const gchar *coll_name)
+ebsql_generate_collator (gpointer ref,
+ sqlite3 *db,
+ gint eTextRep,
+ const gchar *coll_name)
{
- EBookSqlite *ebsql = (EBookSqlite *)ref;
+ EBookSqlite *ebsql = (EBookSqlite *) ref;
EbSqlCollData *data;
EContactField field;
const gchar *field_name;
field_name = coll_name + strlen (EBSQL_COLLATE_PREFIX);
- field = e_contact_field_id (field_name);
+ field = e_contact_field_id (field_name);
/* This should be caught before reaching here, just an extra check */
if (field == 0 || field >= E_CONTACT_FIELD_LAST ||
@@ -1678,10 +1697,11 @@ ebsql_generate_collator (gpointer ref,
return;
}
- data = ebsql_coll_data_new (ebsql, field);
- sqlite3_create_collation_v2 (db, coll_name, SQLITE_UTF8,
- data, ebsql_fallback_collator,
- (GDestroyNotify)ebsql_coll_data_free);
+ data = ebsql_coll_data_new (ebsql, field);
+ sqlite3_create_collation_v2 (
+ db, coll_name, SQLITE_UTF8,
+ data, ebsql_fallback_collator,
+ (GDestroyNotify) ebsql_coll_data_free);
}
/**********************************************************
@@ -1690,12 +1710,13 @@ ebsql_generate_collator (gpointer ref,
static gint
ebsql_check_cancel (gpointer ref)
{
- EBookSqlite *ebsql = (EBookSqlite *)ref;
+ EBookSqlite *ebsql = (EBookSqlite *) ref;
if (ebsql->priv->cancel &&
g_cancellable_is_cancelled (ebsql->priv->cancel)) {
- EBSQL_NOTE (CANCEL,
- g_printerr ("CANCEL: An operation was canceled\n"));
+ EBSQL_NOTE (
+ CANCEL,
+ g_printerr ("CANCEL: An operation was canceled\n"));
return -1;
}
@@ -1720,11 +1741,11 @@ main_table_index_by_name (const gchar *name)
static gint
check_main_table_columns (gpointer data,
- gint n_cols,
- gchar **cols,
- gchar **name)
+ gint n_cols,
+ gchar **cols,
+ gchar **name)
{
- guint *columns_mask = (guint *)data;
+ guint *columns_mask = (guint *) data;
gint i;
for (i = 0; i < n_cols; i++) {
@@ -1744,8 +1765,8 @@ check_main_table_columns (gpointer data,
static gboolean
ebsql_init_sqlite (EBookSqlite *ebsql,
- const gchar *filename,
- GError **error)
+ const gchar *filename,
+ GError **error)
{
gint ret, i;
@@ -1754,10 +1775,11 @@ ebsql_init_sqlite (EBookSqlite *ebsql,
ret = sqlite3_open (filename, &ebsql->priv->db);
/* Handle GCancellable */
- sqlite3_progress_handler (ebsql->priv->db,
- EBSQL_CANCEL_BATCH_SIZE,
- ebsql_check_cancel,
- ebsql);
+ sqlite3_progress_handler (
+ ebsql->priv->db,
+ EBSQL_CANCEL_BATCH_SIZE,
+ ebsql_check_cancel,
+ ebsql);
/* Install our custom functions */
for (i = 0; ret == SQLITE_OK && i < G_N_ELEMENTS (ebsql_custom_functions); i++)
@@ -1776,16 +1798,18 @@ ebsql_init_sqlite (EBookSqlite *ebsql,
if (ret != SQLITE_OK) {
if (!ebsql->priv->db) {
- EBSQL_SET_ERROR_LITERAL (error,
- E_BOOK_SQLITE_ERROR_LOAD,
- _("Insufficient memory"));
+ EBSQL_SET_ERROR_LITERAL (
+ error,
+ E_BOOK_SQLITE_ERROR_LOAD,
+ _("Insufficient memory"));
} else {
const gchar *errmsg = sqlite3_errmsg (ebsql->priv->db);
- EBSQL_SET_ERROR (error,
- E_BOOK_SQLITE_ERROR_ENGINE,
- "Can't open database %s: %s\n",
- filename, errmsg);
+ EBSQL_SET_ERROR (
+ error,
+ E_BOOK_SQLITE_ERROR_ENGINE,
+ "Can't open database %s: %s\n",
+ filename, errmsg);
sqlite3_close (ebsql->priv->db);
}
return FALSE;
@@ -1800,7 +1824,7 @@ ebsql_init_sqlite (EBookSqlite *ebsql,
static inline void
format_column_declaration (GString *string,
- ColumnInfo *info)
+ ColumnInfo *info)
{
g_string_append (string, info->name);
g_string_append_c (string, ' ');
@@ -1814,53 +1838,57 @@ format_column_declaration (GString *string,
}
static inline gboolean
-ensure_column_index (EBookSqlite *ebsql,
- const gchar *table,
- ColumnInfo *info,
- GError **error)
+ensure_column_index (EBookSqlite *ebsql,
+ const gchar *table,
+ ColumnInfo *info,
+ GError **error)
{
if (!info->index)
return TRUE;
- return ebsql_exec_printf (ebsql,
- "CREATE INDEX IF NOT EXISTS %Q ON %Q (%s)",
- NULL, NULL, NULL, error,
- info->index, table, info->name);
+ return ebsql_exec_printf (
+ ebsql,
+ "CREATE INDEX IF NOT EXISTS %Q ON %Q (%s)",
+ NULL, NULL, NULL, error,
+ info->index, table, info->name);
}
/* Called with the lock held and inside a transaction */
static gboolean
ebsql_resolve_folderid (EBookSqlite *ebsql,
- gint *previous_schema,
- gint *already_exists,
- GError **error)
+ gint *previous_schema,
+ gint *already_exists,
+ GError **error)
{
gint n_folders = 0;
gint version = 0;
gchar *loaded_folder_id = NULL;
gboolean success;
- success = ebsql_exec (ebsql, "SELECT count(*) FROM sqlite_master "
- "WHERE type='table' AND name='folders';",
- get_count_cb, &n_folders, NULL, error);
+ success = ebsql_exec (
+ ebsql, "SELECT count(*) FROM sqlite_master "
+ "WHERE type='table' AND name='folders';",
+ get_count_cb, &n_folders, NULL, error);
if (success && n_folders > 1) {
- EBSQL_SET_ERROR_LITERAL (error,
- E_BOOK_SQLITE_ERROR_LOAD,
- _("Cannot upgrade contacts database from a legacy "
- "database with more than one addressbook. "
- "Delete one of the entries in the 'folders' table first."));
+ EBSQL_SET_ERROR_LITERAL (
+ error,
+ E_BOOK_SQLITE_ERROR_LOAD,
+ _("Cannot upgrade contacts database from a legacy "
+ "database with more than one addressbook. "
+ "Delete one of the entries in the 'folders' table first."));
success = FALSE;
}
if (success && n_folders == 1)
- success = ebsql_exec (ebsql, "SELECT folder_id FROM folders LIMIT 1",
- get_string_cb, &loaded_folder_id, NULL, error);
+ success = ebsql_exec (
+ ebsql, "SELECT folder_id FROM folders LIMIT 1",
+ get_string_cb, &loaded_folder_id, NULL, error);
if (success && n_folders == 1)
- success = ebsql_exec (ebsql, "SELECT version FROM folders LIMIT 1",
- get_int_cb, &version, NULL, error);
-
+ success = ebsql_exec (
+ ebsql, "SELECT version FROM folders LIMIT 1",
+ get_int_cb, &version, NULL, error);
if (success && n_folders == 1) {
g_free (ebsql->priv->folderid);
@@ -1871,14 +1899,16 @@ ebsql_resolve_folderid (EBookSqlite *ebsql,
if (n_folders == 1)
*already_exists = TRUE;
- else
+ else
*already_exists = FALSE;
- EBSQL_NOTE (SCHEMA,
- g_printerr ("SCHEMA: main folder id resolved as '%s', "
- "already existing tables: %d loaded version: %d (%s)\n",
- ebsql->priv->folderid, n_folders, version,
- success ? "success" : "failed"));
+ EBSQL_NOTE (
+ SCHEMA,
+ g_printerr (
+ "SCHEMA: main folder id resolved as '%s', "
+ "already existing tables: %d loaded version: %d (%s)\n",
+ ebsql->priv->folderid, n_folders, version,
+ success ? "success" : "failed"));
*previous_schema = version;
@@ -1888,8 +1918,8 @@ ebsql_resolve_folderid (EBookSqlite *ebsql,
/* Called with the lock held and inside a transaction */
static gboolean
ebsql_init_folders (EBookSqlite *ebsql,
- gint previous_schema,
- GError **error)
+ gint previous_schema,
+ GError **error)
{
GString *string;
guint existing_columns_mask = 0, i;
@@ -1912,9 +1942,10 @@ ebsql_init_folders (EBookSqlite *ebsql,
/* Check which columns in the main table already exist */
if (success)
- success = ebsql_exec (ebsql, "PRAGMA table_info (folders)",
- check_main_table_columns, &existing_columns_mask,
- NULL, error);
+ success = ebsql_exec (
+ ebsql, "PRAGMA table_info (folders)",
+ check_main_table_columns, &existing_columns_mask,
+ NULL, error);
/* Add columns which may be missing */
for (i = 0; success && i < G_N_ELEMENTS (main_table_columns); i++) {
@@ -1923,9 +1954,10 @@ ebsql_init_folders (EBookSqlite *ebsql,
if ((existing_columns_mask & (1 << i)) != 0)
continue;
- success = ebsql_exec_printf (ebsql, "ALTER TABLE folders ADD COLUMN %s %s %s",
- NULL, NULL, NULL, error, info->name, info->type,
- info->extra ? info->extra : "");
+ success = ebsql_exec_printf (
+ ebsql, "ALTER TABLE folders ADD COLUMN %s %s %s",
+ NULL, NULL, NULL, error, info->name, info->type,
+ info->extra ? info->extra : "");
}
/* Special case upgrade for schema versions 3 & 4.
@@ -1935,7 +1967,7 @@ ebsql_init_folders (EBookSqlite *ebsql,
if (success && previous_schema >= 3 && previous_schema < 5) {
success = ebsql_exec (
- ebsql,
+ ebsql,
"UPDATE folders SET "
"multivalues = REPLACE(RTRIM(REPLACE("
"multivalues || ':', ':', "
@@ -1943,19 +1975,22 @@ ebsql_init_folders (EBookSqlite *ebsql,
"WHEN 0 THEN ';prefix ' "
"ELSE ';prefix;suffix ' "
"END)), ' ', ':'), "
- "reverse_multivalues = NULL",
+ "reverse_multivalues = NULL",
NULL, NULL, NULL, error);
}
/* Finish the eventual upgrade by storing the current schema version.
*/
if (success && previous_schema >= 1 && previous_schema < FOLDER_VERSION)
- success = ebsql_exec_printf (ebsql, "UPDATE folders SET version = %d",
- NULL, NULL, NULL, error, FOLDER_VERSION);
+ success = ebsql_exec_printf (
+ ebsql, "UPDATE folders SET version = %d",
+ NULL, NULL, NULL, error, FOLDER_VERSION);
- EBSQL_NOTE (SCHEMA,
- g_printerr ("SCHEMA: Initialized main folders table (%s)\n",
- success ? "success" : "failed"));
+ EBSQL_NOTE (
+ SCHEMA,
+ g_printerr (
+ "SCHEMA: Initialized main folders table (%s)\n",
+ success ? "success" : "failed"));
return success;
}
@@ -1963,27 +1998,31 @@ ebsql_init_folders (EBookSqlite *ebsql,
/* Called with the lock held and inside a transaction */
static gboolean
ebsql_init_keys (EBookSqlite *ebsql,
- GError **error)
+ GError **error)
{
gboolean success;
/* Create a child table to store key/value pairs for a folder. */
- success = ebsql_exec (ebsql,
- "CREATE TABLE IF NOT EXISTS keys ("
- " key TEXT PRIMARY KEY,"
- " value TEXT,"
- " folder_id TEXT REFERENCES folders)",
- NULL, NULL, NULL, error);
+ success = ebsql_exec (
+ ebsql,
+ "CREATE TABLE IF NOT EXISTS keys ("
+ " key TEXT PRIMARY KEY,"
+ " value TEXT,"
+ " folder_id TEXT REFERENCES folders)",
+ NULL, NULL, NULL, error);
/* Add an index on the keys */
if (success)
- success = ebsql_exec (ebsql,
- "CREATE INDEX IF NOT EXISTS keysindex ON keys (folder_id)",
- NULL, NULL, NULL, error);
+ success = ebsql_exec (
+ ebsql,
+ "CREATE INDEX IF NOT EXISTS keysindex ON keys (folder_id)",
+ NULL, NULL, NULL, error);
- EBSQL_NOTE (SCHEMA,
- g_printerr ("SCHEMA: Initialized keys table (%s)\n",
- success ? "success" : "failed"));
+ EBSQL_NOTE (
+ SCHEMA,
+ g_printerr (
+ "SCHEMA: Initialized keys table (%s)\n",
+ success ? "success" : "failed"));
return success;
}
@@ -2022,7 +2061,7 @@ format_multivalues (EBookSqlite *ebsql)
/* Called with the lock held and inside a transaction */
static gboolean
ebsql_add_folder (EBookSqlite *ebsql,
- GError **error)
+ GError **error)
{
gboolean success;
gchar *multivalues;
@@ -2041,9 +2080,11 @@ ebsql_add_folder (EBookSqlite *ebsql,
g_free (multivalues);
- EBSQL_NOTE (SCHEMA,
- g_printerr ("SCHEMA: Added '%s' entry to main folder (%s)\n",
- ebsql->priv->folderid, success ? "success" : "failed"));
+ EBSQL_NOTE (
+ SCHEMA,
+ g_printerr (
+ "SCHEMA: Added '%s' entry to main folder (%s)\n",
+ ebsql->priv->folderid, success ? "success" : "failed"));
return success;
}
@@ -2051,9 +2092,9 @@ ebsql_add_folder (EBookSqlite *ebsql,
/* Called with the lock held and inside a transaction */
static gboolean
ebsql_introspect_summary (EBookSqlite *ebsql,
- gint previous_schema,
- GSList **introspected_columns,
- GError **error)
+ gint previous_schema,
+ GSList **introspected_columns,
+ GError **error)
{
gboolean success;
GSList *summary_columns = NULL, *l;
@@ -2091,20 +2132,20 @@ ebsql_introspect_summary (EBookSqlite *ebsql,
/* Check if we're parsing a reverse field */
if ((p = strstr (col, "_" EBSQL_SUFFIX_REVERSE)) != NULL) {
computed = INDEX_FLAG (SUFFIX);
- freeme = g_strndup (col, p - col);
- col = freeme;
+ freeme = g_strndup (col, p - col);
+ col = freeme;
} else if ((p = strstr (col, "_" EBSQL_SUFFIX_PHONE)) != NULL) {
computed = INDEX_FLAG (PHONE);
- freeme = g_strndup (col, p - col);
- col = freeme;
+ freeme = g_strndup (col, p - col);
+ col = freeme;
} else if ((p = strstr (col, "_" EBSQL_SUFFIX_COUNTRY)) != NULL) {
computed = INDEX_FLAG (PHONE);
- freeme = g_strndup (col, p - col);
- col = freeme;
+ freeme = g_strndup (col, p - col);
+ col = freeme;
} else if ((p = strstr (col, "_" EBSQL_SUFFIX_SORT_KEY)) != NULL) {
computed = INDEX_FLAG (SORT_KEY);
- freeme = g_strndup (col, p - col);
- col = freeme;
+ freeme = g_strndup (col, p - col);
+ col = freeme;
}
/* First check exception fields */
@@ -2117,10 +2158,11 @@ ebsql_introspect_summary (EBookSqlite *ebsql,
/* Check for parse error */
if (field_id == 0) {
- EBSQL_SET_ERROR (error,
- E_BOOK_SQLITE_ERROR_UNSUPPORTED_FIELD,
- _("Error introspecting unknown summary field '%s'"),
- col);
+ EBSQL_SET_ERROR (
+ error,
+ E_BOOK_SQLITE_ERROR_UNSUPPORTED_FIELD,
+ _("Error introspecting unknown summary field '%s'"),
+ col);
success = FALSE;
g_free (freeme);
break;
@@ -2141,8 +2183,9 @@ ebsql_introspect_summary (EBookSqlite *ebsql,
}
} else {
- summary_field_append (summary_fields, ebsql->priv->folderid,
- field_id, NULL);
+ summary_field_append (
+ summary_fields, ebsql->priv->folderid,
+ field_id, NULL);
}
g_free (freeme);
@@ -2152,16 +2195,16 @@ ebsql_introspect_summary (EBookSqlite *ebsql,
goto introspect_summary_finish;
/* Introspect the multivalied summary fields */
- success = ebsql_exec_printf (ebsql,
- "SELECT multivalues FROM folders "
- "WHERE folder_id = %Q",
- get_string_cb, &multivalues, NULL, error,
- ebsql->priv->folderid);
+ success = ebsql_exec_printf (
+ ebsql,
+ "SELECT multivalues FROM folders "
+ "WHERE folder_id = %Q",
+ get_string_cb, &multivalues, NULL, error,
+ ebsql->priv->folderid);
if (!success)
goto introspect_summary_finish;
-
if (multivalues) {
gchar **fields = g_strsplit (multivalues, ":", 0);
@@ -2170,11 +2213,12 @@ ebsql_introspect_summary (EBookSqlite *ebsql,
SummaryField *iter;
gchar **params;
- params = g_strsplit (fields[i], ";", 0);
+ params = g_strsplit (fields[i], ";", 0);
field_id = e_contact_field_id (params[0]);
- iter = summary_field_append (summary_fields,
- ebsql->priv->folderid,
- field_id, NULL);
+ iter = summary_field_append (
+ summary_fields,
+ ebsql->priv->folderid,
+ field_id, NULL);
if (iter) {
for (j = 1; params[j]; ++j) {
@@ -2220,9 +2264,10 @@ ebsql_introspect_summary (EBookSqlite *ebsql,
summary_field_remove (summary_fields, E_CONTACT_EMAIL_3);
summary_field_remove (summary_fields, E_CONTACT_EMAIL_4);
- summary_field = summary_field_append (summary_fields,
- ebsql->priv->folderid,
- E_CONTACT_EMAIL, NULL);
+ summary_field = summary_field_append (
+ summary_fields,
+ ebsql->priv->folderid,
+ E_CONTACT_EMAIL, NULL);
summary_field->index |= INDEX_FLAG (PREFIX);
}
@@ -2251,8 +2296,9 @@ ebsql_introspect_summary (EBookSqlite *ebsql,
/* Apply the introspected summary fields */
if (success) {
- summary_fields_array_free (ebsql->priv->summary_fields,
- ebsql->priv->n_summary_fields);
+ summary_fields_array_free (
+ ebsql->priv->summary_fields,
+ ebsql->priv->n_summary_fields);
ebsql->priv->n_summary_fields = summary_fields->len;
ebsql->priv->summary_fields = (SummaryField *) g_array_free (summary_fields, FALSE);
@@ -2264,7 +2310,7 @@ ebsql_introspect_summary (EBookSqlite *ebsql,
/* Properly free the array */
n_fields = summary_fields->len;
- fields = (SummaryField *)g_array_free (summary_fields, FALSE);
+ fields = (SummaryField *) g_array_free (summary_fields, FALSE);
summary_fields_array_free (fields, n_fields);
g_slist_free_full (summary_columns, (GDestroyNotify) g_free);
@@ -2272,9 +2318,11 @@ ebsql_introspect_summary (EBookSqlite *ebsql,
g_free (multivalues);
- EBSQL_NOTE (SCHEMA,
- g_printerr ("SCHEMA: Introspected summary (%s)\n",
- success ? "success" : "failed"));
+ EBSQL_NOTE (
+ SCHEMA,
+ g_printerr (
+ "SCHEMA: Introspected summary (%s)\n",
+ success ? "success" : "failed"));
return success;
}
@@ -2282,8 +2330,8 @@ ebsql_introspect_summary (EBookSqlite *ebsql,
/* Called with the lock held and inside a transaction */
static gboolean
ebsql_init_contacts (EBookSqlite *ebsql,
- GSList *introspected_columns,
- GError **error)
+ GSList *introspected_columns,
+ GError **error)
{
gint i;
gboolean success = TRUE;
@@ -2316,9 +2364,10 @@ ebsql_init_contacts (EBookSqlite *ebsql,
}
g_string_append (string, ", vcard TEXT, bdata TEXT)");
- success = ebsql_exec_printf (ebsql, string->str,
- NULL, NULL, NULL, error,
- ebsql->priv->folderid);
+ success = ebsql_exec_printf (
+ ebsql, string->str,
+ NULL, NULL, NULL, error,
+ ebsql->priv->folderid);
g_string_free (string, TRUE);
@@ -2333,15 +2382,16 @@ ebsql_init_contacts (EBookSqlite *ebsql,
ColumnInfo *info = l->data;
if (g_slist_find_custom (introspected_columns,
- info->name, (GCompareFunc)g_ascii_strcasecmp))
+ info->name, (GCompareFunc) g_ascii_strcasecmp))
continue;
- success = ebsql_exec_printf (ebsql,
- "ALTER TABLE %Q ADD COLUMN %s %s %s",
- NULL, NULL, NULL, error,
- ebsql->priv->folderid,
- info->name, info->type,
- info->extra ? info->extra : "");
+ success = ebsql_exec_printf (
+ ebsql,
+ "ALTER TABLE %Q ADD COLUMN %s %s %s",
+ NULL, NULL, NULL, error,
+ ebsql->priv->folderid,
+ info->name, info->type,
+ info->extra ? info->extra : "");
}
}
@@ -2353,11 +2403,13 @@ ebsql_init_contacts (EBookSqlite *ebsql,
success = ensure_column_index (ebsql, ebsql->priv->folderid, info, error);
}
- g_slist_free_full (summary_columns, (GDestroyNotify)column_info_free);
+ g_slist_free_full (summary_columns, (GDestroyNotify) column_info_free);
- EBSQL_NOTE (SCHEMA,
- g_printerr ("SCHEMA: Initialized summary table '%s' (%s)\n",
- ebsql->priv->folderid, success ? "success" : "failed"));
+ EBSQL_NOTE (
+ SCHEMA,
+ g_printerr (
+ "SCHEMA: Initialized summary table '%s' (%s)\n",
+ ebsql->priv->folderid, success ? "success" : "failed"));
return success;
}
@@ -2365,8 +2417,8 @@ ebsql_init_contacts (EBookSqlite *ebsql,
/* Called with the lock held and inside a transaction */
static gboolean
ebsql_init_aux_tables (EBookSqlite *ebsql,
- gint previous_schema,
- GError **error)
+ gint previous_schema,
+ GError **error)
{
GString *string;
gboolean success = TRUE;
@@ -2379,8 +2431,9 @@ ebsql_init_aux_tables (EBookSqlite *ebsql,
*/
if (previous_schema >= 1 && previous_schema < 8) {
tmp = g_strconcat (ebsql->priv->folderid, "_lists", NULL);
- success = ebsql_exec_printf (ebsql, "DROP TABLE IF EXISTS %Q",
- NULL, NULL, NULL, error, tmp);
+ success = ebsql_exec_printf (
+ ebsql, "DROP TABLE IF EXISTS %Q",
+ NULL, NULL, NULL, error, tmp);
g_free (tmp);
}
@@ -2393,8 +2446,9 @@ ebsql_init_aux_tables (EBookSqlite *ebsql,
aux_columns = summary_field_list_columns (field, ebsql->priv->folderid);
/* Create the auxiliary table for this multi valued field */
- string = g_string_sized_new (COLUMN_DEFINITION_BYTES * 3 +
- COLUMN_DEFINITION_BYTES * g_slist_length (aux_columns));
+ string = g_string_sized_new (
+ COLUMN_DEFINITION_BYTES * 3 +
+ COLUMN_DEFINITION_BYTES * g_slist_length (aux_columns));
g_string_append (string, "CREATE TABLE IF NOT EXISTS %Q (uid TEXT NOT NULL REFERENCES %Q
(uid)");
for (l = aux_columns; l; l = l->next) {
@@ -2405,11 +2459,11 @@ ebsql_init_aux_tables (EBookSqlite *ebsql,
}
g_string_append_c (string, ')');
- success = ebsql_exec_printf (ebsql, string->str, NULL, NULL, NULL, error,
- field->aux_table, ebsql->priv->folderid);
+ success = ebsql_exec_printf (
+ ebsql, string->str, NULL, NULL, NULL, error,
+ field->aux_table, ebsql->priv->folderid);
g_string_free (string, TRUE);
-
if (success) {
/* Create an index on the implied 'uid' column, this is important
@@ -2420,14 +2474,16 @@ ebsql_init_aux_tables (EBookSqlite *ebsql,
*
* DELETE from email_list WHERE email_list.uid = 'contact uid'
*/
- tmp = g_strconcat ("UID_INDEX",
- "_", field->dbname,
- "_", ebsql->priv->folderid,
- NULL);
- ebsql_exec_printf (ebsql,
- "CREATE INDEX IF NOT EXISTS %Q ON %Q (%s)",
- NULL, NULL, NULL, error,
- tmp, field->aux_table, "uid");
+ tmp = g_strconcat (
+ "UID_INDEX",
+ "_", field->dbname,
+ "_", ebsql->priv->folderid,
+ NULL);
+ ebsql_exec_printf (
+ ebsql,
+ "CREATE INDEX IF NOT EXISTS %Q ON %Q (%s)",
+ NULL, NULL, NULL, error,
+ tmp, field->aux_table, "uid");
g_free (tmp);
}
@@ -2439,25 +2495,29 @@ ebsql_init_aux_tables (EBookSqlite *ebsql,
success = ensure_column_index (ebsql, field->aux_table, info, error);
}
- g_slist_free_full (aux_columns, (GDestroyNotify)column_info_free);
+ g_slist_free_full (aux_columns, (GDestroyNotify) column_info_free);
- EBSQL_NOTE (SCHEMA,
- g_printerr ("SCHEMA: Initialized auxiliary table '%s'\n",
- field->aux_table));
+ EBSQL_NOTE (
+ SCHEMA,
+ g_printerr (
+ "SCHEMA: Initialized auxiliary table '%s'\n",
+ field->aux_table));
}
- EBSQL_NOTE (SCHEMA,
- g_printerr ("SCHEMA: Initialized auxiliary tables (%s)\n",
- success ? "success" : "failed"));
+ EBSQL_NOTE (
+ SCHEMA,
+ g_printerr (
+ "SCHEMA: Initialized auxiliary tables (%s)\n",
+ success ? "success" : "failed"));
return success;
}
static gboolean
-ebsql_upgrade_one (EBookSqlite *ebsql,
- EbSqlChangeType change_type,
- EbSqlSearchData *result,
- GError **error)
+ebsql_upgrade_one (EBookSqlite *ebsql,
+ EbSqlChangeType change_type,
+ EbSqlSearchData *result,
+ GError **error)
{
EContact *contact = NULL;
gboolean success;
@@ -2475,12 +2535,10 @@ ebsql_upgrade_one (EBookSqlite *ebsql,
if (contact == NULL)
return TRUE;
- success = ebsql_insert_contact (ebsql,
- change_type,
- contact,
- result->vcard,
- result->extra, TRUE,
- error);
+ success = ebsql_insert_contact (
+ ebsql, change_type, contact,
+ result->vcard, result->extra,
+ TRUE, error);
g_object_unref (contact);
@@ -2489,9 +2547,9 @@ ebsql_upgrade_one (EBookSqlite *ebsql,
/* Called with the lock held and inside a transaction */
static gboolean
-ebsql_upgrade (EBookSqlite *ebsql,
- EbSqlChangeType change_type,
- GError **error)
+ebsql_upgrade (EBookSqlite *ebsql,
+ EbSqlChangeType change_type,
+ GError **error)
{
gchar *uid = NULL;
gint n_results;
@@ -2524,10 +2582,11 @@ ebsql_upgrade (EBookSqlite *ebsql,
batch = g_slist_reverse (batch);
for (l = batch; success && l; l = l->next) {
result = l->data;
- success = ebsql_upgrade_one (ebsql,
- change_type,
- result,
- error);
+ success = ebsql_upgrade_one (
+ ebsql,
+ change_type,
+ result,
+ error);
}
/* result is now the last one in the list */
@@ -2538,7 +2597,7 @@ ebsql_upgrade (EBookSqlite *ebsql,
}
n_results = g_slist_length (batch);
- g_slist_free_full (batch, (GDestroyNotify)e_book_sqlite_search_data_free);
+ g_slist_free_full (batch, (GDestroyNotify) e_book_sqlite_search_data_free);
} while (success && n_results == EBSQL_UPGRADE_BATCH_SIZE);
@@ -2561,9 +2620,9 @@ ebsql_upgrade (EBookSqlite *ebsql,
}
static gboolean
-ebsql_set_locale_internal (EBookSqlite *ebsql,
- const gchar *locale,
- GError **error)
+ebsql_set_locale_internal (EBookSqlite *ebsql,
+ const gchar *locale,
+ GError **error)
{
EBookSqlitePrivate *priv = ebsql->priv;
ECollator *collator;
@@ -2573,10 +2632,9 @@ ebsql_set_locale_internal (EBookSqlite *ebsql,
if (g_strcmp0 (priv->locale, locale) != 0) {
gchar *country_code = NULL;
- collator = e_collator_new_interpret_country (locale,
- &country_code,
- error);
- if (!collator)
+ collator = e_collator_new_interpret_country (
+ locale, &country_code, error);
+ if (collator == NULL)
return FALSE;
/* Assign region code parsed from the locale by ICU */
@@ -2599,8 +2657,8 @@ ebsql_set_locale_internal (EBookSqlite *ebsql,
/* Called with the lock held and inside a transaction */
static gboolean
ebsql_init_is_populated (EBookSqlite *ebsql,
- gint previous_schema,
- GError **error)
+ gint previous_schema,
+ GError **error)
{
gboolean success = TRUE;
@@ -2632,9 +2690,9 @@ ebsql_init_is_populated (EBookSqlite *ebsql,
/* Called with the lock held and inside a transaction */
static gboolean
ebsql_init_locale (EBookSqlite *ebsql,
- gint previous_schema,
- gboolean already_exists,
- GError **error)
+ gint previous_schema,
+ gboolean already_exists,
+ GError **error)
{
gchar *stored_lc_collate = NULL;
gchar *stored_region_code = NULL;
@@ -2688,9 +2746,11 @@ ebsql_init_locale (EBookSqlite *ebsql,
if (success && relocalize_needed)
success = ebsql_upgrade (ebsql, EBSQL_CHANGE_LAST, error);
- EBSQL_NOTE (SCHEMA,
- g_printerr ("SCHEMA: Initialized locale as '%s' (%s)\n",
- ebsql->priv->locale, success ? "success" : "failed"));
+ EBSQL_NOTE (
+ SCHEMA,
+ g_printerr (
+ "SCHEMA: Initialized locale as '%s' (%s)\n",
+ ebsql->priv->locale, success ? "success" : "failed"));
g_free (stored_region_code);
g_free (stored_lc_collate);
@@ -2700,14 +2760,14 @@ ebsql_init_locale (EBookSqlite *ebsql,
static EBookSqlite *
ebsql_new_internal (const gchar *path,
- EbSqlVCardCallback vcard_callback,
- EbSqlChangeCallback change_callback,
- gpointer user_data,
- GDestroyNotify user_data_destroy,
- SummaryField *fields,
- gint n_fields,
- GCancellable *cancellable,
- GError **error)
+ EbSqlVCardCallback vcard_callback,
+ EbSqlChangeCallback change_callback,
+ gpointer user_data,
+ GDestroyNotify user_data_destroy,
+ SummaryField *fields,
+ gint n_fields,
+ GCancellable *cancellable,
+ GError **error)
{
EBookSqlite *ebsql;
gchar *dirname = NULL;
@@ -2720,8 +2780,9 @@ ebsql_new_internal (const gchar *path,
EBSQL_LOCK_MUTEX (&dbcon_lock);
- EBSQL_NOTE (SCHEMA,
- g_printerr ("SCHEMA: Creating new EBookSqlite at path '%s'\n", path));
+ EBSQL_NOTE (
+ SCHEMA,
+ g_printerr ("SCHEMA: Creating new EBookSqlite at path '%s'\n", path));
ebsql = ebsql_ref_from_hash (path);
if (ebsql) {
@@ -2744,10 +2805,11 @@ ebsql_new_internal (const gchar *path,
/* Ensure existance of the directories leading up to 'path' */
dirname = g_path_get_dirname (path);
if (g_mkdir_with_parents (dirname, 0777) < 0) {
- EBSQL_SET_ERROR (error,
- E_BOOK_SQLITE_ERROR_LOAD,
- "Can not make parent directory: %s",
- g_strerror (errno));
+ EBSQL_SET_ERROR (
+ error,
+ E_BOOK_SQLITE_ERROR_LOAD,
+ "Can not make parent directory: %s",
+ g_strerror (errno));
success = FALSE;
goto exit;
}
@@ -2778,10 +2840,11 @@ ebsql_new_internal (const gchar *path,
* the schema.
*/
if (success)
- success = ebsql_resolve_folderid (ebsql,
- &previous_schema,
- &already_exists,
- error);
+ success = ebsql_resolve_folderid (
+ ebsql,
+ &previous_schema,
+ &already_exists,
+ error);
/* Initialize main folders table, also retrieve the current
* schema version if the table already exists
@@ -2807,18 +2870,20 @@ ebsql_new_internal (const gchar *path,
* Some summary fields are also adjusted for schema upgrades
*/
if (success && already_exists)
- success = ebsql_introspect_summary (ebsql,
- previous_schema,
- &introspected_columns,
- error);
+ success = ebsql_introspect_summary (
+ ebsql,
+ previous_schema,
+ &introspected_columns,
+ error);
/* Add the contacts table, ensure the right columns are defined
* to handle our summary configuration
*/
if (success)
- success = ebsql_init_contacts (ebsql,
- introspected_columns,
- error);
+ success = ebsql_init_contacts (
+ ebsql,
+ introspected_columns,
+ error);
/* Add any auxiliary tables which we might need to support our
* summary configuration.
@@ -2836,7 +2901,6 @@ ebsql_new_internal (const gchar *path,
if (success)
success = ebsql_init_statements (ebsql, error);
-
/* When porting from older schemas, we need to port the old 'is-populated' flag */
if (success)
success = ebsql_init_is_populated (ebsql, previous_schema, error);
@@ -2849,8 +2913,9 @@ ebsql_new_internal (const gchar *path,
* for this.
*/
if (success)
- success = ebsql_init_locale (ebsql, previous_schema,
- already_exists, error);
+ success = ebsql_init_locale (
+ ebsql, previous_schema,
+ already_exists, error);
if (success)
success = ebsql_commit_transaction (ebsql, error);
@@ -2875,9 +2940,11 @@ ebsql_new_internal (const gchar *path,
if (!success)
g_clear_object (&ebsql);
- EBSQL_NOTE (SCHEMA,
- g_printerr ("SCHEMA: %s the new EBookSqlite\n",
- success ? "Successfully created" : "Failed to create"));
+ EBSQL_NOTE (
+ SCHEMA,
+ g_printerr (
+ "SCHEMA: %s the new EBookSqlite\n",
+ success ? "Successfully created" : "Failed to create"));
g_slist_free_full (introspected_columns, (GDestroyNotify) g_free);
g_free (dirname);
@@ -2891,7 +2958,7 @@ ebsql_new_internal (const gchar *path,
static gchar *
convert_phone (const gchar *normal,
const gchar *region_code,
- gint *out_country_code)
+ gint *out_country_code)
{
EPhoneNumber *number = NULL;
gchar *national_number = NULL;
@@ -2928,7 +2995,7 @@ typedef struct {
static E164Number *
ebsql_e164_number_new (gint country_code,
- gchar *national)
+ gchar *national)
{
E164Number *number = g_slice_new (E164Number);
@@ -2949,15 +3016,16 @@ ebsql_e164_number_free (E164Number *number)
static gint
ebsql_e164_number_find (E164Number *number_a,
- E164Number *number_b)
+ E164Number *number_b)
{
gint ret;
ret = number_a->country_code - number_b->country_code;
if (ret == 0)
- ret = g_strcmp0 (number_a->national,
- number_b->national);
+ ret = g_strcmp0 (
+ number_a->national,
+ number_b->national);
return ret;
}
@@ -3004,14 +3072,16 @@ extract_e164_attribute_params (EContact *contact)
if (this_national) {
E164Number *number;
- EBSQL_NOTE (CONVERT_E164,
- g_printerr ("Extracted e164 number from '%s' with "
- "country = %d national = %s\n",
- (gchar *)e_contact_get_const (contact, E_CONTACT_UID),
- this_country, this_national));
+ EBSQL_NOTE (
+ CONVERT_E164,
+ g_printerr (
+ "Extracted e164 number from '%s' with "
+ "country = %d national = %s\n",
+ (gchar *) e_contact_get_const (contact, E_CONTACT_UID),
+ this_country, this_national));
- number = ebsql_e164_number_new (this_country,
- this_national);
+ number = ebsql_e164_number_new (
+ this_country, this_national);
extracted = g_list_prepend (extracted, number);
}
@@ -3022,17 +3092,19 @@ extract_e164_attribute_params (EContact *contact)
e_vcard_attribute_remove_param (attr, EVC_X_E164);
}
- EBSQL_NOTE (CONVERT_E164,
- g_printerr ("Extracted %d numbers from '%s'\n",
- g_list_length (extracted),
- (gchar *)e_contact_get_const (contact, E_CONTACT_UID)));
+ EBSQL_NOTE (
+ CONVERT_E164,
+ g_printerr (
+ "Extracted %d numbers from '%s'\n",
+ g_list_length (extracted),
+ (gchar *) e_contact_get_const (contact, E_CONTACT_UID)));
return extracted;
}
static gboolean
update_e164_attribute_params (EBookSqlite *ebsql,
- EContact *contact,
+ EContact *contact,
const gchar *default_region)
{
GList *original_numbers = NULL;
@@ -3060,10 +3132,11 @@ update_e164_attribute_params (EBookSqlite *ebsql,
/* Compute E164 number based on the TEL value */
if (values && values->data) {
- original_number = (const gchar *)values->data;
- number.national = convert_phone (original_number,
- ebsql->priv->region_code,
- &(number.country_code));
+ original_number = (const gchar *) values->data;
+ number.national = convert_phone (
+ original_number,
+ ebsql->priv->region_code,
+ &(number.country_code));
}
if (number.national == NULL)
@@ -3075,8 +3148,8 @@ update_e164_attribute_params (EBookSqlite *ebsql,
/* Check if we have a differing e164 number, if there is no match
* in the old existing values then the vcard changed
*/
- if (!g_list_find_custom (original_numbers, &number,
- (GCompareFunc)ebsql_e164_number_find))
+ if (!g_list_find_custom (original_numbers, &number,
+ (GCompareFunc) ebsql_e164_number_find))
changed = TRUE;
if (number.country_code != 0)
@@ -3094,12 +3167,14 @@ update_e164_attribute_params (EBookSqlite *ebsql,
** other vCard parsers. */
e_vcard_attribute_param_add_values (param, number.national, country_string, NULL);
- EBSQL_NOTE (CONVERT_E164,
- g_printerr ("Converted '%s' to e164 number with country = %d "
- "national = %s for '%s' (changed %s)\n",
- original_number, number.country_code, number.national,
- (gchar *)e_contact_get_const (contact, E_CONTACT_UID),
- changed ? "yes" : "no"));
+ EBSQL_NOTE (
+ CONVERT_E164,
+ g_printerr (
+ "Converted '%s' to e164 number with country = %d "
+ "national = %s for '%s' (changed %s)\n",
+ original_number, number.country_code, number.national,
+ (gchar *) e_contact_get_const (contact, E_CONTACT_UID),
+ changed ? "yes" : "no"));
g_free (number.national);
g_free (country_string);
@@ -3109,22 +3184,23 @@ update_e164_attribute_params (EBookSqlite *ebsql,
n_numbers != g_list_length (original_numbers))
changed = TRUE;
+ EBSQL_NOTE (
+ CONVERT_E164,
+ g_printerr (
+ "Converted %d e164 numbers for '%s' which previously had %d e164 numbers\n",
+ n_numbers,
+ (gchar *) e_contact_get_const (contact, E_CONTACT_UID),
+ g_list_length (original_numbers)));
- EBSQL_NOTE (CONVERT_E164,
- g_printerr ("Converted %d e164 numbers for '%s' which previously had %d e164 numbers\n",
- n_numbers,
- (gchar *)e_contact_get_const (contact, E_CONTACT_UID),
- g_list_length (original_numbers)));
-
- g_list_free_full (original_numbers, (GDestroyNotify)ebsql_e164_number_free);
+ g_list_free_full (original_numbers, (GDestroyNotify) ebsql_e164_number_free);
return changed;
}
static sqlite3_stmt *
ebsql_prepare_multi_delete (EBookSqlite *ebsql,
- SummaryField *field,
- GError **error)
+ SummaryField *field,
+ GError **error)
{
sqlite3_stmt *stmt = NULL;
gchar *stmt_str;
@@ -3138,9 +3214,9 @@ ebsql_prepare_multi_delete (EBookSqlite *ebsql,
static gboolean
ebsql_run_multi_delete (EBookSqlite *ebsql,
- SummaryField *field,
- const gchar *uid,
- GError **error)
+ SummaryField *field,
+ const gchar *uid,
+ GError **error)
{
sqlite3_stmt *stmt;
gint ret;
@@ -3165,8 +3241,8 @@ ebsql_run_multi_delete (EBookSqlite *ebsql,
static sqlite3_stmt *
ebsql_prepare_multi_insert (EBookSqlite *ebsql,
- SummaryField *field,
- GError **error)
+ SummaryField *field,
+ GError **error)
{
sqlite3_stmt *stmt = NULL;
GString *string;
@@ -3202,11 +3278,11 @@ ebsql_prepare_multi_insert (EBookSqlite *ebsql,
static gboolean
ebsql_run_multi_insert_one (EBookSqlite *ebsql,
- sqlite3_stmt *stmt,
- SummaryField *field,
- const gchar *uid,
- const gchar *value,
- GError **error)
+ sqlite3_stmt *stmt,
+ SummaryField *field,
+ const gchar *uid,
+ const gchar *value,
+ GError **error)
{
gchar *normal = e_util_utf8_normalize (value);
gchar *str;
@@ -3231,8 +3307,9 @@ ebsql_run_multi_insert_one (EBookSqlite *ebsql,
if (ret == SQLITE_OK && (field->index & INDEX_FLAG (PHONE)) != 0) {
gint country_code;
- str = convert_phone (normal, ebsql->priv->region_code,
- &country_code);
+ str = convert_phone (
+ normal, ebsql->priv->region_code,
+ &country_code);
/* :value_phone */
ret = sqlite3_bind_text (stmt, param_idx++, str, -1, g_free);
@@ -3249,10 +3326,10 @@ ebsql_run_multi_insert_one (EBookSqlite *ebsql,
static gboolean
ebsql_run_multi_insert (EBookSqlite *ebsql,
- SummaryField *field,
- const gchar *uid,
- EContact *contact,
- GError **error)
+ SummaryField *field,
+ const gchar *uid,
+ EContact *contact,
+ GError **error)
{
sqlite3_stmt *stmt;
GList *values, *l;
@@ -3276,8 +3353,8 @@ ebsql_run_multi_insert (EBookSqlite *ebsql,
static sqlite3_stmt *
ebsql_prepare_insert (EBookSqlite *ebsql,
- gboolean replace_existing,
- GError **error)
+ gboolean replace_existing,
+ GError **error)
{
sqlite3_stmt *stmt;
GString *string;
@@ -3285,11 +3362,13 @@ ebsql_prepare_insert (EBookSqlite *ebsql,
string = g_string_new ("");
if (replace_existing)
- ebsql_string_append_printf (string, "INSERT or REPLACE INTO %Q (",
- ebsql->priv->folderid);
+ ebsql_string_append_printf (
+ string, "INSERT or REPLACE INTO %Q (",
+ ebsql->priv->folderid);
else
- ebsql_string_append_printf (string, "INSERT or FAIL INTO %Q (",
- ebsql->priv->folderid);
+ ebsql_string_append_printf (
+ string, "INSERT or FAIL INTO %Q (",
+ ebsql->priv->folderid);
/*
* First specify the column names for the insert, since it's possible we
@@ -3386,7 +3465,7 @@ ebsql_prepare_insert (EBookSqlite *ebsql,
static gboolean
ebsql_init_statements (EBookSqlite *ebsql,
- GError **error)
+ GError **error)
{
sqlite3_stmt *stmt;
gint i;
@@ -3400,13 +3479,15 @@ ebsql_init_statements (EBookSqlite *ebsql,
goto preparation_failed;
ebsql->priv->multi_deletes =
- g_hash_table_new_full (g_direct_hash, g_direct_equal,
- NULL,
- (GDestroyNotify)sqlite3_finalize);
+ g_hash_table_new_full (
+ g_direct_hash, g_direct_equal,
+ NULL,
+ (GDestroyNotify) sqlite3_finalize);
ebsql->priv->multi_inserts =
- g_hash_table_new_full (g_direct_hash, g_direct_equal,
- NULL,
- (GDestroyNotify)sqlite3_finalize);
+ g_hash_table_new_full (
+ g_direct_hash, g_direct_equal,
+ NULL,
+ (GDestroyNotify) sqlite3_finalize);
for (i = 0; i < ebsql->priv->n_summary_fields; i++) {
SummaryField *field = &(ebsql->priv->summary_fields[i]);
@@ -3418,17 +3499,19 @@ ebsql_init_statements (EBookSqlite *ebsql,
if (!stmt)
goto preparation_failed;
- g_hash_table_insert (ebsql->priv->multi_inserts,
- GUINT_TO_POINTER (field->field_id),
- stmt);
+ g_hash_table_insert (
+ ebsql->priv->multi_inserts,
+ GUINT_TO_POINTER (field->field_id),
+ stmt);
stmt = ebsql_prepare_multi_delete (ebsql, field, error);
if (!stmt)
goto preparation_failed;
- g_hash_table_insert (ebsql->priv->multi_deletes,
- GUINT_TO_POINTER (field->field_id),
- stmt);
+ g_hash_table_insert (
+ ebsql->priv->multi_deletes,
+ GUINT_TO_POINTER (field->field_id),
+ stmt);
}
return TRUE;
@@ -3440,11 +3523,11 @@ ebsql_init_statements (EBookSqlite *ebsql,
static gboolean
ebsql_run_insert (EBookSqlite *ebsql,
- gboolean replace,
- EContact *contact,
- gchar *vcard,
- const gchar *extra,
- GError **error)
+ gboolean replace,
+ EContact *contact,
+ gchar *vcard,
+ const gchar *extra,
+ GError **error)
{
EBookSqlitePrivate *priv;
sqlite3_stmt *stmt;
@@ -3512,8 +3595,9 @@ ebsql_run_insert (EBookSqlite *ebsql,
(field->index & INDEX_FLAG (PHONE)) != 0) {
gint country_code;
- str = convert_phone (normal, ebsql->priv->region_code,
- &country_code);
+ str = convert_phone (
+ normal, ebsql->priv->region_code,
+ &country_code);
ret = sqlite3_bind_text (stmt, param_idx++, str, -1, g_free);
if (ret == SQLITE_OK)
@@ -3533,10 +3617,12 @@ ebsql_run_insert (EBookSqlite *ebsql,
if (ret == SQLITE_OK) {
- EBSQL_NOTE (INSERT,
- g_printerr ("Inserting vcard for contact with UID '%s'\n%s\n",
- (gchar *)e_contact_get_const (contact, E_CONTACT_UID),
- vcard ? vcard : "(no vcard)"));
+ EBSQL_NOTE (
+ INSERT,
+ g_printerr (
+ "Inserting vcard for contact with UID '%s'\n%s\n",
+ (gchar *) e_contact_get_const (contact, E_CONTACT_UID),
+ vcard ? vcard : "(no vcard)"));
/* If we have a priv->vcard_callback, then it's a shallow addressbook
* and we don't populate the vcard column, need to free it anyway
@@ -3544,7 +3630,7 @@ ebsql_run_insert (EBookSqlite *ebsql,
if (priv->vcard_callback != NULL) {
g_free (vcard);
vcard = NULL;
- }
+ }
ret = sqlite3_bind_text (stmt, param_idx++, vcard, -1, g_free);
}
@@ -3556,12 +3642,14 @@ ebsql_run_insert (EBookSqlite *ebsql,
/* Run the statement */
success = ebsql_complete_statement (ebsql, stmt, ret, &local_error);
- EBSQL_NOTE (INSERT,
- g_printerr ("%s contact with UID '%s' and extra data '%s' vcard: %s (error: %s)\n",
- success ? "Succesfully inserted" : "Failed to insert",
- (gchar *)e_contact_get_const (contact, E_CONTACT_UID), extra,
- vcard ? "yes" : "no",
- local_error ? local_error->message : "(none)"));
+ EBSQL_NOTE (
+ INSERT,
+ g_printerr (
+ "%s contact with UID '%s' and extra data '%s' vcard: %s (error: %s)\n",
+ success ? "Succesfully inserted" : "Failed to insert",
+ (gchar *) e_contact_get_const (contact, E_CONTACT_UID), extra,
+ vcard ? "yes" : "no",
+ local_error ? local_error->message : "(none)"));
if (!success)
g_propagate_error (error, local_error);
@@ -3571,12 +3659,12 @@ ebsql_run_insert (EBookSqlite *ebsql,
static gboolean
ebsql_insert_contact (EBookSqlite *ebsql,
- EbSqlChangeType change_type,
- EContact *contact,
- const gchar *original_vcard,
- const gchar *extra,
- gboolean replace,
- GError **error)
+ EbSqlChangeType change_type,
+ EContact *contact,
+ const gchar *original_vcard,
+ const gchar *extra,
+ gboolean replace,
+ GError **error)
{
EBookSqlitePrivate *priv;
gboolean e164_changed = FALSE;
@@ -3584,11 +3672,11 @@ ebsql_insert_contact (EBookSqlite *ebsql,
gchar *uid, *vcard = NULL;
priv = ebsql->priv;
- uid = e_contact_get (contact, E_CONTACT_UID);
+ uid = e_contact_get (contact, E_CONTACT_UID);
/* Update E.164 parameters in vcard if needed */
- e164_changed = update_e164_attribute_params (ebsql, contact,
- priv->region_code);
+ e164_changed = update_e164_attribute_params (
+ ebsql, contact, priv->region_code);
if (e164_changed || original_vcard == NULL) {
@@ -3648,19 +3736,19 @@ typedef enum {
PREFLIGHT_UNSUPPORTED,
} PreflightStatus;
-#define EBSQL_STATUS_STR(status) \
- ((status) == PREFLIGHT_OK ? "Ok" : \
- (status) == PREFLIGHT_LIST_ALL ? "List all" : \
- (status) == PREFLIGHT_NOT_SUMMARIZED ? "Not Summarized" : \
- (status) == PREFLIGHT_INVALID ? "Invalid" : \
- (status) == PREFLIGHT_UNSUPPORTED ? "Unsupported" : "(unknown status)")
+#define EBSQL_STATUS_STR(status) \
+ ((status) == PREFLIGHT_OK ? "Ok" : \
+ (status) == PREFLIGHT_LIST_ALL ? "List all" : \
+ (status) == PREFLIGHT_NOT_SUMMARIZED ? "Not Summarized" : \
+ (status) == PREFLIGHT_INVALID ? "Invalid" : \
+ (status) == PREFLIGHT_UNSUPPORTED ? "Unsupported" : "(unknown status)")
/* Whether we can satisfy the constraints or whether we
* need to do a fallback, we still need to call
* ebsql_generate_constraints()
*/
-#define EBSQL_STATUS_GEN_CONSTRAINTS(status) \
- ((status) == PREFLIGHT_OK || \
+#define EBSQL_STATUS_GEN_CONSTRAINTS(status) \
+ ((status) == PREFLIGHT_OK || \
(status) == PREFLIGHT_NOT_SUMMARIZED)
/* Internal extension of the EBookQueryTest enumeration */
@@ -3677,30 +3765,30 @@ enum {
BOOK_QUERY_SUB_FIRST = BOOK_QUERY_SUB_AND,
};
-#define EBSQL_QUERY_TYPE_STR(query) \
- ((query) == BOOK_QUERY_EXISTS ? "exists" : \
- (query) == BOOK_QUERY_SUB_AND ? "AND" : \
- (query) == BOOK_QUERY_SUB_OR ? "OR" : \
- (query) == BOOK_QUERY_SUB_NOT ? "NOT" : \
- (query) == BOOK_QUERY_SUB_END ? "END" : \
- (query) == E_BOOK_QUERY_IS ? "is" : \
- (query) == E_BOOK_QUERY_CONTAINS ? "contains" : \
- (query) == E_BOOK_QUERY_BEGINS_WITH ? "begins-with" : \
- (query) == E_BOOK_QUERY_ENDS_WITH ? "ends-with" : \
- (query) == E_BOOK_QUERY_EQUALS_PHONE_NUMBER ? "eqphone" : \
- (query) == E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER ? "eqphone-national" : \
- (query) == E_BOOK_QUERY_EQUALS_SHORT_PHONE_NUMBER ? "eqphone-short" : \
- (query) == E_BOOK_QUERY_REGEX_NORMAL ? "regex-normal" : \
- (query) == E_BOOK_QUERY_REGEX_NORMAL ? "regex-raw" : "(unknown)")
-
-#define EBSQL_FIELD_ID_STR(field_id) \
- ((field_id) == E_CONTACT_FIELD_LAST ? "x-evolution-any-field" : \
- (field_id) == 0 ? "(not an EContactField)" : \
+#define EBSQL_QUERY_TYPE_STR(query) \
+ ((query) == BOOK_QUERY_EXISTS ? "exists" : \
+ (query) == BOOK_QUERY_SUB_AND ? "AND" : \
+ (query) == BOOK_QUERY_SUB_OR ? "OR" : \
+ (query) == BOOK_QUERY_SUB_NOT ? "NOT" : \
+ (query) == BOOK_QUERY_SUB_END ? "END" : \
+ (query) == E_BOOK_QUERY_IS ? "is" : \
+ (query) == E_BOOK_QUERY_CONTAINS ? "contains" : \
+ (query) == E_BOOK_QUERY_BEGINS_WITH ? "begins-with" : \
+ (query) == E_BOOK_QUERY_ENDS_WITH ? "ends-with" : \
+ (query) == E_BOOK_QUERY_EQUALS_PHONE_NUMBER ? "eqphone" : \
+ (query) == E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER ? "eqphone-national" : \
+ (query) == E_BOOK_QUERY_EQUALS_SHORT_PHONE_NUMBER ? "eqphone-short" : \
+ (query) == E_BOOK_QUERY_REGEX_NORMAL ? "regex-normal" : \
+ (query) == E_BOOK_QUERY_REGEX_NORMAL ? "regex-raw" : "(unknown)")
+
+#define EBSQL_FIELD_ID_STR(field_id) \
+ ((field_id) == E_CONTACT_FIELD_LAST ? "x-evolution-any-field" : \
+ (field_id) == 0 ? "(not an EContactField)" : \
e_contact_field_name (field_id))
-#define IS_QUERY_PHONE(query) \
- ((query) == E_BOOK_QUERY_EQUALS_PHONE_NUMBER || \
- (query) == E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER || \
+#define IS_QUERY_PHONE(query) \
+ ((query) == E_BOOK_QUERY_EQUALS_PHONE_NUMBER || \
+ (query) == E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER || \
(query) == E_BOOK_QUERY_EQUALS_SHORT_PHONE_NUMBER)
typedef struct {
@@ -3750,52 +3838,52 @@ query_delimiter_new (guint query)
g_return_val_if_fail (query >= BOOK_QUERY_SUB_FIRST, NULL);
- delim = g_slice_new (QueryDelimiter);
+ delim = g_slice_new (QueryDelimiter);
delim->query = query;
- return (QueryElement *)delim;
+ return (QueryElement *) delim;
}
static QueryFieldTest *
-query_field_test_new (guint query,
- EContactField field)
+query_field_test_new (guint query,
+ EContactField field)
{
QueryFieldTest *test;
g_return_val_if_fail (query < BOOK_QUERY_SUB_FIRST, NULL);
g_return_val_if_fail (IS_QUERY_PHONE (query) == FALSE, NULL);
- test = g_slice_new (QueryFieldTest);
- test->query = query;
- test->field_id = field;
+ test = g_slice_new (QueryFieldTest);
+ test->query = query;
+ test->field_id = field;
/* Instead of g_slice_new0, NULL them out manually */
- test->field = NULL;
- test->value = NULL;
+ test->field = NULL;
+ test->value = NULL;
return test;
}
static QueryPhoneTest *
-query_phone_test_new (guint query,
- EContactField field)
+query_phone_test_new (guint query,
+ EContactField field)
{
QueryPhoneTest *test;
g_return_val_if_fail (IS_QUERY_PHONE (query), NULL);
- test = g_slice_new (QueryPhoneTest);
- test->query = query;
- test->field_id = field;
+ test = g_slice_new (QueryPhoneTest);
+ test->query = query;
+ test->field_id = field;
/* Instead of g_slice_new0, NULL them out manually */
- test->field = NULL;
- test->value = NULL;
+ test->field = NULL;
+ test->value = NULL;
/* Extra QueryPhoneTest fields */
- test->region = NULL;
- test->national = NULL;
- test->country = 0;
+ test->region = NULL;
+ test->national = NULL;
+ test->country = 0;
return test;
}
@@ -3806,18 +3894,18 @@ query_element_free (QueryElement *element)
if (element) {
if (element->query >= BOOK_QUERY_SUB_FIRST) {
- QueryDelimiter *delim = (QueryDelimiter *)element;
+ QueryDelimiter *delim = (QueryDelimiter *) element;
g_slice_free (QueryDelimiter, delim);
} else if (IS_QUERY_PHONE (element->query)) {
- QueryPhoneTest *test = (QueryPhoneTest *)element;
+ QueryPhoneTest *test = (QueryPhoneTest *) element;
g_free (test->value);
g_free (test->region);
g_free (test->national);
g_slice_free (QueryPhoneTest, test);
} else {
- QueryFieldTest *test = (QueryFieldTest *)element;
+ QueryFieldTest *test = (QueryFieldTest *) element;
g_free (test->value);
g_slice_free (QueryFieldTest, test);
@@ -3828,13 +3916,13 @@ query_element_free (QueryElement *element)
/* We use ptr arrays for the QueryElement vectors */
static inline void
constraints_insert (GPtrArray *array,
- gint idx,
- gpointer data)
+ gint idx,
+ gpointer data)
{
#if 0
g_ptr_array_insert (array, idx, data);
#else
- g_return_if_fail ((idx >= -1) && (idx < (gint)array->len + 1));
+ g_return_if_fail ((idx >= -1) && (idx < (gint) array->len + 1));
if (idx < 0)
idx = array->len;
@@ -3842,9 +3930,10 @@ constraints_insert (GPtrArray *array,
g_ptr_array_add (array, NULL);
if (idx != (array->len - 1))
- memmove (&(array->pdata[idx + 1]),
- &(array->pdata[idx]),
- ((array->len - 1) - idx) * sizeof (gpointer));
+ memmove (
+ &(array->pdata[idx + 1]),
+ &(array->pdata[idx]),
+ ((array->len - 1) - idx) * sizeof (gpointer));
array->pdata[idx] = data;
#endif
@@ -3852,11 +3941,11 @@ constraints_insert (GPtrArray *array,
static inline QueryElement *
constraints_take (GPtrArray *array,
- gint idx)
+ gint idx)
{
QueryElement *element;
- g_return_val_if_fail (idx >= 0 && idx < (gint)array->len, NULL);
+ g_return_val_if_fail (idx >= 0 && idx < (gint) array->len, NULL);
element = array->pdata[idx];
array->pdata[idx] = NULL;
@@ -3867,8 +3956,8 @@ constraints_take (GPtrArray *array,
static inline void
constraints_insert_delimiter (GPtrArray *array,
- gint idx,
- guint query)
+ gint idx,
+ guint query)
{
QueryElement *delim;
@@ -3877,17 +3966,17 @@ constraints_insert_delimiter (GPtrArray *array,
}
static inline void
-constraints_insert_field_test (GPtrArray *array,
- gint idx,
- SummaryField *field,
- guint query,
- const gchar *value)
+constraints_insert_field_test (GPtrArray *array,
+ gint idx,
+ SummaryField *field,
+ guint query,
+ const gchar *value)
{
QueryFieldTest *test;
- test = query_field_test_new (query, field->field_id);
- test->field = field;
- test->value = g_strdup (value);
+ test = query_field_test_new (query, field->field_id);
+ test->field = field;
+ test->value = g_strdup (value);
constraints_insert (array, idx, test);
}
@@ -3920,13 +4009,13 @@ typedef struct {
static inline void
sub_query_context_push (SubQueryContext *ctx,
- guint sub_type)
+ guint sub_type)
{
SubQueryData *data;
- data = g_slice_new (SubQueryData);
+ data = g_slice_new (SubQueryData);
data->sub_type = sub_type;
- data->count = 0;
+ data->count = 0;
g_queue_push_tail (ctx, data);
}
@@ -3994,12 +4083,12 @@ typedef gboolean (* PreflightSubCallback) (QueryElement *element,
gpointer user_data);
static void
-query_preflight_foreach_sub (QueryElement **elements,
- gint n_elements,
- gint offset,
- gboolean include_delim,
- PreflightSubCallback callback,
- gpointer user_data)
+query_preflight_foreach_sub (QueryElement **elements,
+ gint n_elements,
+ gint offset,
+ gboolean include_delim,
+ PreflightSubCallback callback,
+ gpointer user_data)
{
gint sub_counter = 1, i;
@@ -4052,7 +4141,6 @@ static const struct {
{ "exists", FALSE, BOOK_QUERY_EXISTS },
};
-
/* Cheat our way into passing mode data to these funcs */
static ESExpResult *
func_check_subset (ESExp *f,
@@ -4069,20 +4157,22 @@ func_check_subset (ESExp *f,
query_type = GPOINTER_TO_UINT (data);
/* The compound query delimiter is the first element in this return array */
- result_array = g_ptr_array_new_with_free_func ((GDestroyNotify)query_element_free);
- element = query_delimiter_new (query_type);
+ result_array = g_ptr_array_new_with_free_func ((GDestroyNotify) query_element_free);
+ element = query_delimiter_new (query_type);
g_ptr_array_add (result_array, element);
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT INIT: Open sub: %s\n",
- EBSQL_QUERY_TYPE_STR (query_type)));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr (
+ "PREFLIGHT INIT: Open sub: %s\n",
+ EBSQL_QUERY_TYPE_STR (query_type)));
for (i = 0; i < argc; i++) {
sub_result = e_sexp_term_eval (f, argv[i]);
if (sub_result->type == ESEXP_RES_ARRAY_PTR) {
/* Steal the elements directly from the sub result */
- sub_elements = (QueryElement **)sub_result->value.ptrarray->pdata;
+ sub_elements = (QueryElement **) sub_result->value.ptrarray->pdata;
len = sub_result->value.ptrarray->len;
for (j = 0; j < len; j++) {
@@ -4095,9 +4185,11 @@ func_check_subset (ESExp *f,
e_sexp_result_free (f, sub_result);
}
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT INIT: Close sub: %s\n",
- EBSQL_QUERY_TYPE_STR (query_type)));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr (
+ "PREFLIGHT INIT: Close sub: %s\n",
+ EBSQL_QUERY_TYPE_STR (query_type)));
/* The last element in this return array is the sub end delimiter */
element = query_delimiter_new (BOOK_QUERY_SUB_END);
@@ -4111,9 +4203,9 @@ func_check_subset (ESExp *f,
static ESExpResult *
func_check (struct _ESExp *f,
- gint argc,
- struct _ESExpResult **argv,
- gpointer data)
+ gint argc,
+ struct _ESExpResult **argv,
+ gpointer data)
{
ESExpResult *result;
GPtrArray *result_array;
@@ -4129,7 +4221,7 @@ func_check (struct _ESExp *f,
if (argc == 2 &&
argv[0]->type == ESEXP_RES_STRING &&
argv[1]->type == ESEXP_RES_STRING) {
- query_name = argv[0]->value.string;
+ query_name = argv[0]->value.string;
query_value = argv[1]->value.string;
/* We use E_CONTACT_FIELD_LAST to hold the special case of "x-evolution-any-field" */
@@ -4142,7 +4234,7 @@ func_check (struct _ESExp *f,
argv[0]->type == ESEXP_RES_STRING &&
argv[1]->type == ESEXP_RES_STRING &&
argv[2]->type == ESEXP_RES_STRING) {
- query_name = argv[0]->value.string;
+ query_name = argv[0]->value.string;
query_value = argv[1]->value.string;
query_extra = argv[2]->value.string;
@@ -4153,30 +4245,32 @@ func_check (struct _ESExp *f,
QueryPhoneTest *test;
/* Collect data from this field test */
- test = query_phone_test_new (query_type, field_id);
- test->value = g_strdup (query_value);
+ test = query_phone_test_new (query_type, field_id);
+ test->value = g_strdup (query_value);
test->region = g_strdup (query_extra);
- element = (QueryElement *)test;
+ element = (QueryElement *) test;
} else {
QueryFieldTest *test;
/* Collect data from this field test */
- test = query_field_test_new (query_type, field_id);
+ test = query_field_test_new (query_type, field_id);
test->value = g_strdup (query_value);
- element = (QueryElement *)test;
+ element = (QueryElement *) test;
}
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT INIT: Adding field test: `%s' on field `%s' "
- "(field name: %s query value: %s query extra: %s)\n",
- EBSQL_QUERY_TYPE_STR (query_type),
- EBSQL_FIELD_ID_STR (field_id),
- query_name, query_value, query_extra));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr (
+ "PREFLIGHT INIT: Adding field test: `%s' on field `%s' "
+ "(field name: %s query value: %s query extra: %s)\n",
+ EBSQL_QUERY_TYPE_STR (query_type),
+ EBSQL_FIELD_ID_STR (field_id),
+ query_name, query_value, query_extra));
/* Return an array with only one element, for lack of a pointer type ESExpResult */
- result_array = g_ptr_array_new_with_free_func ((GDestroyNotify)query_element_free);
+ result_array = g_ptr_array_new_with_free_func ((GDestroyNotify) query_element_free);
g_ptr_array_add (result_array, element);
result = e_sexp_result_new (f, ESEXP_RES_ARRAY_PTR);
@@ -4192,7 +4286,7 @@ func_check (struct _ESExp *f,
*/
static void
query_preflight_initialize (PreflightContext *context,
- const gchar *sexp)
+ const gchar *sexp)
{
ESExp *sexp_parser;
ESExpResult *result;
@@ -4225,8 +4319,9 @@ query_preflight_initialize (PreflightContext *context,
if (esexp_error == -1) {
context->status = PREFLIGHT_INVALID;
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT INIT: Sexp parse error\n"));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr ("PREFLIGHT INIT: Sexp parse error\n"));
} else {
result = e_sexp_eval (sexp_parser);
@@ -4235,14 +4330,15 @@ query_preflight_initialize (PreflightContext *context,
if (result->type == ESEXP_RES_ARRAY_PTR) {
/* Just steal the array away from the ESexpResult */
- context->constraints = result->value.ptrarray;
+ context->constraints = result->value.ptrarray;
result->value.ptrarray = NULL;
} else {
context->status = PREFLIGHT_INVALID;
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT INIT: ERROR, Did not get GPtrArray\n"));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr ("PREFLIGHT INIT: ERROR, Did not get GPtrArray\n"));
}
}
@@ -4251,9 +4347,11 @@ query_preflight_initialize (PreflightContext *context,
e_sexp_unref (sexp_parser);
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT INIT: Completed with status %s\n",
- EBSQL_STATUS_STR (context->status)));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr (
+ "PREFLIGHT INIT: Completed with status %s\n",
+ EBSQL_STATUS_STR (context->status)));
}
typedef struct {
@@ -4263,12 +4361,12 @@ typedef struct {
static gboolean
check_has_attr_list_cb (QueryElement *element,
- gint sub_level,
- gint offset,
- gpointer user_data)
+ gint sub_level,
+ gint offset,
+ gpointer user_data)
{
- QueryFieldTest *test = (QueryFieldTest *)element;
- AttrListCheckData *data = (AttrListCheckData *)user_data;
+ QueryFieldTest *test = (QueryFieldTest *) element;
+ AttrListCheckData *data = (AttrListCheckData *) user_data;
/* We havent resolved all the fields at this stage yet */
if (!test->field)
@@ -4287,24 +4385,26 @@ check_has_attr_list_cb (QueryElement *element,
* o Bitmask of auxiliary tables is collected
*/
static void
-query_preflight_check (PreflightContext *context,
- EBookSqlite *ebsql)
+query_preflight_check (PreflightContext *context,
+ EBookSqlite *ebsql)
{
gint i, n_elements;
QueryElement **elements;
context->status = PREFLIGHT_OK;
- elements = (QueryElement **)context->constraints->pdata;
+ elements = (QueryElement **) context->constraints->pdata;
n_elements = context->constraints->len;
for (i = 0; i < n_elements; i++) {
QueryFieldTest *test;
guint field_test;
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT CHECK: Encountered: %s\n",
- EBSQL_QUERY_TYPE_STR (elements[i]->query)));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr (
+ "PREFLIGHT CHECK: Encountered: %s\n",
+ EBSQL_QUERY_TYPE_STR (elements[i]->query)));
if (elements[i]->query >= BOOK_QUERY_SUB_FIRST) {
/* It's too complicated to properly perform
@@ -4329,20 +4429,23 @@ query_preflight_check (PreflightContext *context,
&data);
if (data.has_attr_list) {
- context->status = MAX (context->status,
- PREFLIGHT_NOT_SUMMARIZED);
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT CHECK: "
- "Setting invalid for NOT (mutli-attribute), "
- "new status: %s\n",
- EBSQL_STATUS_STR (context->status)));
+ context->status = MAX (
+ context->status,
+ PREFLIGHT_NOT_SUMMARIZED);
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr (
+ "PREFLIGHT CHECK: "
+ "Setting invalid for NOT (mutli-attribute), "
+ "new status: %s\n",
+ EBSQL_STATUS_STR (context->status)));
}
}
continue;
}
test = (QueryFieldTest *) elements[i];
- field_test = (EBookQueryTest)test->query;
+ field_test = (EBookQueryTest) test->query;
if (!test->field)
test->field = summary_field_get (ebsql, test->field_id);
@@ -4370,33 +4473,39 @@ query_preflight_check (PreflightContext *context,
if (n_elements == 1 && (!test->value || !test->value[0])) {
context->status = MAX (context->status, PREFLIGHT_LIST_ALL);
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT CHECK: "
- "Encountered lonesome 'x-evolution-any-field'
with empty value, "
- "new status: %s\n",
- EBSQL_STATUS_STR (context->status)));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr (
+ "PREFLIGHT CHECK: "
+ "Encountered lonesome 'x-evolution-any-field' with
empty value, "
+ "new status: %s\n",
+ EBSQL_STATUS_STR (context->status)));
} else {
/* Searching for a value with 'x-evolution-any-field' is
* not a summary query.
*/
context->status = MAX (context->status, PREFLIGHT_NOT_SUMMARIZED);
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT CHECK: "
- "Encountered 'x-evolution-any-field', "
- "new status: %s\n",
- EBSQL_STATUS_STR (context->status)));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr (
+ "PREFLIGHT CHECK: "
+ "Encountered 'x-evolution-any-field', "
+ "new status: %s\n",
+ EBSQL_STATUS_STR (context->status)));
}
} else {
/* Couldnt resolve the field, it's not a summary query */
context->status = MAX (context->status, PREFLIGHT_NOT_SUMMARIZED);
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT CHECK: "
- "Field `%s' not in the summary, new status: %s\n",
- EBSQL_FIELD_ID_STR (test->field_id),
- EBSQL_STATUS_STR (context->status)));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr (
+ "PREFLIGHT CHECK: "
+ "Field `%s' not in the summary, new status: %s\n",
+ EBSQL_FIELD_ID_STR (test->field_id),
+ EBSQL_STATUS_STR (context->status)));
}
}
@@ -4417,11 +4526,13 @@ query_preflight_check (PreflightContext *context,
if (test->field->type != G_TYPE_STRING &&
test->field->type != E_TYPE_CONTACT_ATTR_LIST) {
context->status = MAX (context->status, PREFLIGHT_INVALID);
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT CHECK: "
- "Refusing pattern match on boolean field
`%s', new status: %s\n",
- EBSQL_FIELD_ID_STR (test->field_id),
- EBSQL_STATUS_STR (context->status)));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr (
+ "PREFLIGHT CHECK: "
+ "Refusing pattern match on boolean field `%s', new
status: %s\n",
+ EBSQL_FIELD_ID_STR (test->field_id),
+ EBSQL_STATUS_STR (context->status)));
}
}
@@ -4430,10 +4541,12 @@ query_preflight_check (PreflightContext *context,
case E_BOOK_QUERY_REGEX_RAW:
/* Raw regex queries only supported in the fallback */
context->status = MAX (context->status, PREFLIGHT_NOT_SUMMARIZED);
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT CHECK: "
- "Raw regexp requires full data, new status: %s\n",
- EBSQL_STATUS_STR (context->status)));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr (
+ "PREFLIGHT CHECK: "
+ "Raw regexp requires full data, new status: %s\n",
+ EBSQL_STATUS_STR (context->status)));
break;
case E_BOOK_QUERY_EQUALS_PHONE_NUMBER:
@@ -4446,12 +4559,14 @@ query_preflight_check (PreflightContext *context,
if (!e_phone_number_is_supported ()) {
context->status = MAX (context->status, PREFLIGHT_UNSUPPORTED);
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT CHECK: "
- "Usupported phone number query, new status: %s\n",
- EBSQL_STATUS_STR (context->status)));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr (
+ "PREFLIGHT CHECK: "
+ "Usupported phone number query, new status: %s\n",
+ EBSQL_STATUS_STR (context->status)));
} else {
- QueryPhoneTest *phone_test = (QueryPhoneTest *)test;
+ QueryPhoneTest *phone_test = (QueryPhoneTest *) test;
EPhoneNumberCountrySource source;
EPhoneNumber *number;
const gchar *region_code;
@@ -4461,17 +4576,20 @@ query_preflight_check (PreflightContext *context,
else
region_code = ebsql->priv->region_code;
- number = e_phone_number_from_string (phone_test->value,
- region_code, NULL);
+ number = e_phone_number_from_string (
+ phone_test->value,
+ region_code, NULL);
if (number == NULL) {
context->status = MAX (context->status, PREFLIGHT_INVALID);
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT CHECK: "
- "Invalid phone number `%s', new status: %s\n",
- phone_test->value,
- EBSQL_STATUS_STR (context->status)));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr (
+ "PREFLIGHT CHECK: "
+ "Invalid phone number `%s', new status: %s\n",
+ phone_test->value,
+ EBSQL_STATUS_STR (context->status)));
} else {
/* Collect values we'll need later while generating field
* tests, no need to parse the phone number more than once
@@ -4497,10 +4615,12 @@ query_preflight_check (PreflightContext *context,
*/
g_warn_if_fail (aux_index < EBSQL_MAX_SUMMARY_FIELDS);
context->aux_mask |= (1 << aux_index);
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT CHECK: "
- "Adding auxiliary field `%s' to the mask\n",
- EBSQL_FIELD_ID_STR (test->field_id)));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr (
+ "PREFLIGHT CHECK: "
+ "Adding auxiliary field `%s' to the mask\n",
+ EBSQL_FIELD_ID_STR (test->field_id)));
}
}
}
@@ -4513,7 +4633,7 @@ query_preflight_check (PreflightContext *context,
*/
static void
query_preflight_substitute_full_name (PreflightContext *context,
- EBookSqlite *ebsql)
+ EBookSqlite *ebsql)
{
gint i, j;
@@ -4532,8 +4652,8 @@ query_preflight_substitute_full_name (PreflightContext *context,
continue;
family_name = summary_field_get (ebsql, E_CONTACT_FAMILY_NAME);
- given_name = summary_field_get (ebsql, E_CONTACT_GIVEN_NAME);
- nickname = summary_field_get (ebsql, E_CONTACT_NICKNAME);
+ given_name = summary_field_get (ebsql, E_CONTACT_GIVEN_NAME);
+ nickname = summary_field_get (ebsql, E_CONTACT_NICKNAME);
/* If any of these are in the summary, then we'll construct
* a grouped OR statment for this E_CONTACT_FULL_NAME test */
@@ -4541,23 +4661,25 @@ query_preflight_substitute_full_name (PreflightContext *context,
/* Add the OR directly before the E_CONTACT_FULL_NAME test */
constraints_insert_delimiter (context->constraints, i, BOOK_QUERY_SUB_OR);
-
j = i + 2;
if (family_name)
- constraints_insert_field_test (context->constraints, j++,
- family_name, test->query,
- test->value);
+ constraints_insert_field_test (
+ context->constraints, j++,
+ family_name, test->query,
+ test->value);
if (given_name)
- constraints_insert_field_test (context->constraints, j++,
- given_name, test->query,
- test->value);
+ constraints_insert_field_test (
+ context->constraints, j++,
+ given_name, test->query,
+ test->value);
if (nickname)
- constraints_insert_field_test (context->constraints, j++,
- nickname, test->query,
- test->value);
+ constraints_insert_field_test (
+ context->constraints, j++,
+ nickname, test->query,
+ test->value);
constraints_insert_delimiter (context->constraints, j, BOOK_QUERY_SUB_END);
@@ -4567,9 +4689,9 @@ query_preflight_substitute_full_name (PreflightContext *context,
}
static void
-query_preflight (PreflightContext *context,
- EBookSqlite *ebsql,
- const gchar *sexp)
+query_preflight (PreflightContext *context,
+ EBookSqlite *ebsql,
+ const gchar *sexp)
{
EBSQL_NOTE (PREFLIGHT, g_printerr ("PREFLIGHT BEGIN\n"));
query_preflight_initialize (context, sexp);
@@ -4582,8 +4704,9 @@ query_preflight (PreflightContext *context,
* going to generate statements with it
*/
if (context->status == PREFLIGHT_OK) {
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT: Substituting full name\n"));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr ("PREFLIGHT: Substituting full name\n"));
/* Handle E_CONTACT_FULL_NAME substitutions */
query_preflight_substitute_full_name (context, ebsql);
@@ -4598,9 +4721,11 @@ query_preflight (PreflightContext *context,
}
}
- EBSQL_NOTE (PREFLIGHT,
- g_printerr ("PREFLIGHT END (status: %s)\n",
- EBSQL_STATUS_STR (context->status)));
+ EBSQL_NOTE (
+ PREFLIGHT,
+ g_printerr (
+ "PREFLIGHT END (status: %s)\n",
+ EBSQL_STATUS_STR (context->status)));
}
/**********************************************************
@@ -4625,8 +4750,8 @@ typedef void (* GenerateFieldTest) (EBookSqlite *ebsql,
*/
static gchar *
ebsql_normalize_for_like (QueryFieldTest *test,
- gboolean reverse_string,
- gboolean *escape_needed)
+ gboolean reverse_string,
+ gboolean *escape_needed)
{
GString *str;
size_t len;
@@ -4681,9 +4806,9 @@ ebsql_normalize_for_like (QueryFieldTest *test,
}
static void
-field_test_query_is (EBookSqlite *ebsql,
- GString *string,
- QueryFieldTest *test)
+field_test_query_is (EBookSqlite *ebsql,
+ GString *string,
+ QueryFieldTest *test)
{
SummaryField *field = test->field;
gchar *normal;
@@ -4702,9 +4827,9 @@ field_test_query_is (EBookSqlite *ebsql,
}
static void
-field_test_query_contains (EBookSqlite *ebsql,
- GString *string,
- QueryFieldTest *test)
+field_test_query_contains (EBookSqlite *ebsql,
+ GString *string,
+ QueryFieldTest *test)
{
SummaryField *field = test->field;
gboolean need_escape;
@@ -4730,9 +4855,9 @@ field_test_query_contains (EBookSqlite *ebsql,
}
static void
-field_test_query_begins_with (EBookSqlite *ebsql,
- GString *string,
- QueryFieldTest *test)
+field_test_query_begins_with (EBookSqlite *ebsql,
+ GString *string,
+ QueryFieldTest *test)
{
SummaryField *field = test->field;
gboolean need_escape;
@@ -4757,9 +4882,9 @@ field_test_query_begins_with (EBookSqlite *ebsql,
}
static void
-field_test_query_ends_with (EBookSqlite *ebsql,
- GString *string,
- QueryFieldTest *test)
+field_test_query_ends_with (EBookSqlite *ebsql,
+ GString *string,
+ QueryFieldTest *test)
{
SummaryField *field = test->field;
gboolean need_escape;
@@ -4767,8 +4892,7 @@ field_test_query_ends_with (EBookSqlite *ebsql,
if ((field->index & INDEX_FLAG (SUFFIX)) != 0) {
- escaped = ebsql_normalize_for_like (test,
- TRUE, &need_escape);
+ escaped = ebsql_normalize_for_like (test, TRUE, &need_escape);
g_string_append_c (string, '(');
ebsql_string_append_column (string, field, EBSQL_SUFFIX_REVERSE);
@@ -4781,8 +4905,7 @@ field_test_query_ends_with (EBookSqlite *ebsql,
} else {
- escaped = ebsql_normalize_for_like (test,
- FALSE, &need_escape);
+ escaped = ebsql_normalize_for_like (test, FALSE, &need_escape);
g_string_append_c (string, '(');
ebsql_string_append_column (string, field, NULL);
@@ -4802,12 +4925,12 @@ field_test_query_ends_with (EBookSqlite *ebsql,
}
static void
-field_test_query_eqphone (EBookSqlite *ebsql,
- GString *string,
- QueryFieldTest *test)
+field_test_query_eqphone (EBookSqlite *ebsql,
+ GString *string,
+ QueryFieldTest *test)
{
SummaryField *field = test->field;
- QueryPhoneTest *phone_test = (QueryPhoneTest *)test;
+ QueryPhoneTest *phone_test = (QueryPhoneTest *) test;
if ((field->index & INDEX_FLAG (PHONE)) != 0) {
@@ -4835,13 +4958,13 @@ field_test_query_eqphone (EBookSqlite *ebsql,
}
static void
-field_test_query_eqphone_national (EBookSqlite *ebsql,
- GString *string,
- QueryFieldTest *test)
+field_test_query_eqphone_national (EBookSqlite *ebsql,
+ GString *string,
+ QueryFieldTest *test)
{
SummaryField *field = test->field;
- QueryPhoneTest *phone_test = (QueryPhoneTest *)test;
+ QueryPhoneTest *phone_test = (QueryPhoneTest *) test;
if ((field->index & INDEX_FLAG (PHONE)) != 0) {
@@ -4876,9 +4999,9 @@ field_test_query_eqphone_national (EBookSqlite *ebsql,
}
static void
-field_test_query_eqphone_short (EBookSqlite *ebsql,
- GString *string,
- QueryFieldTest *test)
+field_test_query_eqphone_short (EBookSqlite *ebsql,
+ GString *string,
+ QueryFieldTest *test)
{
SummaryField *field = test->field;
@@ -4889,9 +5012,9 @@ field_test_query_eqphone_short (EBookSqlite *ebsql,
}
static void
-field_test_query_regex_normal (EBookSqlite *ebsql,
- GString *string,
- QueryFieldTest *test)
+field_test_query_regex_normal (EBookSqlite *ebsql,
+ GString *string,
+ QueryFieldTest *test)
{
SummaryField *field = test->field;
gchar *normal;
@@ -4899,21 +5022,23 @@ field_test_query_regex_normal (EBookSqlite *ebsql,
normal = e_util_utf8_normalize (test->value);
if (field->aux_table)
- ebsql_string_append_printf (string, "%s.value REGEXP %Q",
- field->aux_table_symbolic,
- normal);
+ ebsql_string_append_printf (
+ string, "%s.value REGEXP %Q",
+ field->aux_table_symbolic,
+ normal);
else
- ebsql_string_append_printf (string, "summary.%s REGEXP %Q",
- field->dbname,
- normal);
+ ebsql_string_append_printf (
+ string, "summary.%s REGEXP %Q",
+ field->dbname,
+ normal);
g_free (normal);
}
static void
-field_test_query_exists (EBookSqlite *ebsql,
- GString *string,
- QueryFieldTest *test)
+field_test_query_exists (EBookSqlite *ebsql,
+ GString *string,
+ QueryFieldTest *test)
{
SummaryField *field = test->field;
@@ -4953,9 +5078,9 @@ typedef enum {
static void
ebsql_generate_constraints (EBookSqlite *ebsql,
- GString *string,
- GPtrArray *constraints,
- const gchar *sexp)
+ GString *string,
+ GPtrArray *constraints,
+ const gchar *sexp)
{
SubQueryContext *ctx;
QueryDelimiter *delim;
@@ -4966,16 +5091,16 @@ ebsql_generate_constraints (EBookSqlite *ebsql,
/* If there are no constraints, we generate the fallback constraint for 'sexp' */
if (constraints == NULL) {
ebsql_string_append_printf (
- string,
+ string,
EBSQL_FUNC_COMPARE_VCARD " (%Q, %s)",
sexp, EBSQL_VCARD_FRAGMENT (ebsql));
return;
}
- elements = (QueryElement **)constraints->pdata;
+ elements = (QueryElement **) constraints->pdata;
n_elements = constraints->len;
- ctx = sub_query_context_new();
+ ctx = sub_query_context_new ();
for (i = 0; i < n_elements; i++) {
GenerateFieldTest generate_test_func = NULL;
@@ -5010,7 +5135,7 @@ ebsql_generate_constraints (EBookSqlite *ebsql,
}
if (elements[i]->query >= BOOK_QUERY_SUB_FIRST) {
- delim = (QueryDelimiter *)elements[i];
+ delim = (QueryDelimiter *) elements[i];
switch (delim->query) {
@@ -5044,7 +5169,7 @@ ebsql_generate_constraints (EBookSqlite *ebsql,
}
/* Find the appropriate field test generator */
- test = (QueryFieldTest *)elements[i];
+ test = (QueryFieldTest *) elements[i];
if (test->query < G_N_ELEMENTS (field_test_func_table))
generate_test_func = field_test_func_table[test->query];
@@ -5070,10 +5195,10 @@ ebsql_generate_constraints (EBookSqlite *ebsql,
*/
static EbSqlRowFunc
ebsql_generate_select (EBookSqlite *ebsql,
- GString *string,
- SearchType search_type,
- PreflightContext *context,
- GError **error)
+ GString *string,
+ SearchType search_type,
+ PreflightContext *context,
+ GError **error)
{
EbSqlRowFunc callback = NULL;
gboolean add_auxiliary_tables = FALSE;
@@ -5086,12 +5211,12 @@ ebsql_generate_select (EBookSqlite *ebsql,
g_string_append (string, "SELECT ");
if (add_auxiliary_tables)
g_string_append (string, "DISTINCT ");
-
+
switch (search_type) {
case SEARCH_FULL:
callback = collect_full_results_cb;
g_string_append (string, "summary.uid, ");
- g_string_append (string, EBSQL_VCARD_FRAGMENT (ebsql));
+ g_string_append (string, EBSQL_VCARD_FRAGMENT (ebsql));
g_string_append (string, ", summary.bdata ");
break;
case SEARCH_UID_AND_REV:
@@ -5135,10 +5260,11 @@ ebsql_generate_select (EBookSqlite *ebsql,
*
* WHERE email_list.value LIKE "boogieman%"
*/
- ebsql_string_append_printf (string, " JOIN %Q AS %s ON +%s.uid = summary.uid",
- field->aux_table,
- field->aux_table_symbolic,
- field->aux_table_symbolic);
+ ebsql_string_append_printf (
+ string, " JOIN %Q AS %s ON +%s.uid = summary.uid",
+ field->aux_table,
+ field->aux_table_symbolic,
+ field->aux_table_symbolic);
}
}
}
@@ -5148,12 +5274,12 @@ ebsql_generate_select (EBookSqlite *ebsql,
static gboolean
ebsql_do_search_query (EBookSqlite *ebsql,
- PreflightContext *context,
- const gchar *sexp,
- SearchType search_type,
- GSList **return_data,
- GCancellable *cancellable,
- GError **error)
+ PreflightContext *context,
+ const gchar *sexp,
+ SearchType search_type,
+ GSList **return_data,
+ GCancellable *cancellable,
+ GError **error)
{
GString *string;
EbSqlRowFunc callback = NULL;
@@ -5164,11 +5290,8 @@ ebsql_do_search_query (EBookSqlite *ebsql,
string = g_string_sized_new (GENERATED_QUERY_BYTES);
/* Generate the leading SELECT statement */
- callback = ebsql_generate_select (ebsql,
- string,
- search_type,
- context,
- error);
+ callback = ebsql_generate_select (
+ ebsql, string, search_type, context, error);
if (callback &&
EBSQL_STATUS_GEN_CONSTRAINTS (context->status)) {
@@ -5176,16 +5299,15 @@ ebsql_do_search_query (EBookSqlite *ebsql,
* Now generate the search expression on the main contacts table
*/
g_string_append (string, " WHERE ");
- ebsql_generate_constraints (ebsql,
- string,
- context->constraints,
- sexp);
+ ebsql_generate_constraints (
+ ebsql, string, context->constraints, sexp);
}
if (callback)
- success = ebsql_exec (ebsql, string->str,
- callback, return_data,
- cancellable, error);
+ success = ebsql_exec (
+ ebsql, string->str,
+ callback, return_data,
+ cancellable, error);
g_string_free (string, TRUE);
@@ -5206,11 +5328,11 @@ ebsql_do_search_query (EBookSqlite *ebsql,
*/
static gboolean
ebsql_search_query (EBookSqlite *ebsql,
- const gchar *sexp,
- SearchType search_type,
- GSList **return_data,
- GCancellable *cancellable,
- GError **error)
+ const gchar *sexp,
+ SearchType search_type,
+ GSList **return_data,
+ GCancellable *cancellable,
+ GError **error)
{
PreflightContext context = PREFLIGHT_CONTEXT_INIT;
gboolean success = FALSE;
@@ -5223,25 +5345,24 @@ ebsql_search_query (EBookSqlite *ebsql,
case PREFLIGHT_LIST_ALL:
case PREFLIGHT_NOT_SUMMARIZED:
/* No errors, let's really search */
- success = ebsql_do_search_query (ebsql,
- &context,
- sexp,
- search_type,
- return_data,
- cancellable,
- error);
+ success = ebsql_do_search_query (
+ ebsql, &context, sexp,
+ search_type, return_data,
+ cancellable, error);
break;
case PREFLIGHT_INVALID:
- EBSQL_SET_ERROR (error,
- E_BOOK_SQLITE_ERROR_INVALID_QUERY,
- _("Invalid query: %s"), sexp);
+ EBSQL_SET_ERROR (
+ error,
+ E_BOOK_SQLITE_ERROR_INVALID_QUERY,
+ _("Invalid query: %s"), sexp);
break;
case PREFLIGHT_UNSUPPORTED:
- EBSQL_SET_ERROR_LITERAL (error,
- E_BOOK_SQLITE_ERROR_UNSUPPORTED_QUERY,
- _("Query contained unsupported elements"));
+ EBSQL_SET_ERROR_LITERAL (
+ error,
+ E_BOOK_SQLITE_ERROR_UNSUPPORTED_QUERY,
+ _("Query contained unsupported elements"));
break;
}
@@ -5266,7 +5387,7 @@ struct _CursorState {
};
struct _EbSqlCursor {
- EBookBackendSExp *sexp; /* An EBookBackendSExp based on the query, used by
e_book_sqlite_cursor_compare() */
+ EBookBackendSExp *sexp; /* An EBookBackendSExp based on the query, used by
e_book_sqlite_cursor_compare () */
gchar *select_vcards; /* The first fragment when querying results */
gchar *select_count; /* The first fragment when querying contact counts */
gchar *query; /* The SQL query expression derived from the passed search expression */
@@ -5297,8 +5418,8 @@ static void cursor_state_set_from_vcard (EBookSqlite *ebsql,
const gchar *vcard);
static CursorState *
-cursor_state_copy (EbSqlCursor *cursor,
- CursorState *state)
+cursor_state_copy (EbSqlCursor *cursor,
+ CursorState *state)
{
CursorState *copy;
gint i;
@@ -5316,8 +5437,8 @@ cursor_state_copy (EbSqlCursor *cursor,
}
static void
-cursor_state_free (EbSqlCursor *cursor,
- CursorState *state)
+cursor_state_free (EbSqlCursor *cursor,
+ CursorState *state)
{
if (state) {
cursor_state_clear (cursor, state, EBSQL_CURSOR_ORIGIN_BEGIN);
@@ -5327,9 +5448,9 @@ cursor_state_free (EbSqlCursor *cursor,
}
static void
-cursor_state_clear (EbSqlCursor *cursor,
- CursorState *state,
- EbSqlCursorOrigin position)
+cursor_state_clear (EbSqlCursor *cursor,
+ CursorState *state,
+ EbSqlCursorOrigin position)
{
gint i;
@@ -5344,10 +5465,10 @@ cursor_state_clear (EbSqlCursor *cursor,
}
static void
-cursor_state_set_from_contact (EBookSqlite *ebsql,
- EbSqlCursor *cursor,
- CursorState *state,
- EContact *contact)
+cursor_state_set_from_contact (EBookSqlite *ebsql,
+ EbSqlCursor *cursor,
+ CursorState *state,
+ EContact *contact)
{
gint i;
@@ -5359,8 +5480,9 @@ cursor_state_set_from_contact (EBookSqlite *ebsql,
gchar *sort_key;
if (string)
- sort_key = e_collator_generate_key (ebsql->priv->collator,
- string, NULL);
+ sort_key = e_collator_generate_key (
+ ebsql->priv->collator,
+ string, NULL);
else
sort_key = g_strdup ("");
@@ -5380,9 +5502,9 @@ cursor_state_set_from_contact (EBookSqlite *ebsql,
static void
cursor_state_set_from_vcard (EBookSqlite *ebsql,
- EbSqlCursor *cursor,
- CursorState *state,
- const gchar *vcard)
+ EbSqlCursor *cursor,
+ CursorState *state,
+ const gchar *vcard)
{
EContact *contact;
@@ -5392,10 +5514,10 @@ cursor_state_set_from_vcard (EBookSqlite *ebsql,
}
static gboolean
-ebsql_cursor_setup_query (EBookSqlite *ebsql,
- EbSqlCursor *cursor,
- const gchar *sexp,
- GError **error)
+ebsql_cursor_setup_query (EBookSqlite *ebsql,
+ EbSqlCursor *cursor,
+ const gchar *sexp,
+ GError **error)
{
PreflightContext context = PREFLIGHT_CONTEXT_INIT;
GString *string;
@@ -5405,9 +5527,10 @@ ebsql_cursor_setup_query (EBookSqlite *ebsql,
query_preflight (&context, ebsql, sexp);
if (context.status > PREFLIGHT_NOT_SUMMARIZED) {
- EBSQL_SET_ERROR_LITERAL (error,
- E_BOOK_SQLITE_ERROR_INVALID_QUERY,
- _("Invalid query for EbSqlCursor"));
+ EBSQL_SET_ERROR_LITERAL (
+ error,
+ E_BOOK_SQLITE_ERROR_INVALID_QUERY,
+ _("Invalid query for EbSqlCursor"));
preflight_context_clear (&context);
return FALSE;
@@ -5432,17 +5555,15 @@ ebsql_cursor_setup_query (EBookSqlite *ebsql,
if (sexp == NULL || context.status == PREFLIGHT_LIST_ALL) {
cursor->query = NULL;
- cursor->sexp = NULL;
+ cursor->sexp = NULL;
} else {
/* Generate the constraints for our queries
*/
string = g_string_new (NULL);
- ebsql_generate_constraints (ebsql,
- string,
- context.constraints,
- sexp);
+ ebsql_generate_constraints (
+ ebsql, string, context.constraints, sexp);
cursor->query = g_string_free (string, FALSE);
- cursor->sexp = e_book_backend_sexp_new (sexp);
+ cursor->sexp = e_book_backend_sexp_new (sexp);
}
preflight_context_clear (&context);
@@ -5451,11 +5572,11 @@ ebsql_cursor_setup_query (EBookSqlite *ebsql,
}
static gchar *
-ebsql_cursor_order_by_fragment (EBookSqlite *ebsql,
- const EContactField *sort_fields,
- const EBookCursorSortType *sort_types,
- guint n_sort_fields,
- gboolean reverse)
+ebsql_cursor_order_by_fragment (EBookSqlite *ebsql,
+ const EContactField *sort_fields,
+ const EBookCursorSortType *sort_types,
+ guint n_sort_fields,
+ gboolean reverse)
{
GString *string;
gint i;
@@ -5484,7 +5605,7 @@ ebsql_cursor_order_by_fragment (EBookSqlite *ebsql,
if (reverse)
g_string_append (string, (sort_types[i] == E_BOOK_CURSOR_SORT_ASCENDING ? "DESC" :
"ASC"));
else
- g_string_append (string, (sort_types[i] == E_BOOK_CURSOR_SORT_ASCENDING ? "ASC" :
"DESC"));
+ g_string_append (string, (sort_types[i] == E_BOOK_CURSOR_SORT_ASCENDING ? "ASC" :
"DESC"));
}
/* Also order the UID, since it's our tie breaker */
@@ -5498,32 +5619,26 @@ ebsql_cursor_order_by_fragment (EBookSqlite *ebsql,
}
static EbSqlCursor *
-ebsql_cursor_new (EBookSqlite *ebsql,
- const gchar *sexp,
- const EContactField *sort_fields,
- const EBookCursorSortType *sort_types,
- guint n_sort_fields)
+ebsql_cursor_new (EBookSqlite *ebsql,
+ const gchar *sexp,
+ const EContactField *sort_fields,
+ const EBookCursorSortType *sort_types,
+ guint n_sort_fields)
{
EbSqlCursor *cursor = g_slice_new0 (EbSqlCursor);
- cursor->order = ebsql_cursor_order_by_fragment (ebsql,
- sort_fields,
- sort_types,
- n_sort_fields,
- FALSE);
- cursor->reverse_order = ebsql_cursor_order_by_fragment (ebsql,
- sort_fields,
- sort_types,
- n_sort_fields,
- TRUE);
+ cursor->order = ebsql_cursor_order_by_fragment (
+ ebsql, sort_fields, sort_types, n_sort_fields, FALSE);
+ cursor->reverse_order = ebsql_cursor_order_by_fragment (
+ ebsql, sort_fields, sort_types, n_sort_fields, TRUE);
/* Sort parameters */
- cursor->n_sort_fields = n_sort_fields;
- cursor->sort_fields = g_memdup (sort_fields, sizeof (EContactField) * n_sort_fields);
- cursor->sort_types = g_memdup (sort_types, sizeof (EBookCursorSortType) * n_sort_fields);
+ cursor->n_sort_fields = n_sort_fields;
+ cursor->sort_fields = g_memdup (sort_fields, sizeof (EContactField) * n_sort_fields);
+ cursor->sort_types = g_memdup (sort_types, sizeof (EBookCursorSortType) * n_sort_fields);
/* Cursor state */
- cursor->state.values = g_new0 (gchar *, n_sort_fields);
+ cursor->state.values = g_new0 (gchar *, n_sort_fields);
cursor->state.last_uid = NULL;
cursor->state.position = EBSQL_CURSOR_ORIGIN_BEGIN;
@@ -5550,17 +5665,17 @@ ebsql_cursor_free (EbSqlCursor *cursor)
}
}
-#define GREATER_OR_LESS(cursor, idx, reverse) \
- (reverse ? \
- (((EbSqlCursor *)cursor)->sort_types[idx] == E_BOOK_CURSOR_SORT_ASCENDING ? '<' : '>') : \
- (((EbSqlCursor *)cursor)->sort_types[idx] == E_BOOK_CURSOR_SORT_ASCENDING ? '>' : '<'))
+#define GREATER_OR_LESS(cursor, idx, reverse) \
+ (reverse ? \
+ (((EbSqlCursor *) cursor)->sort_types[idx] == E_BOOK_CURSOR_SORT_ASCENDING ? '<' : '>') : \
+ (((EbSqlCursor *) cursor)->sort_types[idx] == E_BOOK_CURSOR_SORT_ASCENDING ? '>' : '<'))
static inline void
-ebsql_cursor_format_equality (EBookSqlite *ebsql,
- GString *string,
- EContactField field_id,
- const gchar *value,
- gchar equality)
+ebsql_cursor_format_equality (EBookSqlite *ebsql,
+ GString *string,
+ EContactField field_id,
+ const gchar *value,
+ gchar equality)
{
SummaryField *field = summary_field_get (ebsql, field_id);
@@ -5574,9 +5689,10 @@ ebsql_cursor_format_equality (EBookSqlite *ebsql,
ebsql_string_append_printf (string, "%c %Q", equality, value);
} else {
- ebsql_string_append_printf (string, "(%s %c %Q ",
- EBSQL_VCARD_FRAGMENT (ebsql),
- equality, value);
+ ebsql_string_append_printf (
+ string, "(%s %c %Q ",
+ EBSQL_VCARD_FRAGMENT (ebsql),
+ equality, value);
g_string_append (string, "COLLATE " EBSQL_COLLATE_PREFIX);
g_string_append (string, e_contact_field_name (field_id));
@@ -5585,11 +5701,11 @@ ebsql_cursor_format_equality (EBookSqlite *ebsql,
}
static gchar *
-ebsql_cursor_constraints (EBookSqlite *ebsql,
- EbSqlCursor *cursor,
- CursorState *state,
- gboolean reverse,
- gboolean include_current_uid)
+ebsql_cursor_constraints (EBookSqlite *ebsql,
+ EbSqlCursor *cursor,
+ CursorState *state,
+ gboolean reverse,
+ gboolean include_current_uid)
{
GString *string;
gint i, j;
@@ -5619,8 +5735,8 @@ ebsql_cursor_constraints (EBookSqlite *ebsql,
for (i = 0; i <= cursor->n_sort_fields; i++) {
/* Break once we hit a NULL value */
- if ((i < cursor->n_sort_fields && state->values[i] == NULL) ||
- (i == cursor->n_sort_fields && state->last_uid == NULL))
+ if ((i < cursor->n_sort_fields && state->values[i] == NULL) ||
+ (i == cursor->n_sort_fields && state->last_uid == NULL))
break;
/* Between each qualifier, add an 'OR' */
@@ -5648,15 +5764,17 @@ ebsql_cursor_constraints (EBookSqlite *ebsql,
g_string_append_c (string, '(');
/* Append the UID tie breaker */
- ebsql_string_append_printf (string,
- "summary.uid %c %Q",
- reverse ? '<' : '>',
- state->last_uid);
+ ebsql_string_append_printf (
+ string,
+ "summary.uid %c %Q",
+ reverse ? '<' : '>',
+ state->last_uid);
if (include_current_uid)
- ebsql_string_append_printf (string,
- " OR summary.uid = %Q)",
- state->last_uid);
+ ebsql_string_append_printf (
+ string,
+ " OR summary.uid = %Q)",
+ state->last_uid);
} else {
@@ -5697,10 +5815,10 @@ ebsql_cursor_constraints (EBookSqlite *ebsql,
}
static gboolean
-cursor_count_total_locked (EBookSqlite *ebsql,
- EbSqlCursor *cursor,
- gint *total,
- GError **error)
+cursor_count_total_locked (EBookSqlite *ebsql,
+ EbSqlCursor *cursor,
+ gint *total,
+ GError **error)
{
GString *query;
gboolean success;
@@ -5725,10 +5843,10 @@ cursor_count_total_locked (EBookSqlite *ebsql,
}
static gboolean
-cursor_count_position_locked (EBookSqlite *ebsql,
- EbSqlCursor *cursor,
- gint *position,
- GError **error)
+cursor_count_position_locked (EBookSqlite *ebsql,
+ EbSqlCursor *cursor,
+ gint *position,
+ GError **error)
{
GString *query;
gboolean success;
@@ -5757,9 +5875,8 @@ cursor_count_position_locked (EBookSqlite *ebsql,
* results leading up to the current cursor value, including
* the cursor value
*/
- constraints = ebsql_cursor_constraints (ebsql, cursor,
- &(cursor->state),
- TRUE, TRUE);
+ constraints = ebsql_cursor_constraints (
+ ebsql, cursor, &(cursor->state), TRUE, TRUE);
g_string_append_c (query, '(');
g_string_append (query, constraints);
@@ -5796,8 +5913,9 @@ e_book_sqlite_finalize (GObject *object)
EBookSqlite *ebsql = E_BOOK_SQLITE (object);
EBookSqlitePrivate *priv = ebsql->priv;
- summary_fields_array_free (priv->summary_fields,
- priv->n_summary_fields);
+ summary_fields_array_free (
+ priv->summary_fields,
+ priv->n_summary_fields);
g_free (priv->folderid);
g_free (priv->path);
@@ -5847,10 +5965,8 @@ e_book_sqlite_class_init (EBookSqliteClass *class)
static void
e_book_sqlite_init (EBookSqlite *ebsql)
{
- ebsql->priv =
- G_TYPE_INSTANCE_GET_PRIVATE (ebsql,
- E_TYPE_BOOK_SQLITE,
- EBookSqlitePrivate);
+ ebsql->priv = E_BOOK_SQLITE_GET_PRIVATE (ebsql);
+
g_mutex_init (&ebsql->priv->lock);
g_mutex_init (&ebsql->priv->updates_lock);
}
@@ -5860,12 +5976,12 @@ e_book_sqlite_init (EBookSqlite *ebsql)
**********************************************************/
static EBookSqlite *
ebsql_new_default (const gchar *path,
- EbSqlVCardCallback vcard_callback,
- EbSqlChangeCallback change_callback,
- gpointer user_data,
- GDestroyNotify user_data_destroy,
- GCancellable *cancellable,
- GError **error)
+ EbSqlVCardCallback vcard_callback,
+ EbSqlChangeCallback change_callback,
+ gpointer user_data,
+ GDestroyNotify user_data_destroy,
+ GCancellable *cancellable,
+ GError **error)
{
EBookSqlite *ebsql;
GArray *summary_fields;
@@ -5924,8 +6040,8 @@ ebsql_new_default (const gchar *path,
**/
EBookSqlite *
e_book_sqlite_new (const gchar *path,
- GCancellable *cancellable,
- GError **error)
+ GCancellable *cancellable,
+ GError **error)
{
g_return_val_if_fail (path && path[0], NULL);
@@ -5974,13 +6090,13 @@ e_book_sqlite_new (const gchar *path,
**/
EBookSqlite *
e_book_sqlite_new_full (const gchar *path,
- ESourceBackendSummarySetup *setup,
- EbSqlVCardCallback vcard_callback,
- EbSqlChangeCallback change_callback,
- gpointer user_data,
- GDestroyNotify user_data_destroy,
- GCancellable *cancellable,
- GError **error)
+ ESourceBackendSummarySetup *setup,
+ EbSqlVCardCallback vcard_callback,
+ EbSqlChangeCallback change_callback,
+ gpointer user_data,
+ GDestroyNotify user_data_destroy,
+ GCancellable *cancellable,
+ GError **error)
{
EBookSqlite *ebsql = NULL;
EContactField *fields;
@@ -5994,29 +6110,32 @@ e_book_sqlite_new_full (const gchar *path,
g_return_val_if_fail (setup == NULL || E_IS_SOURCE_BACKEND_SUMMARY_SETUP (setup), NULL);
if (!setup)
- return ebsql_new_default (path,
- vcard_callback,
- change_callback,
- user_data,
- user_data_destroy,
- cancellable, error);
-
- fields = e_source_backend_summary_setup_get_summary_fields (setup, &n_fields);
+ return ebsql_new_default (
+ path,
+ vcard_callback,
+ change_callback,
+ user_data,
+ user_data_destroy,
+ cancellable, error);
+
+ fields = e_source_backend_summary_setup_get_summary_fields (setup, &n_fields);
indexed_fields = e_source_backend_summary_setup_get_indexed_fields (setup, &index_types,
&n_indexed_fields);
/* No specified summary fields indicates the default summary configuration should be used */
if (n_fields <= 0 || n_fields >= EBSQL_MAX_SUMMARY_FIELDS) {
if (n_fields)
- g_warning ("EBookSqlite refused to create addressbook with over %d summary fields",
- EBSQL_MAX_SUMMARY_FIELDS);
-
- ebsql = ebsql_new_default (path,
- vcard_callback,
- change_callback,
- user_data,
- user_data_destroy,
- cancellable, error);
+ g_warning (
+ "EBookSqlite refused to create addressbook with over %d summary fields",
+ EBSQL_MAX_SUMMARY_FIELDS);
+
+ ebsql = ebsql_new_default (
+ path,
+ vcard_callback,
+ change_callback,
+ user_data,
+ user_data_destroy,
+ cancellable, error);
g_free (fields);
g_free (index_types);
g_free (indexed_fields);
@@ -6043,7 +6162,7 @@ e_book_sqlite_new_full (const gchar *path,
/* Properly free the array */
n_sfields = summary_fields->len;
- sfields = (SummaryField *)g_array_free (summary_fields, FALSE);
+ sfields = (SummaryField *) g_array_free (summary_fields, FALSE);
summary_fields_array_free (sfields, n_sfields);
g_free (fields);
@@ -6062,7 +6181,7 @@ e_book_sqlite_new_full (const gchar *path,
ebsql = ebsql_new_internal (
path, vcard_callback, change_callback,
- user_data, user_data_destroy,
+ user_data, user_data_destroy,
(SummaryField *) summary_fields->data,
summary_fields->len,
cancellable, error);
@@ -6102,9 +6221,9 @@ e_book_sqlite_new_full (const gchar *path,
**/
gboolean
e_book_sqlite_lock (EBookSqlite *ebsql,
- EbSqlLockType lock_type,
- GCancellable *cancellable,
- GError **error)
+ EbSqlLockType lock_type,
+ GCancellable *cancellable,
+ GError **error)
{
gboolean success;
@@ -6162,8 +6281,8 @@ e_book_sqlite_lock (EBookSqlite *ebsql,
**/
gboolean
e_book_sqlite_unlock (EBookSqlite *ebsql,
- EbSqlUnlockAction action,
- GError **error)
+ EbSqlUnlockAction action,
+ GError **error)
{
gboolean success = FALSE;
@@ -6227,11 +6346,11 @@ e_book_sqlite_ref_collator (EBookSqlite *ebsql)
**/
gboolean
e_book_sqlite_add_contact (EBookSqlite *ebsql,
- EContact *contact,
- const gchar *extra,
- gboolean replace,
- GCancellable *cancellable,
- GError **error)
+ EContact *contact,
+ const gchar *extra,
+ gboolean replace,
+ GCancellable *cancellable,
+ GError **error)
{
GSList l;
GSList el;
@@ -6242,7 +6361,7 @@ e_book_sqlite_add_contact (EBookSqlite *ebsql,
l.data = contact;
l.next = NULL;
- el.data = (gpointer)extra;
+ el.data = (gpointer) extra;
el.next = NULL;
return e_book_sqlite_add_contacts (ebsql, &l, &el, replace, cancellable, error);
@@ -6271,11 +6390,11 @@ e_book_sqlite_add_contact (EBookSqlite *ebsql,
**/
gboolean
e_book_sqlite_add_contacts (EBookSqlite *ebsql,
- GSList *contacts,
- GSList *extra,
- gboolean replace,
- GCancellable *cancellable,
- GError **error)
+ GSList *contacts,
+ GSList *extra,
+ gboolean replace,
+ GCancellable *cancellable,
+ GError **error)
{
GSList *l, *ll;
gboolean success = TRUE;
@@ -6299,12 +6418,13 @@ e_book_sqlite_add_contacts (EBookSqlite *ebsql,
const gchar *extra_data = NULL;
if (ll)
- extra_data = (const gchar *)ll->data;
+ extra_data = (const gchar *) ll->data;
- success = ebsql_insert_contact (ebsql,
- EBSQL_CHANGE_CONTACT_ADDED,
- contact, NULL, extra_data,
- replace, error);
+ success = ebsql_insert_contact (
+ ebsql,
+ EBSQL_CHANGE_CONTACT_ADDED,
+ contact, NULL, extra_data,
+ replace, error);
}
if (success)
@@ -6333,9 +6453,9 @@ e_book_sqlite_add_contacts (EBookSqlite *ebsql,
**/
gboolean
e_book_sqlite_remove_contact (EBookSqlite *ebsql,
- const gchar *uid,
- GCancellable *cancellable,
- GError **error)
+ const gchar *uid,
+ GCancellable *cancellable,
+ GError **error)
{
GSList l;
@@ -6388,9 +6508,9 @@ generate_delete_stmt (const gchar *table,
**/
gboolean
e_book_sqlite_remove_contacts (EBookSqlite *ebsql,
- GSList *uids,
- GCancellable *cancellable,
- GError **error)
+ GSList *uids,
+ GCancellable *cancellable,
+ GError **error)
{
gboolean success = TRUE;
gint i;
@@ -6451,9 +6571,9 @@ e_book_sqlite_remove_contacts (EBookSqlite *ebsql,
**/
gboolean
e_book_sqlite_has_contact (EBookSqlite *ebsql,
- const gchar *uid,
- gboolean *exists,
- GError **error)
+ const gchar *uid,
+ gboolean *exists,
+ GError **error)
{
gboolean local_exists = FALSE;
gboolean success;
@@ -6463,10 +6583,11 @@ e_book_sqlite_has_contact (EBookSqlite *ebsql,
g_return_val_if_fail (exists != NULL, FALSE);
EBSQL_LOCK_MUTEX (&ebsql->priv->lock);
- success = ebsql_exec_printf (ebsql,
- "SELECT uid FROM %Q WHERE uid = %Q",
- get_exists_cb, &local_exists, NULL, error,
- ebsql->priv->folderid, uid);
+ success = ebsql_exec_printf (
+ ebsql,
+ "SELECT uid FROM %Q WHERE uid = %Q",
+ get_exists_cb, &local_exists, NULL, error,
+ ebsql->priv->folderid, uid);
EBSQL_UNLOCK_MUTEX (&ebsql->priv->lock);
*exists = local_exists;
@@ -6493,10 +6614,10 @@ e_book_sqlite_has_contact (EBookSqlite *ebsql,
**/
gboolean
e_book_sqlite_get_contact (EBookSqlite *ebsql,
- const gchar *uid,
- gboolean meta_contact,
- EContact **ret_contact,
- GError **error)
+ const gchar *uid,
+ gboolean meta_contact,
+ EContact **ret_contact,
+ GError **error)
{
gboolean success = FALSE;
gchar *vcard = NULL;
@@ -6505,11 +6626,8 @@ e_book_sqlite_get_contact (EBookSqlite *ebsql,
g_return_val_if_fail (uid != NULL, FALSE);
g_return_val_if_fail (ret_contact != NULL && *ret_contact == NULL, FALSE);
- success = e_book_sqlite_get_vcard (ebsql,
- uid,
- meta_contact,
- &vcard,
- error);
+ success = e_book_sqlite_get_vcard (
+ ebsql, uid, meta_contact, &vcard, error);
if (success && vcard) {
*ret_contact = e_contact_new_from_vcard_with_uid (vcard, uid);
@@ -6538,10 +6656,10 @@ e_book_sqlite_get_contact (EBookSqlite *ebsql,
**/
gboolean
e_book_sqlite_get_vcard (EBookSqlite *ebsql,
- const gchar *uid,
- gboolean meta_contact,
- gchar **ret_vcard,
- GError **error)
+ const gchar *uid,
+ gboolean meta_contact,
+ gchar **ret_vcard,
+ GError **error)
{
gboolean success = FALSE;
gchar *vcard = NULL;
@@ -6567,14 +6685,14 @@ e_book_sqlite_get_vcard (EBookSqlite *ebsql,
vcard = search_data->vcard;
search_data->vcard = NULL;
- g_slist_free_full (vcards, (GDestroyNotify)e_book_sqlite_search_data_free);
+ g_slist_free_full (vcards, (GDestroyNotify) e_book_sqlite_search_data_free);
vcards = NULL;
}
} else {
success = ebsql_exec_printf (
ebsql, "SELECT %s FROM %Q AS summary WHERE summary.uid = %Q",
- get_string_cb, &vcard, NULL, error,
+ get_string_cb, &vcard, NULL, error,
EBSQL_VCARD_FRAGMENT (ebsql), ebsql->priv->folderid, uid);
}
@@ -6583,9 +6701,10 @@ e_book_sqlite_get_vcard (EBookSqlite *ebsql,
*ret_vcard = vcard;
if (success && !vcard) {
- EBSQL_SET_ERROR (error,
- E_BOOK_SQLITE_ERROR_CONTACT_NOT_FOUND,
- _("Contact '%s' not found"), uid);
+ EBSQL_SET_ERROR (
+ error,
+ E_BOOK_SQLITE_ERROR_CONTACT_NOT_FOUND,
+ _("Contact '%s' not found"), uid);
success = FALSE;
}
@@ -6607,9 +6726,9 @@ e_book_sqlite_get_vcard (EBookSqlite *ebsql,
**/
gboolean
e_book_sqlite_set_contact_extra (EBookSqlite *ebsql,
- const gchar *uid,
- const gchar *extra,
- GError **error)
+ const gchar *uid,
+ const gchar *extra,
+ GError **error)
{
gboolean success;
@@ -6619,7 +6738,7 @@ e_book_sqlite_set_contact_extra (EBookSqlite *ebsql,
EBSQL_LOCK_MUTEX (&ebsql->priv->lock);
success = ebsql_exec_printf (
ebsql, "UPDATE %Q SET bdata = %Q WHERE uid = %Q",
- NULL, NULL, NULL, error,
+ NULL, NULL, NULL, error,
ebsql->priv->folderid, uid);
EBSQL_UNLOCK_MUTEX (&ebsql->priv->lock);
@@ -6642,9 +6761,9 @@ e_book_sqlite_set_contact_extra (EBookSqlite *ebsql,
**/
gboolean
e_book_sqlite_get_contact_extra (EBookSqlite *ebsql,
- const gchar *uid,
- gchar **ret_extra,
- GError **error)
+ const gchar *uid,
+ gchar **ret_extra,
+ GError **error)
{
gboolean success;
@@ -6655,7 +6774,7 @@ e_book_sqlite_get_contact_extra (EBookSqlite *ebsql,
EBSQL_LOCK_MUTEX (&ebsql->priv->lock);
success = ebsql_exec_printf (
ebsql, "SELECT bdata FROM %Q WHERE uid = %Q",
- get_string_cb, ret_extra, NULL, error,
+ get_string_cb, ret_extra, NULL, error,
ebsql->priv->folderid, uid);
EBSQL_UNLOCK_MUTEX (&ebsql->priv->lock);
@@ -6691,11 +6810,11 @@ e_book_sqlite_get_contact_extra (EBookSqlite *ebsql,
**/
gboolean
e_book_sqlite_search (EBookSqlite *ebsql,
- const gchar *sexp,
- gboolean meta_contacts,
- GSList **ret_list,
- GCancellable *cancellable,
- GError **error)
+ const gchar *sexp,
+ gboolean meta_contacts,
+ GSList **ret_list,
+ GCancellable *cancellable,
+ GError **error)
{
gboolean success;
@@ -6703,12 +6822,13 @@ e_book_sqlite_search (EBookSqlite *ebsql,
g_return_val_if_fail (ret_list != NULL && *ret_list == NULL, FALSE);
EBSQL_LOCK_OR_RETURN (ebsql, cancellable, FALSE);
- success = ebsql_search_query (ebsql, sexp,
- meta_contacts ?
- SEARCH_UID_AND_REV : SEARCH_FULL,
- ret_list,
- cancellable,
- error);
+ success = ebsql_search_query (
+ ebsql, sexp,
+ meta_contacts ?
+ SEARCH_UID_AND_REV : SEARCH_FULL,
+ ret_list,
+ cancellable,
+ error);
EBSQL_UNLOCK_MUTEX (&ebsql->priv->lock);
return success;
@@ -6733,10 +6853,10 @@ e_book_sqlite_search (EBookSqlite *ebsql,
**/
gboolean
e_book_sqlite_search_uids (EBookSqlite *ebsql,
- const gchar *sexp,
- GSList **ret_list,
- GCancellable *cancellable,
- GError **error)
+ const gchar *sexp,
+ GSList **ret_list,
+ GCancellable *cancellable,
+ GError **error)
{
gboolean success;
@@ -6765,9 +6885,9 @@ e_book_sqlite_search_uids (EBookSqlite *ebsql,
**/
gboolean
e_book_sqlite_get_key_value (EBookSqlite *ebsql,
- const gchar *key,
- gchar **value,
- GError **error)
+ const gchar *key,
+ gchar **value,
+ GError **error)
{
gboolean success;
@@ -6776,10 +6896,11 @@ e_book_sqlite_get_key_value (EBookSqlite *ebsql,
g_return_val_if_fail (value != NULL && *value == NULL, FALSE);
EBSQL_LOCK_MUTEX (&ebsql->priv->lock);
- success = ebsql_exec_printf (ebsql,
- "SELECT value FROM keys WHERE folder_id = %Q AND key = %Q",
- get_string_cb, value, NULL, error,
- ebsql->priv->folderid, key);
+ success = ebsql_exec_printf (
+ ebsql,
+ "SELECT value FROM keys WHERE folder_id = %Q AND key = %Q",
+ get_string_cb, value, NULL, error,
+ ebsql->priv->folderid, key);
EBSQL_UNLOCK_MUTEX (&ebsql->priv->lock);
return success;
@@ -6800,9 +6921,9 @@ e_book_sqlite_get_key_value (EBookSqlite *ebsql,
**/
gboolean
e_book_sqlite_set_key_value (EBookSqlite *ebsql,
- const gchar *key,
- const gchar *value,
- GError **error)
+ const gchar *key,
+ const gchar *value,
+ GError **error)
{
gboolean success;
@@ -6835,9 +6956,9 @@ e_book_sqlite_set_key_value (EBookSqlite *ebsql,
**/
gboolean
e_book_sqlite_get_key_value_int (EBookSqlite *ebsql,
- const gchar *key,
- gint *value,
- GError **error)
+ const gchar *key,
+ gint *value,
+ GError **error)
{
gboolean success;
gchar *str_value = NULL;
@@ -6876,9 +6997,9 @@ e_book_sqlite_get_key_value_int (EBookSqlite *ebsql,
**/
gboolean
e_book_sqlite_set_key_value_int (EBookSqlite *ebsql,
- const gchar *key,
- gint value,
- GError **error)
+ const gchar *key,
+ gint value,
+ GError **error)
{
gboolean success;
gchar *str_value = NULL;
@@ -6887,10 +7008,8 @@ e_book_sqlite_set_key_value_int (EBookSqlite *ebsql,
g_return_val_if_fail (key != NULL, FALSE);
str_value = g_strdup_printf ("%d", value);
- success = e_book_sqlite_set_key_value (ebsql,
- key,
- str_value,
- error);
+ success = e_book_sqlite_set_key_value (
+ ebsql, key, str_value, error);
g_free (str_value);
return success;
@@ -6941,9 +7060,9 @@ e_book_sqlite_search_data_free (EbSqlSearchData *data)
*/
gboolean
e_book_sqlite_set_locale (EBookSqlite *ebsql,
- const gchar *lc_collate,
- GCancellable *cancellable,
- GError **error)
+ const gchar *lc_collate,
+ GCancellable *cancellable,
+ GError **error)
{
gboolean success;
gchar *stored_lc_collate = NULL;
@@ -7001,9 +7120,9 @@ e_book_sqlite_set_locale (EBookSqlite *ebsql,
* Since: 3.12
*/
gboolean
-e_book_sqlite_get_locale (EBookSqlite *ebsql,
- gchar **locale_out,
- GError **error)
+e_book_sqlite_get_locale (EBookSqlite *ebsql,
+ gchar **locale_out,
+ GError **error)
{
gboolean success;
GError *local_error = NULL;
@@ -7055,12 +7174,12 @@ e_book_sqlite_get_locale (EBookSqlite *ebsql,
* Since: 3.12
*/
EbSqlCursor *
-e_book_sqlite_cursor_new (EBookSqlite *ebsql,
- const gchar *sexp,
- const EContactField *sort_fields,
- const EBookCursorSortType *sort_types,
- guint n_sort_fields,
- GError **error)
+e_book_sqlite_cursor_new (EBookSqlite *ebsql,
+ const gchar *sexp,
+ const EContactField *sort_fields,
+ const EBookCursorSortType *sort_types,
+ guint n_sort_fields,
+ GError **error)
{
EbSqlCursor *cursor;
gint i;
@@ -7084,11 +7203,13 @@ e_book_sqlite_cursor_new (EBookSqlite *ebsql,
/* We only support string fields to sort the cursor */
for (i = 0; i < n_sort_fields; i++) {
- EBSQL_NOTE (CURSOR,
- g_printerr ("Building cursor to sort '%s' in '%s' order\n",
- e_contact_field_name (sort_fields[i]),
- sort_types[i] == E_BOOK_CURSOR_SORT_ASCENDING ?
- "ascending" : "descending"));
+ EBSQL_NOTE (
+ CURSOR,
+ g_printerr (
+ "Building cursor to sort '%s' in '%s' order\n",
+ e_contact_field_name (sort_fields[i]),
+ sort_types[i] == E_BOOK_CURSOR_SORT_ASCENDING ?
+ "ascending" : "descending"));
if (e_contact_field_type (sort_fields[i]) != G_TYPE_STRING) {
EBSQL_SET_ERROR_LITERAL (
@@ -7112,10 +7233,12 @@ e_book_sqlite_cursor_new (EBookSqlite *ebsql,
EBSQL_UNLOCK_MUTEX (&ebsql->priv->lock);
- EBSQL_NOTE (CURSOR,
- g_printerr ("%s cursor with search expression '%s'\n",
- cursor ? "Successfully created" : "Failed to create",
- sexp));
+ EBSQL_NOTE (
+ CURSOR,
+ g_printerr (
+ "%s cursor with search expression '%s'\n",
+ cursor ? "Successfully created" : "Failed to create",
+ sexp));
return cursor;
}
@@ -7131,7 +7254,7 @@ e_book_sqlite_cursor_new (EBookSqlite *ebsql,
*/
void
e_book_sqlite_cursor_free (EBookSqlite *ebsql,
- EbSqlCursor *cursor)
+ EbSqlCursor *cursor)
{
g_return_if_fail (E_IS_BOOK_SQLITE (ebsql));
@@ -7149,9 +7272,9 @@ typedef struct {
static gint
collect_results_for_cursor_cb (gpointer ref,
- gint ncol,
- gchar **cols,
- gchar **names)
+ gint ncol,
+ gchar **cols,
+ gchar **names)
{
CursorCollectData *data = ref;
@@ -7211,14 +7334,14 @@ collect_results_for_cursor_cb (gpointer ref,
* Since: 3.12
*/
gint
-e_book_sqlite_cursor_step (EBookSqlite *ebsql,
- EbSqlCursor *cursor,
- EbSqlCursorStepFlags flags,
- EbSqlCursorOrigin origin,
- gint count,
- GSList **results,
- GCancellable *cancellable,
- GError **error)
+e_book_sqlite_cursor_step (EBookSqlite *ebsql,
+ EbSqlCursor *cursor,
+ EbSqlCursorStepFlags flags,
+ EbSqlCursorOrigin origin,
+ gint count,
+ GSList **results,
+ GCancellable *cancellable,
+ GError **error)
{
CursorCollectData data = { NULL, NULL, NULL, FALSE, 0 };
CursorState *state;
@@ -7234,12 +7357,13 @@ e_book_sqlite_cursor_step (EBookSqlite *ebsql,
/* Lock and check cancellable early */
EBSQL_LOCK_OR_RETURN (ebsql, cancellable, -1);
- EBSQL_NOTE (CURSOR,
- g_printerr ("Cursor requested to step by %d with origin %s will move: %s will fetch:
%s\n",
- count, EBSQL_ORIGIN_STR (origin),
- (flags & EBSQL_CURSOR_STEP_MOVE) ? "yes" : "no",
- (flags & EBSQL_CURSOR_STEP_FETCH) ? "yes" : "no"));
-
+ EBSQL_NOTE (
+ CURSOR,
+ g_printerr (
+ "Cursor requested to step by %d with origin %s will move: %s will fetch: %s\n",
+ count, EBSQL_ORIGIN_STR (origin),
+ (flags & EBSQL_CURSOR_STEP_MOVE) ? "yes" : "no",
+ (flags & EBSQL_CURSOR_STEP_FETCH) ? "yes" : "no"));
/* Check if this step should result in an end of list error first */
try_position = cursor->state.position;
@@ -7251,15 +7375,15 @@ e_book_sqlite_cursor_step (EBookSqlite *ebsql,
EBSQL_SET_ERROR_LITERAL (
error, E_BOOK_SQLITE_ERROR_END_OF_LIST,
_("Tried to step a cursor in reverse, "
- "but cursor is already at the beginning of the contact list"));
-
+ "but cursor is already at the beginning of the contact list"));
+
EBSQL_UNLOCK_MUTEX (&ebsql->priv->lock);
return -1;
} else if (try_position == EBSQL_CURSOR_ORIGIN_END && count > 0) {
EBSQL_SET_ERROR_LITERAL (
error, E_BOOK_SQLITE_ERROR_END_OF_LIST,
_("Tried to step a cursor forwards, "
- "but cursor is already at the end of the contact list"));
+ "but cursor is already at the end of the contact list"));
EBSQL_UNLOCK_MUTEX (&ebsql->priv->lock);
return -1;
@@ -7330,11 +7454,8 @@ e_book_sqlite_cursor_step (EBookSqlite *ebsql,
else
g_string_append (query, " AND ");
- constraints = ebsql_cursor_constraints (ebsql,
- cursor,
- state,
- count < 0,
- FALSE);
+ constraints = ebsql_cursor_constraints (
+ ebsql, cursor, state, count < 0, FALSE);
g_string_append_c (query, '(');
g_string_append (query, constraints);
@@ -7357,9 +7478,10 @@ e_book_sqlite_cursor_step (EBookSqlite *ebsql,
data.collect_results = (flags & EBSQL_CURSOR_STEP_FETCH) != 0;
/* Execute the query */
- success = ebsql_exec (ebsql, query->str,
- collect_results_for_cursor_cb, &data,
- cancellable, error);
+ success = ebsql_exec (
+ ebsql, query->str,
+ collect_results_for_cursor_cb, &data,
+ cancellable, error);
/* Lock was obtained above */
EBSQL_UNLOCK_MUTEX (&ebsql->priv->lock);
@@ -7395,8 +7517,9 @@ e_book_sqlite_cursor_step (EBookSqlite *ebsql,
/* Cleanup what was allocated by collect_results_for_cursor_cb() */
if (data.results)
- g_slist_free_full (data.results,
- (GDestroyNotify)e_book_sqlite_search_data_free);
+ g_slist_free_full (
+ data.results,
+ (GDestroyNotify) e_book_sqlite_search_data_free);
g_free (data.alloc_vcard);
/* Free the copy state if we were working with a copy */
@@ -7434,8 +7557,8 @@ e_book_sqlite_cursor_step (EBookSqlite *ebsql,
*/
void
e_book_sqlite_cursor_set_target_alphabetic_index (EBookSqlite *ebsql,
- EbSqlCursor *cursor,
- gint idx)
+ EbSqlCursor *cursor,
+ gint idx)
{
gint n_labels = 0;
@@ -7443,8 +7566,9 @@ e_book_sqlite_cursor_set_target_alphabetic_index (EBookSqlite *ebsql,
g_return_if_fail (cursor != NULL);
g_return_if_fail (idx >= 0);
- e_collator_get_index_labels (ebsql->priv->collator, &n_labels,
- NULL, NULL, NULL);
+ e_collator_get_index_labels (
+ ebsql->priv->collator, &n_labels,
+ NULL, NULL, NULL);
g_return_if_fail (idx < n_labels);
cursor_state_clear (cursor, &(cursor->state), EBSQL_CURSOR_ORIGIN_CURRENT);
@@ -7453,12 +7577,12 @@ e_book_sqlite_cursor_set_target_alphabetic_index (EBookSqlite *ebsql,
gchar *index_key;
index_key = e_collator_generate_key_for_index (ebsql->priv->collator, idx);
- field = summary_field_get (ebsql, cursor->sort_fields[0]);
+ field = summary_field_get (ebsql, cursor->sort_fields[0]);
if (field && (field->index & INDEX_FLAG (SORT_KEY)) != 0) {
cursor->state.values[0] = index_key;
} else {
- cursor->state.values[0] =
+ cursor->state.values[0] =
ebsql_encode_vcard_sort_key (index_key);
g_free (index_key);
}
@@ -7482,10 +7606,10 @@ e_book_sqlite_cursor_set_target_alphabetic_index (EBookSqlite *ebsql,
* Since: 3.12
*/
gboolean
-e_book_sqlite_cursor_set_sexp (EBookSqlite *ebsql,
- EbSqlCursor *cursor,
- const gchar *sexp,
- GError **error)
+e_book_sqlite_cursor_set_sexp (EBookSqlite *ebsql,
+ EbSqlCursor *cursor,
+ const gchar *sexp,
+ GError **error)
{
gboolean success;
@@ -7523,12 +7647,12 @@ e_book_sqlite_cursor_set_sexp (EBookSqlite *ebsql,
* Since: 3.12
*/
gboolean
-e_book_sqlite_cursor_calculate (EBookSqlite *ebsql,
- EbSqlCursor *cursor,
- gint *total,
- gint *position,
- GCancellable *cancellable,
- GError **error)
+e_book_sqlite_cursor_calculate (EBookSqlite *ebsql,
+ EbSqlCursor *cursor,
+ gint *total,
+ gint *position,
+ GCancellable *cancellable,
+ GError **error)
{
gboolean success = TRUE;
gint local_total = 0;
@@ -7577,7 +7701,6 @@ e_book_sqlite_cursor_calculate (EBookSqlite *ebsql,
/* The GError is already set. */
ebsql_rollback_transaction (ebsql, NULL);
-
EBSQL_UNLOCK_MUTEX (&ebsql->priv->lock);
/* In the case we're at the end, we just set the position
@@ -7607,9 +7730,9 @@ e_book_sqlite_cursor_calculate (EBookSqlite *ebsql,
*/
gint
e_book_sqlite_cursor_compare_contact (EBookSqlite *ebsql,
- EbSqlCursor *cursor,
- EContact *contact,
- gboolean *matches_sexp)
+ EbSqlCursor *cursor,
+ EContact *contact,
+ gboolean *matches_sexp)
{
EBookSqlitePrivate *priv;
gint i;
@@ -7636,10 +7759,10 @@ e_book_sqlite_cursor_compare_contact (EBookSqlite *ebsql,
const gchar *field_value;
gchar *freeme = NULL;
- field_value = (const gchar *)e_contact_get_const (contact, cursor->sort_fields[i]);
+ field_value = (const gchar *) e_contact_get_const (contact, cursor->sort_fields[i]);
if (field_value)
contact_key = e_collator_generate_key (priv->collator, field_value, NULL);
-
+
field = summary_field_get (ebsql, cursor->sort_fields[i]);
if (field && (field->index & INDEX_FLAG (SORT_KEY)) != 0) {
@@ -7667,7 +7790,7 @@ e_book_sqlite_cursor_compare_contact (EBookSqlite *ebsql,
if (comparison == 0) {
const gchar *uid;
- uid = (const gchar *)e_contact_get_const (contact, E_CONTACT_UID);
+ uid = (const gchar *) e_contact_get_const (contact, E_CONTACT_UID);
if (cursor->state.last_uid == NULL)
comparison = 1;
diff --git a/addressbook/libedata-book/e-book-sqlite.h b/addressbook/libedata-book/e-book-sqlite.h
index 3ca220d..2a90064 100644
--- a/addressbook/libedata-book/e-book-sqlite.h
+++ b/addressbook/libedata-book/e-book-sqlite.h
@@ -30,12 +30,23 @@
#include <libebook-contacts/libebook-contacts.h>
/* Standard GObject macros */
-#define E_TYPE_BOOK_SQLITE (e_book_sqlite_get_type ())
-#define E_BOOK_SQLITE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_BOOK_SQLITE, EBookSqlite))
-#define E_BOOK_SQLITE_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST ((cls), E_TYPE_BOOK_SQLITE, EBookSqliteClass))
-#define E_IS_BOOK_SQLITE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_BOOK_SQLITE))
-#define E_IS_BOOK_SQLITE_CLASS(cls) (G_TYPE_CHECK_CLASS_TYPE ((cls), E_TYPE_BOOK_SQLITE))
-#define E_BOOK_SQLITE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_BOOK_SQLITE,
EBookSqliteClass))
+#define E_TYPE_BOOK_SQLITE \
+ (e_book_sqlite_get_type ())
+#define E_BOOK_SQLITE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST \
+ ((obj), E_TYPE_BOOK_SQLITE, EBookSqlite))
+#define E_BOOK_SQLITE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_CAST \
+ ((cls), E_TYPE_BOOK_SQLITE, EBookSqliteClass))
+#define E_IS_BOOK_SQLITE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE \
+ ((obj), E_TYPE_BOOK_SQLITE))
+#define E_IS_BOOK_SQLITE_CLASS(cls) \
+ (G_TYPE_CHECK_CLASS_TYPE \
+ ((cls), E_TYPE_BOOK_SQLITE))
+#define E_BOOK_SQLITE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS \
+ ((obj), E_TYPE_BOOK_SQLITE, EBookSqliteClass))
/**
* E_BOOK_SQLITE_ERROR:
@@ -98,11 +109,11 @@ typedef enum {
*
* Since: 3.12
**/
-typedef void (* EbSqlChangeCallback) (EbSqlChangeType change_type,
- const gchar *uid,
- const gchar *extra,
- const gchar *vcard,
- gpointer user_data);
+typedef void (*EbSqlChangeCallback) (EbSqlChangeType change_type,
+ const gchar *uid,
+ const gchar *extra,
+ const gchar *vcard,
+ gpointer user_data);
/**
* EbSqlVCardCallback:
@@ -127,9 +138,9 @@ typedef void (* EbSqlChangeCallback) (EbSqlChangeType change_type,
*
* Since: 3.12
**/
-typedef gchar * (* EbSqlVCardCallback) (const gchar *uid,
- const gchar *extra,
- gpointer user_data);
+typedef gchar * (*EbSqlVCardCallback) (const gchar *uid,
+ const gchar *extra,
+ gpointer user_data);
/**
* EBookSqliteError:
@@ -275,18 +286,18 @@ typedef enum {
* Since: 3.12
*/
typedef enum {
- EBSQL_CURSOR_STEP_MOVE = (1 << 0),
+ EBSQL_CURSOR_STEP_MOVE = (1 << 0),
EBSQL_CURSOR_STEP_FETCH = (1 << 1)
} EbSqlCursorStepFlags;
-GType e_book_sqlite_get_type (void) G_GNUC_CONST;
-GQuark e_book_sqlite_error_quark (void);
-void e_book_sqlite_search_data_free (EbSqlSearchData *data);
+GType e_book_sqlite_get_type (void) G_GNUC_CONST;
+GQuark e_book_sqlite_error_quark (void);
+void e_book_sqlite_search_data_free (EbSqlSearchData *data);
-EBookSqlite *e_book_sqlite_new (const gchar *path,
+EBookSqlite * e_book_sqlite_new (const gchar *path,
GCancellable *cancellable,
GError **error);
-EBookSqlite *e_book_sqlite_new_full (const gchar *path,
+EBookSqlite * e_book_sqlite_new_full (const gchar *path,
ESourceBackendSummarySetup *setup,
EbSqlVCardCallback vcard_callback,
EbSqlChangeCallback change_callback,
@@ -294,106 +305,106 @@ EBookSqlite *e_book_sqlite_new_full (const gchar *path,
GDestroyNotify user_data_destroy,
GCancellable *cancellable,
GError **error);
-gboolean e_book_sqlite_lock (EBookSqlite *ebsql,
+gboolean e_book_sqlite_lock (EBookSqlite *ebsql,
EbSqlLockType lock_type,
GCancellable *cancellable,
GError **error);
-gboolean e_book_sqlite_unlock (EBookSqlite *ebsql,
+gboolean e_book_sqlite_unlock (EBookSqlite *ebsql,
EbSqlUnlockAction action,
GError **error);
-gboolean e_book_sqlite_set_locale (EBookSqlite *ebsql,
+gboolean e_book_sqlite_set_locale (EBookSqlite *ebsql,
const gchar *lc_collate,
GCancellable *cancellable,
GError **error);
-gboolean e_book_sqlite_get_locale (EBookSqlite *ebsql,
+gboolean e_book_sqlite_get_locale (EBookSqlite *ebsql,
gchar **locale_out,
GError **error);
-ECollator *e_book_sqlite_ref_collator (EBookSqlite *ebsql);
+ECollator * e_book_sqlite_ref_collator (EBookSqlite *ebsql);
/* Adding / Removing / Searching contacts */
-gboolean e_book_sqlite_add_contact (EBookSqlite *ebsql,
+gboolean e_book_sqlite_add_contact (EBookSqlite *ebsql,
EContact *contact,
const gchar *extra,
gboolean replace,
GCancellable *cancellable,
GError **error);
-gboolean e_book_sqlite_add_contacts (EBookSqlite *ebsql,
+gboolean e_book_sqlite_add_contacts (EBookSqlite *ebsql,
GSList *contacts,
GSList *extra,
gboolean replace,
GCancellable *cancellable,
GError **error);
-gboolean e_book_sqlite_remove_contact (EBookSqlite *ebsql,
+gboolean e_book_sqlite_remove_contact (EBookSqlite *ebsql,
const gchar *uid,
GCancellable *cancellable,
GError **error);
-gboolean e_book_sqlite_remove_contacts (EBookSqlite *ebsql,
+gboolean e_book_sqlite_remove_contacts (EBookSqlite *ebsql,
GSList *uids,
GCancellable *cancellable,
GError **error);
-gboolean e_book_sqlite_has_contact (EBookSqlite *ebsql,
+gboolean e_book_sqlite_has_contact (EBookSqlite *ebsql,
const gchar *uid,
gboolean *exists,
GError **error);
-gboolean e_book_sqlite_get_contact (EBookSqlite *ebsql,
+gboolean e_book_sqlite_get_contact (EBookSqlite *ebsql,
const gchar *uid,
gboolean meta_contact,
EContact **ret_contact,
GError **error);
-gboolean e_book_sqlite_get_vcard (EBookSqlite *ebsql,
+gboolean e_book_sqlite_get_vcard (EBookSqlite *ebsql,
const gchar *uid,
gboolean meta_contact,
gchar **ret_vcard,
GError **error);
-gboolean e_book_sqlite_set_contact_extra (EBookSqlite *ebsql,
+gboolean e_book_sqlite_set_contact_extra (EBookSqlite *ebsql,
const gchar *uid,
const gchar *extra,
GError **error);
-gboolean e_book_sqlite_get_contact_extra (EBookSqlite *ebsql,
+gboolean e_book_sqlite_get_contact_extra (EBookSqlite *ebsql,
const gchar *uid,
gchar **ret_extra,
GError **error);
-gboolean e_book_sqlite_search (EBookSqlite *ebsql,
+gboolean e_book_sqlite_search (EBookSqlite *ebsql,
const gchar *sexp,
gboolean meta_contacts,
GSList **ret_list,
GCancellable *cancellable,
GError **error);
-gboolean e_book_sqlite_search_uids (EBookSqlite *ebsql,
+gboolean e_book_sqlite_search_uids (EBookSqlite *ebsql,
const gchar *sexp,
GSList **ret_list,
GCancellable *cancellable,
GError **error);
/* Key / Value convenience API */
-gboolean e_book_sqlite_get_key_value (EBookSqlite *ebsql,
+gboolean e_book_sqlite_get_key_value (EBookSqlite *ebsql,
const gchar *key,
gchar **value,
GError **error);
-gboolean e_book_sqlite_set_key_value (EBookSqlite *ebsql,
+gboolean e_book_sqlite_set_key_value (EBookSqlite *ebsql,
const gchar *key,
const gchar *value,
GError **error);
-gboolean e_book_sqlite_get_key_value_int (EBookSqlite *ebsql,
+gboolean e_book_sqlite_get_key_value_int (EBookSqlite *ebsql,
const gchar *key,
gint *value,
GError **error);
-gboolean e_book_sqlite_set_key_value_int (EBookSqlite *ebsql,
+gboolean e_book_sqlite_set_key_value_int (EBookSqlite *ebsql,
const gchar *key,
gint value,
GError **error);
/* Cursor API */
-EbSqlCursor *e_book_sqlite_cursor_new (EBookSqlite *ebsql,
+EbSqlCursor * e_book_sqlite_cursor_new (EBookSqlite *ebsql,
const gchar *sexp,
const EContactField *sort_fields,
const EBookCursorSortType *sort_types,
guint n_sort_fields,
GError **error);
-void e_book_sqlite_cursor_free (EBookSqlite *ebsql,
+void e_book_sqlite_cursor_free (EBookSqlite *ebsql,
EbSqlCursor *cursor);
-gint e_book_sqlite_cursor_step (EBookSqlite *ebsql,
+gint e_book_sqlite_cursor_step (EBookSqlite *ebsql,
EbSqlCursor *cursor,
EbSqlCursorStepFlags flags,
EbSqlCursorOrigin origin,
@@ -401,22 +412,22 @@ gint e_book_sqlite_cursor_step (EBookSqlite *ebsql,
GSList **results,
GCancellable *cancellable,
GError **error);
-void e_book_sqlite_cursor_set_target_alphabetic_index
- (EBookSqlite *ebsql,
+void e_book_sqlite_cursor_set_target_alphabetic_index
+ (EBookSqlite *ebsql,
EbSqlCursor *cursor,
gint idx);
-gboolean e_book_sqlite_cursor_set_sexp (EBookSqlite *ebsql,
+gboolean e_book_sqlite_cursor_set_sexp (EBookSqlite *ebsql,
EbSqlCursor *cursor,
const gchar *sexp,
GError **error);
-gboolean e_book_sqlite_cursor_calculate (EBookSqlite *ebsql,
+gboolean e_book_sqlite_cursor_calculate (EBookSqlite *ebsql,
EbSqlCursor *cursor,
gint *total,
gint *position,
GCancellable *cancellable,
GError **error);
-gint e_book_sqlite_cursor_compare_contact
- (EBookSqlite *ebsql,
+gint e_book_sqlite_cursor_compare_contact
+ (EBookSqlite *ebsql,
EbSqlCursor *cursor,
EContact *contact,
gboolean *matches_sexp);
diff --git a/addressbook/libedata-book/e-data-book-cursor-sqlite.c
b/addressbook/libedata-book/e-data-book-cursor-sqlite.c
index ac630bf..199a52c 100644
--- a/addressbook/libedata-book/e-data-book-cursor-sqlite.c
+++ b/addressbook/libedata-book/e-data-book-cursor-sqlite.c
@@ -35,6 +35,10 @@
#include "e-data-book-cursor-sqlite.h"
+#define E_DATA_BOOK_CURSOR_SQLITE_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), E_TYPE_DATA_BOOK_CURSOR_SQLITE, EDataBookCursorSqlitePrivate))
+
/* GObjectClass */
static void e_data_book_cursor_sqlite_dispose (GObject *object);
static void e_data_book_cursor_sqlite_finalize (GObject *object);
@@ -140,10 +144,7 @@ e_data_book_cursor_sqlite_class_init (EDataBookCursorSqliteClass *class)
static void
e_data_book_cursor_sqlite_init (EDataBookCursorSqlite *cursor)
{
- cursor->priv =
- G_TYPE_INSTANCE_GET_PRIVATE (cursor,
- E_TYPE_DATA_BOOK_CURSOR_SQLITE,
- EDataBookCursorSqlitePrivate);
+ cursor->priv = E_DATA_BOOK_CURSOR_SQLITE_GET_PRIVATE (cursor);
}
static void
@@ -152,11 +153,11 @@ e_data_book_cursor_sqlite_dispose (GObject *object)
EDataBookCursorSqlite *cursor = E_DATA_BOOK_CURSOR_SQLITE (object);
EDataBookCursorSqlitePrivate *priv = cursor->priv;
- if (priv->ebsql) {
+ if (priv->ebsql != NULL) {
- if (priv->cursor)
- e_book_sqlite_cursor_free (priv->ebsql,
- priv->cursor);
+ if (priv->cursor != NULL)
+ e_book_sqlite_cursor_free (
+ priv->ebsql, priv->cursor);
g_object_unref (priv->ebsql);
priv->ebsql = NULL;
@@ -179,9 +180,9 @@ e_data_book_cursor_sqlite_finalize (GObject *object)
static void
e_data_book_cursor_sqlite_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
EDataBookCursorSqlite *cursor = E_DATA_BOOK_CURSOR_SQLITE (object);
EDataBookCursorSqlitePrivate *priv = cursor->priv;
@@ -209,9 +210,9 @@ e_data_book_cursor_sqlite_set_property (GObject *object,
* EDataBookCursorClass *
************************************************/
static gboolean
-e_data_book_cursor_sqlite_set_sexp (EDataBookCursor *cursor,
- const gchar *sexp,
- GError **error)
+e_data_book_cursor_sqlite_set_sexp (EDataBookCursor *cursor,
+ const gchar *sexp,
+ GError **error)
{
EDataBookCursorSqlite *cursor_sqlite;
EDataBookCursorSqlitePrivate *priv;
@@ -221,19 +222,18 @@ e_data_book_cursor_sqlite_set_sexp (EDataBookCursor *cursor,
cursor_sqlite = E_DATA_BOOK_CURSOR_SQLITE (cursor);
priv = cursor_sqlite->priv;
- success = e_book_sqlite_cursor_set_sexp (priv->ebsql,
- priv->cursor,
- sexp,
- &local_error);
+ success = e_book_sqlite_cursor_set_sexp (
+ priv->ebsql, priv->cursor, sexp, &local_error);
if (!success) {
if (g_error_matches (local_error,
E_BOOK_SQLITE_ERROR,
E_BOOK_SQLITE_ERROR_INVALID_QUERY)) {
- g_set_error_literal (error,
- E_CLIENT_ERROR,
- E_CLIENT_ERROR_INVALID_QUERY,
- local_error->message);
+ g_set_error_literal (
+ error,
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_INVALID_QUERY,
+ local_error->message);
g_clear_error (&local_error);
} else {
g_propagate_error (error, local_error);
@@ -244,9 +244,9 @@ e_data_book_cursor_sqlite_set_sexp (EDataBookCursor *cursor,
}
static gboolean
-convert_origin (EBookCursorOrigin src_origin,
- EbSqlCursorOrigin *dest_origin,
- GError **error)
+convert_origin (EBookCursorOrigin src_origin,
+ EbSqlCursorOrigin *dest_origin,
+ GError **error)
{
gboolean success = TRUE;
@@ -262,10 +262,11 @@ convert_origin (EBookCursorOrigin src_origin,
break;
default:
success = FALSE;
- g_set_error_literal (error,
- E_CLIENT_ERROR,
- E_CLIENT_ERROR_INVALID_ARG,
- _("Unrecognized cursor origin"));
+ g_set_error_literal (
+ error,
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_INVALID_ARG,
+ _("Unrecognized cursor origin"));
break;
}
@@ -273,8 +274,8 @@ convert_origin (EBookCursorOrigin src_origin,
}
static void
-convert_flags (EBookCursorStepFlags src_flags,
- EbSqlCursorStepFlags *dest_flags)
+convert_flags (EBookCursorStepFlags src_flags,
+ EbSqlCursorStepFlags *dest_flags)
{
if (src_flags & E_BOOK_CURSOR_STEP_MOVE)
*dest_flags |= EBSQL_CURSOR_STEP_MOVE;
@@ -284,14 +285,14 @@ convert_flags (EBookCursorStepFlags src_flags,
}
static gint
-e_data_book_cursor_sqlite_step (EDataBookCursor *cursor,
- const gchar *revision_guard,
- EBookCursorStepFlags flags,
- EBookCursorOrigin origin,
- gint count,
- GSList **results,
- GCancellable *cancellable,
- GError **error)
+e_data_book_cursor_sqlite_step (EDataBookCursor *cursor,
+ const gchar *revision_guard,
+ EBookCursorStepFlags flags,
+ EBookCursorOrigin origin,
+ gint count,
+ GSList **results,
+ GCancellable *cancellable,
+ GError **error)
{
EDataBookCursorSqlite *cursor_sqlite;
EDataBookCursorSqlitePrivate *priv;
@@ -320,32 +321,35 @@ e_data_book_cursor_sqlite_step (EDataBookCursor *cursor,
success = e_book_sqlite_lock (priv->ebsql, EBSQL_LOCK_READ, cancellable, error);
if (success && revision_guard)
- success = e_book_sqlite_get_key_value (priv->ebsql,
- priv->revision_key,
- &revision,
- error);
+ success = e_book_sqlite_get_key_value (
+ priv->ebsql,
+ priv->revision_key,
+ &revision,
+ error);
if (success && revision_guard &&
g_strcmp0 (revision, revision_guard) != 0) {
- g_set_error_literal (error,
- E_CLIENT_ERROR,
- E_CLIENT_ERROR_OUT_OF_SYNC,
- _("Out of sync revision while moving cursor"));
+ g_set_error_literal (
+ error,
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OUT_OF_SYNC,
+ _("Out of sync revision while moving cursor"));
success = FALSE;
}
if (success) {
GError *local_error = NULL;
- n_results = e_book_sqlite_cursor_step (priv->ebsql,
- priv->cursor,
- sqlite_flags,
- sqlite_origin,
- count,
- &local_results,
- cancellable,
- &local_error);
+ n_results = e_book_sqlite_cursor_step (
+ priv->ebsql,
+ priv->cursor,
+ sqlite_flags,
+ sqlite_origin,
+ count,
+ &local_results,
+ cancellable,
+ &local_error);
if (n_results < 0) {
@@ -353,9 +357,10 @@ e_data_book_cursor_sqlite_step (EDataBookCursor *cursor,
if (g_error_matches (local_error,
E_BOOK_SQLITE_ERROR,
E_BOOK_SQLITE_ERROR_END_OF_LIST)) {
- g_set_error_literal (error, E_CLIENT_ERROR,
- E_CLIENT_ERROR_QUERY_REFUSED,
- local_error->message);
+ g_set_error_literal (
+ error, E_CLIENT_ERROR,
+ E_CLIENT_ERROR_QUERY_REFUSED,
+ local_error->message);
g_clear_error (&local_error);
} else
g_propagate_error (error, local_error);
@@ -371,8 +376,9 @@ e_data_book_cursor_sqlite_step (EDataBookCursor *cursor,
GError *local_error = NULL;
if (!e_book_sqlite_unlock (priv->ebsql, EBSQL_UNLOCK_NONE, &local_error)) {
- g_warning ("Error occurred while unlocking the SQLite: %s",
- local_error->message);
+ g_warning (
+ "Error occurred while unlocking the SQLite: %s",
+ local_error->message);
g_clear_error (&local_error);
}
}
@@ -385,12 +391,12 @@ e_data_book_cursor_sqlite_step (EDataBookCursor *cursor,
data->vcard = NULL;
}
- g_slist_free_full (local_results, (GDestroyNotify)e_book_sqlite_search_data_free);
+ g_slist_free_full (local_results, (GDestroyNotify) e_book_sqlite_search_data_free);
if (results)
*results = g_slist_reverse (local_converted_results);
else
- g_slist_free_full (local_converted_results, (GDestroyNotify)g_free);
+ g_slist_free_full (local_converted_results, (GDestroyNotify) g_free);
g_free (revision);
@@ -401,10 +407,10 @@ e_data_book_cursor_sqlite_step (EDataBookCursor *cursor,
}
static gboolean
-e_data_book_cursor_sqlite_set_alphabetic_index (EDataBookCursor *cursor,
- gint index,
- const gchar *locale,
- GError **error)
+e_data_book_cursor_sqlite_set_alphabetic_index (EDataBookCursor *cursor,
+ gint index,
+ const gchar *locale,
+ GError **error)
{
EDataBookCursorSqlite *cursor_sqlite;
EDataBookCursorSqlitePrivate *priv;
@@ -418,27 +424,29 @@ e_data_book_cursor_sqlite_set_alphabetic_index (EDataBookCursor *cursor,
/* Locale mismatch, need to report error */
if (g_strcmp0 (current_locale, locale) != 0) {
- g_set_error_literal (error,
- E_CLIENT_ERROR,
- E_CLIENT_ERROR_OUT_OF_SYNC,
- _("Alphabetic index was set for incorrect locale"));
+ g_set_error_literal (
+ error,
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OUT_OF_SYNC,
+ _("Alphabetic index was set for incorrect locale"));
g_free (current_locale);
return FALSE;
}
- e_book_sqlite_cursor_set_target_alphabetic_index (priv->ebsql,
- priv->cursor,
- index);
+ e_book_sqlite_cursor_set_target_alphabetic_index (
+ priv->ebsql,
+ priv->cursor,
+ index);
g_free (current_locale);
return TRUE;
}
static gboolean
-e_data_book_cursor_sqlite_get_position (EDataBookCursor *cursor,
- gint *total,
- gint *position,
- GCancellable *cancellable,
- GError **error)
+e_data_book_cursor_sqlite_get_position (EDataBookCursor *cursor,
+ gint *total,
+ gint *position,
+ GCancellable *cancellable,
+ GError **error)
{
EDataBookCursorSqlite *cursor_sqlite;
EDataBookCursorSqlitePrivate *priv;
@@ -446,17 +454,18 @@ e_data_book_cursor_sqlite_get_position (EDataBookCursor *cursor,
cursor_sqlite = E_DATA_BOOK_CURSOR_SQLITE (cursor);
priv = cursor_sqlite->priv;
- return e_book_sqlite_cursor_calculate (priv->ebsql,
- priv->cursor,
- total, position,
- cancellable,
- error);
+ return e_book_sqlite_cursor_calculate (
+ priv->ebsql,
+ priv->cursor,
+ total, position,
+ cancellable,
+ error);
}
static gint
-e_data_book_cursor_sqlite_compare_contact (EDataBookCursor *cursor,
- EContact *contact,
- gboolean *matches_sexp)
+e_data_book_cursor_sqlite_compare_contact (EDataBookCursor *cursor,
+ EContact *contact,
+ gboolean *matches_sexp)
{
EDataBookCursorSqlite *cursor_sqlite;
EDataBookCursorSqlitePrivate *priv;
@@ -464,16 +473,17 @@ e_data_book_cursor_sqlite_compare_contact (EDataBookCursor *cursor,
cursor_sqlite = E_DATA_BOOK_CURSOR_SQLITE (cursor);
priv = cursor_sqlite->priv;
- return e_book_sqlite_cursor_compare_contact (priv->ebsql,
- priv->cursor,
- contact,
- matches_sexp);
+ return e_book_sqlite_cursor_compare_contact (
+ priv->ebsql,
+ priv->cursor,
+ contact,
+ matches_sexp);
}
static gboolean
-e_data_book_cursor_sqlite_load_locale (EDataBookCursor *cursor,
- gchar **locale,
- GError **error)
+e_data_book_cursor_sqlite_load_locale (EDataBookCursor *cursor,
+ gchar **locale,
+ GError **error)
{
EDataBookCursorSqlite *cursor_sqlite;
EDataBookCursorSqlitePrivate *priv;
@@ -481,9 +491,7 @@ e_data_book_cursor_sqlite_load_locale (EDataBookCursor *cursor,
cursor_sqlite = E_DATA_BOOK_CURSOR_SQLITE (cursor);
priv = cursor_sqlite->priv;
- return e_book_sqlite_get_locale (priv->ebsql,
- locale,
- error);
+ return e_book_sqlite_get_locale (priv->ebsql, locale, error);
}
/************************************************
@@ -510,13 +518,13 @@ e_data_book_cursor_sqlite_load_locale (EDataBookCursor *cursor,
* Since: 3.12
*/
EDataBookCursor *
-e_data_book_cursor_sqlite_new (EBookBackend *backend,
- EBookSqlite *ebsql,
- const gchar *revision_key,
- const EContactField *sort_fields,
- const EBookCursorSortType *sort_types,
- guint n_fields,
- GError **error)
+e_data_book_cursor_sqlite_new (EBookBackend *backend,
+ EBookSqlite *ebsql,
+ const gchar *revision_key,
+ const EContactField *sort_fields,
+ const EBookCursorSortType *sort_types,
+ guint n_fields,
+ GError **error)
{
EDataBookCursor *cursor = NULL;
EbSqlCursor *ebsql_cursor;
@@ -525,19 +533,21 @@ e_data_book_cursor_sqlite_new (EBookBackend *backend,
g_return_val_if_fail (E_IS_BOOK_BACKEND (backend), NULL);
g_return_val_if_fail (E_IS_BOOK_SQLITE (ebsql), NULL);
- ebsql_cursor = e_book_sqlite_cursor_new (ebsql, NULL,
- sort_fields,
- sort_types,
- n_fields,
- &local_error);
+ ebsql_cursor = e_book_sqlite_cursor_new (
+ ebsql, NULL,
+ sort_fields,
+ sort_types,
+ n_fields,
+ &local_error);
if (ebsql_cursor) {
- cursor = g_object_new (E_TYPE_DATA_BOOK_CURSOR_SQLITE,
- "backend", backend,
- "ebsql", ebsql,
- "revision-key", revision_key,
- "cursor", ebsql_cursor,
- NULL);
+ cursor = g_object_new (
+ E_TYPE_DATA_BOOK_CURSOR_SQLITE,
+ "backend", backend,
+ "ebsql", ebsql,
+ "revision-key", revision_key,
+ "cursor", ebsql_cursor,
+ NULL);
/* Initially created cursors should have a position & total */
if (!e_data_book_cursor_load_locale (E_DATA_BOOK_CURSOR (cursor),
@@ -547,10 +557,11 @@ e_data_book_cursor_sqlite_new (EBookBackend *backend,
} else if (g_error_matches (local_error,
E_BOOK_SQLITE_ERROR,
E_BOOK_SQLITE_ERROR_INVALID_QUERY)) {
- g_set_error_literal (error,
- E_CLIENT_ERROR,
- E_CLIENT_ERROR_INVALID_QUERY,
- local_error->message);
+ g_set_error_literal (
+ error,
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_INVALID_QUERY,
+ local_error->message);
g_clear_error (&local_error);
} else {
g_propagate_error (error, local_error);
diff --git a/addressbook/libedata-book/e-data-book-cursor-sqlite.h
b/addressbook/libedata-book/e-data-book-cursor-sqlite.h
index 22e014a..abe0025 100644
--- a/addressbook/libedata-book/e-data-book-cursor-sqlite.h
+++ b/addressbook/libedata-book/e-data-book-cursor-sqlite.h
@@ -54,7 +54,6 @@ struct _EDataBookCursorSqlite {
EDataBookCursorSqlitePrivate *priv;
};
-
/**
* EDataBookCursorSqliteClass:
*
diff --git a/addressbook/libedata-book/e-data-book-cursor.c b/addressbook/libedata-book/e-data-book-cursor.c
index 341aa48..7cf4e54 100644
--- a/addressbook/libedata-book/e-data-book-cursor.c
+++ b/addressbook/libedata-book/e-data-book-cursor.c
@@ -225,6 +225,10 @@
/* Private D-Bus class. */
#include <e-dbus-address-book-cursor.h>
+#define E_DATA_BOOK_CURSOR_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), E_TYPE_DATA_BOOK_CURSOR, EDataBookCursorPrivate))
+
/* GObjectClass */
static void e_data_book_cursor_constructed (GObject *object);
static void e_data_book_cursor_dispose (GObject *object);
@@ -341,55 +345,54 @@ e_data_book_cursor_class_init (EDataBookCursorClass *class)
static void
e_data_book_cursor_init (EDataBookCursor *cursor)
{
- cursor->priv =
- G_TYPE_INSTANCE_GET_PRIVATE (cursor,
- E_TYPE_DATA_BOOK_CURSOR,
- EDataBookCursorPrivate);
+ cursor->priv = E_DATA_BOOK_CURSOR_GET_PRIVATE (cursor);
}
static void
e_data_book_cursor_constructed (GObject *object)
{
- EDataBookCursor *cursor = E_DATA_BOOK_CURSOR (object);
- GError *error = NULL;
+ EDataBookCursor *cursor = E_DATA_BOOK_CURSOR (object);
+ GError *error = NULL;
- /* Get the initial cursor values */
- if (!e_data_book_cursor_recalculate (cursor, NULL, &error)) {
- g_warning ("Failed to calculate initial cursor position: %s", error->message);
- g_clear_error (&error);
- }
+ /* Get the initial cursor values */
+ if (!e_data_book_cursor_recalculate (cursor, NULL, &error)) {
+ g_warning (
+ "Failed to calculate initial cursor position: %s",
+ error->message);
+ g_clear_error (&error);
+ }
- G_OBJECT_CLASS (e_data_book_cursor_parent_class)->constructed (object);
+ G_OBJECT_CLASS (e_data_book_cursor_parent_class)->constructed (object);
}
static void
e_data_book_cursor_finalize (GObject *object)
{
- EDataBookCursor *cursor = E_DATA_BOOK_CURSOR (object);
- EDataBookCursorPrivate *priv = cursor->priv;
+ EDataBookCursor *cursor = E_DATA_BOOK_CURSOR (object);
+ EDataBookCursorPrivate *priv = cursor->priv;
- g_free (priv->locale);
+ g_free (priv->locale);
- G_OBJECT_CLASS (e_data_book_cursor_parent_class)->finalize (object);
+ G_OBJECT_CLASS (e_data_book_cursor_parent_class)->finalize (object);
}
static void
e_data_book_cursor_dispose (GObject *object)
{
- EDataBookCursor *cursor = E_DATA_BOOK_CURSOR (object);
- EDataBookCursorPrivate *priv = cursor->priv;
+ EDataBookCursor *cursor = E_DATA_BOOK_CURSOR (object);
+ EDataBookCursorPrivate *priv = cursor->priv;
- g_clear_object (&(priv->dbus_object));
- g_clear_object (&(priv->backend));
+ g_clear_object (&(priv->dbus_object));
+ g_clear_object (&(priv->backend));
- G_OBJECT_CLASS (e_data_book_cursor_parent_class)->dispose (object);
+ G_OBJECT_CLASS (e_data_book_cursor_parent_class)->dispose (object);
}
static void
e_data_book_cursor_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
EDataBookCursor *cursor = E_DATA_BOOK_CURSOR (object);
EDataBookCursorPrivate *priv = cursor->priv;
@@ -412,9 +415,9 @@ e_data_book_cursor_get_property (GObject *object,
static void
e_data_book_cursor_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
EDataBookCursor *cursor = E_DATA_BOOK_CURSOR (object);
EDataBookCursorPrivate *priv = cursor->priv;
@@ -435,8 +438,8 @@ e_data_book_cursor_set_property (GObject *object,
************************************************/
static void
data_book_cursor_set_values (EDataBookCursor *cursor,
- gint total,
- gint position)
+ gint total,
+ gint position)
{
EDataBookCursorPrivate *priv;
gboolean changed = FALSE;
@@ -468,15 +471,16 @@ data_book_cursor_set_values (EDataBookCursor *cursor,
}
static gint
-data_book_cursor_compare_contact (EDataBookCursor *cursor,
- EContact *contact,
- gboolean *matches_sexp)
+data_book_cursor_compare_contact (EDataBookCursor *cursor,
+ EContact *contact,
+ gboolean *matches_sexp)
{
gint result;
if (!E_DATA_BOOK_CURSOR_GET_CLASS (cursor)->compare_contact) {
- g_critical ("EDataBookCursor.compare_contact() unimplemented on type '%s'",
- G_OBJECT_TYPE_NAME (cursor));
+ g_critical (
+ "EDataBookCursor.compare_contact() unimplemented on type '%s'",
+ G_OBJECT_TYPE_NAME (cursor));
return 0;
}
@@ -490,10 +494,10 @@ data_book_cursor_compare_contact (EDataBookCursor *cursor,
}
static void
-calculate_step_position (EDataBookCursor *cursor,
- EBookCursorOrigin origin,
- gint count,
- gint results)
+calculate_step_position (EDataBookCursor *cursor,
+ EBookCursorOrigin origin,
+ gint count,
+ gint results)
{
EDataBookCursorPrivate *priv = cursor->priv;
gint new_position = priv->position;
@@ -541,25 +545,20 @@ calculate_step_position (EDataBookCursor *cursor,
************************************************/
static gboolean
data_book_cursor_handle_step (EDBusAddressBookCursor *dbus_object,
- GDBusMethodInvocation *invocation,
- const gchar *revision,
- EBookCursorStepFlags flags,
- EBookCursorOrigin origin,
- gint count,
- EDataBookCursor *cursor)
+ GDBusMethodInvocation *invocation,
+ const gchar *revision,
+ EBookCursorStepFlags flags,
+ EBookCursorOrigin origin,
+ gint count,
+ EDataBookCursor *cursor)
{
GSList *results = NULL;
GError *error = NULL;
gint n_results;
- n_results = e_data_book_cursor_step (cursor,
- revision,
- flags,
- origin,
- count,
- &results,
- NULL,
- &error);
+ n_results = e_data_book_cursor_step (
+ cursor, revision, flags, origin,
+ count, &results, NULL, &error);
if (n_results < 0) {
g_dbus_method_invocation_return_gerror (invocation, error);
@@ -583,15 +582,15 @@ data_book_cursor_handle_step (EDBusAddressBookCursor *dbus_object,
g_slist_free_full (results, g_free);
}
- e_dbus_address_book_cursor_complete_step (dbus_object,
- invocation,
- n_results,
- strv ?
- (const gchar *const *)strv :
- empty_str,
- cursor->priv->total,
- cursor->priv->position);
-
+ e_dbus_address_book_cursor_complete_step (
+ dbus_object,
+ invocation,
+ n_results,
+ strv ?
+ (const gchar *const *) strv :
+ empty_str,
+ cursor->priv->total,
+ cursor->priv->position);
g_strfreev (strv);
}
@@ -601,10 +600,10 @@ data_book_cursor_handle_step (EDBusAddressBookCursor *dbus_object,
static gboolean
data_book_cursor_handle_set_alphabetic_index (EDBusAddressBookCursor *dbus_object,
- GDBusMethodInvocation *invocation,
- gint index,
- const gchar *locale,
- EDataBookCursor *cursor)
+ GDBusMethodInvocation *invocation,
+ gint index,
+ const gchar *locale,
+ EDataBookCursor *cursor)
{
GError *error = NULL;
@@ -616,10 +615,11 @@ data_book_cursor_handle_set_alphabetic_index (EDBusAddressBookCursor *dbus_objec
g_dbus_method_invocation_return_gerror (invocation, error);
g_clear_error (&error);
} else {
- e_dbus_address_book_cursor_complete_set_alphabetic_index (dbus_object,
- invocation,
- cursor->priv->total,
- cursor->priv->position);
+ e_dbus_address_book_cursor_complete_set_alphabetic_index (
+ dbus_object,
+ invocation,
+ cursor->priv->total,
+ cursor->priv->position);
}
return TRUE;
@@ -627,9 +627,9 @@ data_book_cursor_handle_set_alphabetic_index (EDBusAddressBookCursor *dbus_objec
static gboolean
data_book_cursor_handle_set_query (EDBusAddressBookCursor *dbus_object,
- GDBusMethodInvocation *invocation,
- const gchar *query,
- EDataBookCursor *cursor)
+ GDBusMethodInvocation *invocation,
+ const gchar *query,
+ EDataBookCursor *cursor)
{
GError *error = NULL;
@@ -637,10 +637,11 @@ data_book_cursor_handle_set_query (EDBusAddressBookCursor *dbus_object,
g_dbus_method_invocation_return_gerror (invocation, error);
g_clear_error (&error);
} else {
- e_dbus_address_book_cursor_complete_set_query (dbus_object,
- invocation,
- cursor->priv->total,
- cursor->priv->position);
+ e_dbus_address_book_cursor_complete_set_query (
+ dbus_object,
+ invocation,
+ cursor->priv->total,
+ cursor->priv->position);
}
return TRUE;
@@ -648,8 +649,8 @@ data_book_cursor_handle_set_query (EDBusAddressBookCursor *dbus_object,
static gboolean
data_book_cursor_handle_dispose (EDBusAddressBookCursor *dbus_object,
- GDBusMethodInvocation *invocation,
- EDataBookCursor *cursor)
+ GDBusMethodInvocation *invocation,
+ EDataBookCursor *cursor)
{
EDataBookCursorPrivate *priv = cursor->priv;
GError *error = NULL;
@@ -697,7 +698,6 @@ e_data_book_cursor_get_backend (EDataBookCursor *cursor)
return cursor->priv->backend;
}
-
/**
* e_data_book_cursor_get_total:
* @cursor: an #EDataBookCursor
@@ -734,7 +734,6 @@ e_data_book_cursor_get_position (EDataBookCursor *cursor)
return cursor->priv->position;
}
-
/**
* e_data_book_cursor_set_sexp:
* @cursor: an #EDataBookCursor
@@ -749,10 +748,10 @@ e_data_book_cursor_get_position (EDataBookCursor *cursor)
* Since: 3.12
*/
gboolean
-e_data_book_cursor_set_sexp (EDataBookCursor *cursor,
- const gchar *sexp,
- GCancellable *cancellable,
- GError **error)
+e_data_book_cursor_set_sexp (EDataBookCursor *cursor,
+ const gchar *sexp,
+ GCancellable *cancellable,
+ GError **error)
{
GError *local_error = NULL;
gboolean success = FALSE;
@@ -767,10 +766,11 @@ e_data_book_cursor_set_sexp (EDataBookCursor *cursor,
error);
} else {
- g_set_error_literal (error,
- E_CLIENT_ERROR,
- E_CLIENT_ERROR_NOT_SUPPORTED,
- _("Cursor does not support setting the search expression"));
+ g_set_error_literal (
+ error,
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_NOT_SUPPORTED,
+ _("Cursor does not support setting the search expression"));
}
/* We already set the new search expression,
@@ -778,9 +778,10 @@ e_data_book_cursor_set_sexp (EDataBookCursor *cursor,
*/
if (success &&
!e_data_book_cursor_recalculate (cursor, cancellable, &local_error)) {
- g_warning ("Failed to recalculate the cursor value "
- "after setting the search expression: %s",
- local_error->message);
+ g_warning (
+ "Failed to recalculate the cursor value "
+ "after setting the search expression: %s",
+ local_error->message);
g_clear_error (&local_error);
}
@@ -832,14 +833,14 @@ e_data_book_cursor_set_sexp (EDataBookCursor *cursor,
* Since: 3.12
*/
gint
-e_data_book_cursor_step (EDataBookCursor *cursor,
- const gchar *revision_guard,
- EBookCursorStepFlags flags,
- EBookCursorOrigin origin,
- gint count,
- GSList **results,
- GCancellable *cancellable,
- GError **error)
+e_data_book_cursor_step (EDataBookCursor *cursor,
+ const gchar *revision_guard,
+ EBookCursorStepFlags flags,
+ EBookCursorOrigin origin,
+ gint count,
+ GSList **results,
+ GCancellable *cancellable,
+ GError **error)
{
gint retval;
@@ -848,10 +849,11 @@ e_data_book_cursor_step (EDataBookCursor *cursor,
(results != NULL && *results == NULL), -1);
if (!E_DATA_BOOK_CURSOR_GET_CLASS (cursor)->step) {
- g_set_error_literal (error,
- E_CLIENT_ERROR,
- E_CLIENT_ERROR_NOT_SUPPORTED,
- _("Cursor does not support step"));
+ g_set_error_literal (
+ error,
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_NOT_SUPPORTED,
+ _("Cursor does not support step"));
return FALSE;
}
@@ -901,11 +903,11 @@ e_data_book_cursor_step (EDataBookCursor *cursor,
* Since: 3.12
*/
gboolean
-e_data_book_cursor_set_alphabetic_index (EDataBookCursor *cursor,
- gint index,
- const gchar *locale,
- GCancellable *cancellable,
- GError **error)
+e_data_book_cursor_set_alphabetic_index (EDataBookCursor *cursor,
+ gint index,
+ const gchar *locale,
+ GCancellable *cancellable,
+ GError **error)
{
GError *local_error = NULL;
gboolean success;
@@ -922,17 +924,19 @@ e_data_book_cursor_set_alphabetic_index (EDataBookCursor *cursor,
/* We already set the new cursor value, we can't fail anymore so just fire a warning */
if (!e_data_book_cursor_recalculate (cursor, cancellable, &local_error)) {
- g_warning ("Failed to recalculate the cursor value "
- "after setting the alphabetic index: %s",
- local_error->message);
+ g_warning (
+ "Failed to recalculate the cursor value "
+ "after setting the alphabetic index: %s",
+ local_error->message);
g_clear_error (&local_error);
}
} else {
- g_set_error_literal (error,
- E_CLIENT_ERROR,
- E_CLIENT_ERROR_NOT_SUPPORTED,
- _("Cursor does not support alphabetic indexes"));
+ g_set_error_literal (
+ error,
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_NOT_SUPPORTED,
+ _("Cursor does not support alphabetic indexes"));
success = FALSE;
}
@@ -957,9 +961,9 @@ e_data_book_cursor_set_alphabetic_index (EDataBookCursor *cursor,
* Since: 3.12
*/
gboolean
-e_data_book_cursor_recalculate (EDataBookCursor *cursor,
- GCancellable *cancellable,
- GError **error)
+e_data_book_cursor_recalculate (EDataBookCursor *cursor,
+ GCancellable *cancellable,
+ GError **error)
{
gint total = 0;
gint position = 0;
@@ -969,14 +973,15 @@ e_data_book_cursor_recalculate (EDataBookCursor *cursor,
/* Bad programming error */
if (!E_DATA_BOOK_CURSOR_GET_CLASS (cursor)->get_position) {
- g_critical ("EDataBookCursor.get_position() unimplemented on type '%s'",
- G_OBJECT_TYPE_NAME (cursor));
+ g_critical (
+ "EDataBookCursor.get_position() unimplemented on type '%s'",
+ G_OBJECT_TYPE_NAME (cursor));
return FALSE;
}
g_object_ref (cursor);
- success = (* E_DATA_BOOK_CURSOR_GET_CLASS (cursor)->get_position) (cursor,
+ success = (* E_DATA_BOOK_CURSOR_GET_CLASS (cursor)->get_position) (cursor,
&total,
&position,
cancellable,
@@ -1008,10 +1013,10 @@ e_data_book_cursor_recalculate (EDataBookCursor *cursor,
* Since: 3.12
*/
gboolean
-e_data_book_cursor_load_locale (EDataBookCursor *cursor,
- gchar **locale,
- GCancellable *cancellable,
- GError **error)
+e_data_book_cursor_load_locale (EDataBookCursor *cursor,
+ gchar **locale,
+ GCancellable *cancellable,
+ GError **error)
{
EDataBookCursorPrivate *priv;
gboolean success;
@@ -1022,8 +1027,9 @@ e_data_book_cursor_load_locale (EDataBookCursor *cursor,
priv = cursor->priv;
if (!E_DATA_BOOK_CURSOR_GET_CLASS (cursor)->load_locale) {
- g_critical ("EDataBookCursor.load_locale() unimplemented on type '%s'",
- G_OBJECT_TYPE_NAME (cursor));
+ g_critical (
+ "EDataBookCursor.load_locale() unimplemented on type '%s'",
+ G_OBJECT_TYPE_NAME (cursor));
return FALSE;
}
@@ -1042,13 +1048,15 @@ e_data_book_cursor_load_locale (EDataBookCursor *cursor,
E_BOOK_CURSOR_STEP_MOVE,
E_BOOK_CURSOR_ORIGIN_BEGIN,
0, NULL, cancellable, &local_error) < 0) {
- g_warning ("Error resetting cursor position after locale change: %s",
- local_error->message);
+ g_warning (
+ "Error resetting cursor position after locale change: %s",
+ local_error->message);
g_clear_error (&local_error);
} else if (!e_data_book_cursor_recalculate (E_DATA_BOOK_CURSOR (cursor),
cancellable, &local_error)) {
- g_warning ("Error recalculating cursor position after locale change: %s",
- local_error->message);
+ g_warning (
+ "Error recalculating cursor position after locale change: %s",
+ local_error->message);
g_clear_error (&local_error);
}
}
@@ -1072,8 +1080,8 @@ e_data_book_cursor_load_locale (EDataBookCursor *cursor,
* Since: 3.12
*/
void
-e_data_book_cursor_contact_added (EDataBookCursor *cursor,
- EContact *contact)
+e_data_book_cursor_contact_added (EDataBookCursor *cursor,
+ EContact *contact)
{
EDataBookCursorPrivate *priv;
gint comparison = 0;
@@ -1118,8 +1126,8 @@ e_data_book_cursor_contact_added (EDataBookCursor *cursor,
* Since: 3.12
*/
void
-e_data_book_cursor_contact_removed (EDataBookCursor *cursor,
- EContact *contact)
+e_data_book_cursor_contact_removed (EDataBookCursor *cursor,
+ EContact *contact)
{
EDataBookCursorPrivate *priv;
gint comparison = 0;
@@ -1167,10 +1175,10 @@ e_data_book_cursor_contact_removed (EDataBookCursor *cursor,
* Since: 3.12
*/
gboolean
-e_data_book_cursor_register_gdbus_object (EDataBookCursor *cursor,
- GDBusConnection *connection,
- const gchar *object_path,
- GError **error)
+e_data_book_cursor_register_gdbus_object (EDataBookCursor *cursor,
+ GDBusConnection *connection,
+ const gchar *object_path,
+ GError **error)
{
EDataBookCursorPrivate *priv;
@@ -1183,15 +1191,18 @@ e_data_book_cursor_register_gdbus_object (EDataBookCursor *cursor,
if (!priv->dbus_object) {
priv->dbus_object = e_dbus_address_book_cursor_skeleton_new ();
- g_signal_connect (priv->dbus_object, "handle-step",
- G_CALLBACK (data_book_cursor_handle_step), cursor);
- g_signal_connect (priv->dbus_object, "handle-set-alphabetic-index",
- G_CALLBACK (data_book_cursor_handle_set_alphabetic_index), cursor);
- g_signal_connect (priv->dbus_object, "handle-set-query",
- G_CALLBACK (data_book_cursor_handle_set_query), cursor);
- g_signal_connect (priv->dbus_object, "handle-dispose",
- G_CALLBACK (data_book_cursor_handle_dispose), cursor);
-
+ g_signal_connect (
+ priv->dbus_object, "handle-step",
+ G_CALLBACK (data_book_cursor_handle_step), cursor);
+ g_signal_connect (
+ priv->dbus_object, "handle-set-alphabetic-index",
+ G_CALLBACK (data_book_cursor_handle_set_alphabetic_index), cursor);
+ g_signal_connect (
+ priv->dbus_object, "handle-set-query",
+ G_CALLBACK (data_book_cursor_handle_set_query), cursor);
+ g_signal_connect (
+ priv->dbus_object, "handle-dispose",
+ G_CALLBACK (data_book_cursor_handle_dispose), cursor);
/* Set initial total / position */
e_dbus_address_book_cursor_set_total (priv->dbus_object, priv->total);
diff --git a/addressbook/libedata-book/e-data-book-cursor.h b/addressbook/libedata-book/e-data-book-cursor.h
index 6836411..c12ee6d 100644
--- a/addressbook/libedata-book/e-data-book-cursor.h
+++ b/addressbook/libedata-book/e-data-book-cursor.h
@@ -43,7 +43,6 @@ typedef struct _EDataBookCursor EDataBookCursor;
typedef struct _EDataBookCursorClass EDataBookCursorClass;
typedef struct _EDataBookCursorPrivate EDataBookCursorPrivate;
-
/*
* The following virtual methods have typedefs in order to provide richer
* documentation about how to implement the EDataBookCursorClass.
diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c
index ba221d8..18213a3 100644
--- a/addressbook/libedata-book/e-data-book-factory.c
+++ b/addressbook/libedata-book/e-data-book-factory.c
@@ -340,7 +340,7 @@ data_book_factory_list_books (EDataBookFactory *factory)
g_hash_table_iter_init (&iter, connections);
while (g_hash_table_iter_next (&iter, &key, &value)) {
- GPtrArray *array = (GPtrArray *)value;
+ GPtrArray *array = (GPtrArray *) value;
gint i;
for (i = 0; i < array->len; i++) {
@@ -433,9 +433,10 @@ data_book_factory_open (EDataBookFactory *factory,
* yet received a notification of a locale change
*/
if (factory->priv->locale)
- e_data_book_set_locale (data_book,
- factory->priv->locale,
- NULL, NULL);
+ e_data_book_set_locale (
+ data_book,
+ factory->priv->locale,
+ NULL, NULL);
} else {
g_free (object_path);
object_path = NULL;
@@ -657,13 +658,13 @@ data_book_factory_interpret_locale (const gchar * const * locale)
if (locale) {
for (i = 0; locale[i] != NULL && interpreted_locale == NULL; i++) {
if (strncmp (locale[i], "LC_COLLATE", 10) == 0)
- interpreted_locale =
+ interpreted_locale =
data_book_factory_interpret_locale_value (locale[i]);
}
for (i = 0; locale[i] != NULL && interpreted_locale == NULL; i++) {
if (strncmp (locale[i], "LANG", 4) == 0)
- interpreted_locale =
+ interpreted_locale =
data_book_factory_interpret_locale_value (locale[i]);
}
}
@@ -679,7 +680,7 @@ data_book_factory_interpret_locale (const gchar * const * locale)
static void
data_book_factory_set_locale (EDataBookFactory *factory,
- const gchar *locale)
+ const gchar *locale)
{
EDataBookFactoryPrivate *priv = factory->priv;
GError *error = NULL;
@@ -695,8 +696,9 @@ data_book_factory_set_locale (EDataBookFactory *factory,
EDataBook *book = l->data;
if (!e_data_book_set_locale (book, locale, NULL, &error)) {
- g_warning ("Failed to set locale on addressbook: %s",
- error->message);
+ g_warning (
+ "Failed to set locale on addressbook: %s",
+ error->message);
g_clear_error (&error);
}
}
@@ -706,11 +708,11 @@ data_book_factory_set_locale (EDataBookFactory *factory,
static void
data_book_factory_locale_changed (GObject *object,
- GParamSpec *pspec,
- gpointer user_data)
+ GParamSpec *pspec,
+ gpointer user_data)
{
EDBusLocale1 *locale_proxy = E_DBUS_LOCALE1 (object);
- EDataBookFactory *factory = (EDataBookFactory *)user_data;
+ EDataBookFactory *factory = (EDataBookFactory *) user_data;
const gchar * const *locale;
gchar *interpreted_locale;
@@ -724,10 +726,10 @@ data_book_factory_locale_changed (GObject *object,
static void
data_book_factory_localed_ready (GObject *source_object,
- GAsyncResult *res,
- gpointer user_data)
+ GAsyncResult *res,
+ gpointer user_data)
{
- EDataBookFactory *factory = (EDataBookFactory *)user_data;
+ EDataBookFactory *factory = (EDataBookFactory *) user_data;
GError *error = NULL;
factory->priv->localed_proxy = e_dbus_locale1_proxy_new_finish (res, &error);
@@ -743,8 +745,9 @@ data_book_factory_localed_ready (GObject *source_object,
}
if (factory->priv->localed_proxy) {
- g_signal_connect (factory->priv->localed_proxy, "notify::locale",
- G_CALLBACK (data_book_factory_locale_changed), factory);
+ g_signal_connect (
+ factory->priv->localed_proxy, "notify::locale",
+ G_CALLBACK (data_book_factory_locale_changed), factory);
/* Initial refresh of the locale */
data_book_factory_locale_changed (G_OBJECT (factory->priv->localed_proxy), NULL, factory);
@@ -753,29 +756,30 @@ data_book_factory_localed_ready (GObject *source_object,
static void
data_book_factory_localed_appeared (GDBusConnection *connection,
- const gchar *name,
- const gchar *name_owner,
- gpointer user_data)
+ const gchar *name,
+ const gchar *name_owner,
+ gpointer user_data)
{
- EDataBookFactory *factory = (EDataBookFactory *)user_data;
+ EDataBookFactory *factory = (EDataBookFactory *) user_data;
factory->priv->localed_cancel = g_cancellable_new ();
- e_dbus_locale1_proxy_new (connection,
- G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
- "org.freedesktop.locale1",
- "/org/freedesktop/locale1",
- factory->priv->localed_cancel,
- data_book_factory_localed_ready,
- factory);
+ e_dbus_locale1_proxy_new (
+ connection,
+ G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
+ "org.freedesktop.locale1",
+ "/org/freedesktop/locale1",
+ factory->priv->localed_cancel,
+ data_book_factory_localed_ready,
+ factory);
}
static void
data_book_factory_localed_vanished (GDBusConnection *connection,
- const gchar *name,
- gpointer user_data)
+ const gchar *name,
+ gpointer user_data)
{
- EDataBookFactory *factory = (EDataBookFactory *)user_data;
+ EDataBookFactory *factory = (EDataBookFactory *) user_data;
if (factory->priv->localed_cancel) {
g_cancellable_cancel (factory->priv->localed_cancel);
@@ -809,13 +813,14 @@ data_book_factory_initable_init (GInitable *initable,
/* Watch system bus for locale change notifications */
priv->localed_watch_id =
- g_bus_watch_name (bus_type,
- "org.freedesktop.locale1",
- G_BUS_NAME_WATCHER_FLAGS_NONE,
- data_book_factory_localed_appeared,
- data_book_factory_localed_vanished,
- initable,
- NULL);
+ g_bus_watch_name (
+ bus_type,
+ "org.freedesktop.locale1",
+ G_BUS_NAME_WATCHER_FLAGS_NONE,
+ data_book_factory_localed_appeared,
+ data_book_factory_localed_vanished,
+ initable,
+ NULL);
return (priv->registry != NULL);
}
diff --git a/addressbook/libedata-book/e-data-book-factory.h b/addressbook/libedata-book/e-data-book-factory.h
index 48b777e..0df3d59 100644
--- a/addressbook/libedata-book/e-data-book-factory.h
+++ b/addressbook/libedata-book/e-data-book-factory.h
@@ -52,7 +52,7 @@
* This environment variable configures where the address book
* factory loads it's backend modules from.
*/
-#define EDS_ADDRESS_BOOK_MODULES "EDS_ADDRESS_BOOK_MODULES"
+#define EDS_ADDRESS_BOOK_MODULES "EDS_ADDRESS_BOOK_MODULES"
G_BEGIN_DECLS
diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c
index 2d9eebd..b2f4e1a 100644
--- a/addressbook/libedata-book/e-data-book.c
+++ b/addressbook/libedata-book/e-data-book.c
@@ -1064,11 +1064,11 @@ data_book_handle_get_view_cb (EDBusAddressBook *interface,
static gboolean
data_book_interpret_sort_keys (const gchar * const *in_sort_keys,
- const gchar * const *in_sort_types,
- EContactField **out_sort_keys,
- EBookCursorSortType **out_sort_types,
- gint *n_fields,
- GError **error)
+ const gchar * const *in_sort_types,
+ EContactField **out_sort_keys,
+ EBookCursorSortType **out_sort_types,
+ gint *n_fields,
+ GError **error)
{
gint i, key_count = 0, type_count = 0;
EContactField *sort_keys;
@@ -1076,10 +1076,11 @@ data_book_interpret_sort_keys (const gchar * const *in_sort_keys,
gboolean success = TRUE;
if (!in_sort_keys || !in_sort_types) {
- g_set_error (error,
- E_CLIENT_ERROR,
- E_CLIENT_ERROR_INVALID_ARG,
- "Missing sort keys while trying to create a Cursor");
+ g_set_error (
+ error,
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_INVALID_ARG,
+ "Missing sort keys while trying to create a Cursor");
return FALSE;
}
@@ -1089,10 +1090,11 @@ data_book_interpret_sort_keys (const gchar * const *in_sort_keys,
type_count++;
if (key_count != type_count) {
- g_set_error (error,
- E_CLIENT_ERROR,
- E_CLIENT_ERROR_INVALID_ARG,
- "Must specify the same amount of sort keys as sort types while creating a
Cursor");
+ g_set_error (
+ error,
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_INVALID_ARG,
+ "Must specify the same amount of sort keys as sort types while creating a Cursor");
return FALSE;
}
@@ -1104,11 +1106,12 @@ data_book_interpret_sort_keys (const gchar * const *in_sort_keys,
sort_keys[i] = e_contact_field_id (in_sort_keys[i]);
if (sort_keys[i] == 0) {
- g_set_error (error,
- E_CLIENT_ERROR,
- E_CLIENT_ERROR_INVALID_ARG,
- "Invalid sort key '%s' specified when creating a Cursor",
- in_sort_keys[i]);
+ g_set_error (
+ error,
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_INVALID_ARG,
+ "Invalid sort key '%s' specified when creating a Cursor",
+ in_sort_keys[i]);
success = FALSE;
}
}
@@ -1119,11 +1122,12 @@ data_book_interpret_sort_keys (const gchar * const *in_sort_keys,
if (!e_enum_from_string (E_TYPE_BOOK_CURSOR_SORT_TYPE,
in_sort_types[i],
&enum_value)) {
- g_set_error (error,
- E_CLIENT_ERROR,
- E_CLIENT_ERROR_INVALID_ARG,
- "Invalid sort type '%s' specified when creating a Cursor",
- in_sort_types[i]);
+ g_set_error (
+ error,
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_INVALID_ARG,
+ "Invalid sort type '%s' specified when creating a Cursor",
+ in_sort_types[i]);
success = FALSE;
}
@@ -1144,11 +1148,11 @@ data_book_interpret_sort_keys (const gchar * const *in_sort_keys,
static gboolean
data_book_handle_get_cursor_cb (EDBusAddressBook *interface,
- GDBusMethodInvocation *invocation,
- const gchar *in_query,
- const gchar * const *in_sort_keys,
- const gchar * const *in_sort_types,
- EDataBook *data_book)
+ GDBusMethodInvocation *invocation,
+ const gchar *in_query,
+ const gchar * const *in_sort_keys,
+ const gchar * const *in_sort_types,
+ EDataBook *data_book)
{
EBookBackend *backend;
EDataBookCursor *cursor;
@@ -1179,11 +1183,8 @@ data_book_handle_get_cursor_cb (EDBusAddressBook *interface,
/*
* Create cursor
*/
- cursor = e_book_backend_create_cursor (backend,
- sort_keys,
- sort_types,
- n_fields,
- &error);
+ cursor = e_book_backend_create_cursor (
+ backend, sort_keys, sort_types, n_fields, &error);
g_free (sort_keys);
g_free (sort_types);
@@ -1221,9 +1222,8 @@ data_book_handle_get_cursor_cb (EDBusAddressBook *interface,
/*
* All is good in the hood, complete the method call
*/
- e_dbus_address_book_complete_get_cursor (interface,
- invocation,
- object_path);
+ e_dbus_address_book_complete_get_cursor (
+ interface, invocation, object_path);
g_free (object_path);
g_object_unref (backend);
return TRUE;
@@ -1861,8 +1861,9 @@ data_book_constructed (GObject *object)
/* Initialize the locale to the value reported by setlocale() until
* systemd says otherwise.
*/
- e_dbus_address_book_set_locale (book->priv->dbus_interface,
- setlocale (LC_COLLATE, NULL));
+ e_dbus_address_book_set_locale (
+ book->priv->dbus_interface,
+ setlocale (LC_COLLATE, NULL));
g_object_unref (backend);
}
@@ -2149,9 +2150,9 @@ e_data_book_get_object_path (EDataBook *book)
*/
gboolean
e_data_book_set_locale (EDataBook *book,
- const gchar *locale,
- GCancellable *cancellable,
- GError **error)
+ const gchar *locale,
+ GCancellable *cancellable,
+ GError **error)
{
EBookBackend *backend;
gboolean success;
@@ -2159,13 +2160,12 @@ e_data_book_set_locale (EDataBook *book,
g_return_val_if_fail (E_IS_DATA_BOOK (book), FALSE);
backend = e_data_book_ref_backend (book);
- success = e_book_backend_set_locale (backend,
- locale,
- cancellable,
- error);
+ success = e_book_backend_set_locale (
+ backend, locale, cancellable, error);
if (success)
- e_dbus_address_book_set_locale (book->priv->dbus_interface, locale);
+ e_dbus_address_book_set_locale (
+ book->priv->dbus_interface, locale);
g_object_unref (backend);
diff --git a/addressbook/libedata-book/e-data-book.h b/addressbook/libedata-book/e-data-book.h
index bd4070a..204904e 100644
--- a/addressbook/libedata-book/e-data-book.h
+++ b/addressbook/libedata-book/e-data-book.h
@@ -90,7 +90,7 @@ GDBusConnection *
e_data_book_get_connection (EDataBook *book);
const gchar * e_data_book_get_object_path (EDataBook *book);
-gboolean e_data_book_set_locale (EDataBook *book,
+gboolean e_data_book_set_locale (EDataBook *book,
const gchar *locale,
GCancellable *cancellable,
GError **error);
@@ -140,7 +140,6 @@ void e_data_book_report_backend_property_changed
gchar * e_data_book_string_slist_to_comma_string
(const GSList *strings);
-
G_END_DECLS
#endif /* E_DATA_BOOK_H */
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index e9c638d..e058eec 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -412,7 +412,7 @@ ecalcomp_get_href (ECalComponent *comp)
icomp = e_cal_component_get_icalcomponent (comp);
g_return_val_if_fail (icomp != NULL, NULL);
- str = icomp_x_prop_get (icomp, X_E_CALDAV "HREF");
+ str = icomp_x_prop_get (icomp, X_E_CALDAV "HREF");
return str;
}
@@ -440,7 +440,7 @@ ecalcomp_get_etag (ECalComponent *comp)
icomp = e_cal_component_get_icalcomponent (comp);
g_return_val_if_fail (icomp != NULL, NULL);
- str = icomp_x_prop_get (icomp, X_E_CALDAV "ETAG");
+ str = icomp_x_prop_get (icomp, X_E_CALDAV "ETAG");
/* libical 0.48 escapes quotes, thus unescape them */
if (str && strchr (str, '\\')) {
@@ -2251,8 +2251,8 @@ free_comp_list (gpointer cclist)
g_free (ccl);
}
-#define etags_match(_tag1, _tag2) ((_tag1 == _tag2) ? TRUE : \
- g_str_equal (_tag1 != NULL ? _tag1 : "", \
+#define etags_match(_tag1, _tag2) ((_tag1 == _tag2) ? TRUE : \
+ g_str_equal (_tag1 != NULL ? _tag1 : "", \
_tag2 != NULL ? _tag2 : ""))
/* start_time/end_time is an interval for checking changes. If both greater than zero,
@@ -2276,8 +2276,8 @@ synchronize_cache (ECalBackendCalDAV *cbdav,
return;
}
- len = 0;
- sobjs = NULL;
+ len = 0;
+ sobjs = NULL;
/* get list of server objects */
if (!caldav_server_list_objects (cbdav, &sobjs, &len, NULL, start_time, end_time))
@@ -4018,8 +4018,8 @@ do_create_objects (ECalBackendCalDAV *cbdav,
if (online) {
CalDAVObject object;
- object.href = ecalcomp_gen_href (comp);
- object.etag = NULL;
+ object.href = ecalcomp_gen_href (comp);
+ object.etag = NULL;
object.cdata = pack_cobj (cbdav, icalcomp);
did_put = caldav_server_put_object (cbdav, &object, icalcomp, cancellable, perror);
@@ -4191,8 +4191,8 @@ do_modify_objects (ECalBackendCalDAV *cbdav,
if (online) {
CalDAVObject object;
- object.href = href;
- object.etag = etag;
+ object.href = href;
+ object.etag = etag;
object.cdata = pack_cobj (cbdav, cache_comp);
did_put = caldav_server_put_object (cbdav, &object, cache_comp, cancellable, error);
@@ -4302,8 +4302,8 @@ do_remove_objects (ECalBackendCalDAV *cbdav,
if (online) {
CalDAVObject caldav_object;
- caldav_object.href = href;
- caldav_object.etag = etag;
+ caldav_object.href = href;
+ caldav_object.etag = etag;
caldav_object.cdata = NULL;
if (mod == E_CAL_OBJ_MOD_THIS && rid && *rid) {
@@ -4600,34 +4600,34 @@ do_receive_objects (ECalBackendSync *backend,
g_propagate_error (perror, err);
}
-#define caldav_busy_stub(_func_name, _params, _call_func, _call_params) \
-static void \
-_func_name _params \
-{ \
- ECalBackendCalDAV *cbdav; \
- SlaveCommand old_slave_cmd; \
- gboolean was_slave_busy; \
- \
- cbdav = E_CAL_BACKEND_CALDAV (backend); \
- \
- /* this is done before locking */ \
- old_slave_cmd = cbdav->priv->slave_cmd; \
- was_slave_busy = cbdav->priv->slave_busy; \
- if (was_slave_busy) { \
- /* let it pause its work and do our job */ \
- update_slave_cmd (cbdav->priv, SLAVE_SHOULD_SLEEP); \
- } \
- \
- g_mutex_lock (&cbdav->priv->busy_lock); \
- _call_func _call_params; \
- \
- /* this is done before unlocking */ \
- if (was_slave_busy) { \
- update_slave_cmd (cbdav->priv, old_slave_cmd); \
- g_cond_signal (&cbdav->priv->cond); \
- } \
- \
- g_mutex_unlock (&cbdav->priv->busy_lock); \
+#define caldav_busy_stub(_func_name, _params, _call_func, _call_params) \
+static void \
+_func_name _params \
+{ \
+ ECalBackendCalDAV *cbdav; \
+ SlaveCommand old_slave_cmd; \
+ gboolean was_slave_busy; \
+ \
+ cbdav = E_CAL_BACKEND_CALDAV (backend); \
+ \
+ /* this is done before locking */ \
+ old_slave_cmd = cbdav->priv->slave_cmd; \
+ was_slave_busy = cbdav->priv->slave_busy; \
+ if (was_slave_busy) { \
+ /* let it pause its work and do our job */ \
+ update_slave_cmd (cbdav->priv, SLAVE_SHOULD_SLEEP); \
+ } \
+ \
+ g_mutex_lock (&cbdav->priv->busy_lock); \
+ _call_func _call_params; \
+ \
+ /* this is done before unlocking */ \
+ if (was_slave_busy) { \
+ update_slave_cmd (cbdav->priv, old_slave_cmd); \
+ g_cond_signal (&cbdav->priv->cond); \
+ } \
+ \
+ g_mutex_unlock (&cbdav->priv->busy_lock); \
}
caldav_busy_stub (
@@ -5269,7 +5269,7 @@ e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav)
if (G_UNLIKELY (caldav_debug_show (DEBUG_MESSAGE)))
caldav_debug_setup (cbdav->priv->session);
- cbdav->priv->loaded = FALSE;
+ cbdav->priv->loaded = FALSE;
cbdav->priv->opened = FALSE;
/* Thinks the 'getctag' extension is available the first time, but unset it when realizes it isn't. */
@@ -5313,26 +5313,26 @@ e_cal_backend_caldav_class_init (ECalBackendCalDAVClass *class)
parent_class = (ECalBackendSyncClass *) g_type_class_peek_parent (class);
g_type_class_add_private (class, sizeof (ECalBackendCalDAVPrivate));
- object_class->dispose = e_cal_backend_caldav_dispose;
+ object_class->dispose = e_cal_backend_caldav_dispose;
object_class->finalize = e_cal_backend_caldav_finalize;
object_class->constructed = cal_backend_caldav_constructed;
backend_class->get_backend_property = caldav_get_backend_property;
backend_class->shutdown = caldav_shutdown;
- sync_class->open_sync = caldav_do_open;
- sync_class->refresh_sync = caldav_refresh;
+ sync_class->open_sync = caldav_do_open;
+ sync_class->refresh_sync = caldav_refresh;
- sync_class->create_objects_sync = caldav_create_objects;
- sync_class->modify_objects_sync = caldav_modify_objects;
- sync_class->remove_objects_sync = caldav_remove_objects;
+ sync_class->create_objects_sync = caldav_create_objects;
+ sync_class->modify_objects_sync = caldav_modify_objects;
+ sync_class->remove_objects_sync = caldav_remove_objects;
- sync_class->receive_objects_sync = caldav_receive_objects;
- sync_class->send_objects_sync = caldav_send_objects;
- sync_class->get_object_sync = caldav_get_object;
- sync_class->get_object_list_sync = caldav_get_object_list;
- sync_class->add_timezone_sync = caldav_add_timezone;
- sync_class->get_free_busy_sync = caldav_get_free_busy;
+ sync_class->receive_objects_sync = caldav_receive_objects;
+ sync_class->send_objects_sync = caldav_send_objects;
+ sync_class->get_object_sync = caldav_get_object;
+ sync_class->get_object_list_sync = caldav_get_object_list;
+ sync_class->add_timezone_sync = caldav_add_timezone;
+ sync_class->get_free_busy_sync = caldav_get_free_busy;
- backend_class->start_view = caldav_start_view;
+ backend_class->start_view = caldav_start_view;
}
diff --git a/calendar/backends/contacts/e-cal-backend-contacts.c
b/calendar/backends/contacts/e-cal-backend-contacts.c
index 0f8a5c1..1c33208 100644
--- a/calendar/backends/contacts/e-cal-backend-contacts.c
+++ b/calendar/backends/contacts/e-cal-backend-contacts.c
@@ -265,9 +265,10 @@ book_record_get_view_thread (gpointer user_data)
br->book_client, query_sexp, &book_view, NULL, &error)) {
if (!error)
- error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
/* Sanity check. */
@@ -1362,16 +1363,16 @@ e_cal_backend_contacts_class_init (ECalBackendContactsClass *class)
backend_class->get_backend_property = e_cal_backend_contacts_get_backend_property;
- sync_class->open_sync = e_cal_backend_contacts_open;
- sync_class->create_objects_sync = e_cal_backend_contacts_create_objects;
- sync_class->receive_objects_sync = e_cal_backend_contacts_receive_objects;
- sync_class->send_objects_sync = e_cal_backend_contacts_send_objects;
- sync_class->get_object_sync = e_cal_backend_contacts_get_object;
- sync_class->get_object_list_sync = e_cal_backend_contacts_get_object_list;
- sync_class->add_timezone_sync = e_cal_backend_contacts_add_timezone;
- sync_class->get_free_busy_sync = e_cal_backend_contacts_get_free_busy;
+ sync_class->open_sync = e_cal_backend_contacts_open;
+ sync_class->create_objects_sync = e_cal_backend_contacts_create_objects;
+ sync_class->receive_objects_sync = e_cal_backend_contacts_receive_objects;
+ sync_class->send_objects_sync = e_cal_backend_contacts_send_objects;
+ sync_class->get_object_sync = e_cal_backend_contacts_get_object;
+ sync_class->get_object_list_sync = e_cal_backend_contacts_get_object_list;
+ sync_class->add_timezone_sync = e_cal_backend_contacts_add_timezone;
+ sync_class->get_free_busy_sync = e_cal_backend_contacts_get_free_busy;
- backend_class->start_view = e_cal_backend_contacts_start_view;
+ backend_class->start_view = e_cal_backend_contacts_start_view;
/* Register our ESource extension. */
E_TYPE_SOURCE_CONTACTS;
diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index bb68093..b65ffab 100644
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -448,7 +448,7 @@ static void
bump_revision (ECalBackendFile *cbfile)
{
/* Update the revision string */
- icalproperty *prop = ensure_revision (cbfile);
+ icalproperty *prop = ensure_revision (cbfile);
gchar *revision = make_revision_string (cbfile);
icalproperty_set_x (prop, revision);
@@ -1696,7 +1696,7 @@ e_cal_backend_file_get_object_list (ECalBackendSync *backend,
&occur_start,
&occur_end);
- objs_occuring_in_tw = NULL;
+ objs_occuring_in_tw = NULL;
if (!prunning_by_time) {
g_hash_table_foreach (priv->comp_uid_hash, (GHFunc) match_object_sexp,
@@ -3545,19 +3545,19 @@ e_cal_backend_file_class_init (ECalBackendFileClass *class)
backend_class->get_backend_property = e_cal_backend_file_get_backend_property;
- sync_class->open_sync = e_cal_backend_file_open;
- sync_class->create_objects_sync = e_cal_backend_file_create_objects;
- sync_class->modify_objects_sync = e_cal_backend_file_modify_objects;
- sync_class->remove_objects_sync = e_cal_backend_file_remove_objects;
- sync_class->receive_objects_sync = e_cal_backend_file_receive_objects;
- sync_class->send_objects_sync = e_cal_backend_file_send_objects;
- sync_class->get_object_sync = e_cal_backend_file_get_object;
- sync_class->get_object_list_sync = e_cal_backend_file_get_object_list;
- sync_class->get_attachment_uris_sync = e_cal_backend_file_get_attachment_uris;
- sync_class->add_timezone_sync = e_cal_backend_file_add_timezone;
- sync_class->get_free_busy_sync = e_cal_backend_file_get_free_busy;
-
- backend_class->start_view = e_cal_backend_file_start_view;
+ sync_class->open_sync = e_cal_backend_file_open;
+ sync_class->create_objects_sync = e_cal_backend_file_create_objects;
+ sync_class->modify_objects_sync = e_cal_backend_file_modify_objects;
+ sync_class->remove_objects_sync = e_cal_backend_file_remove_objects;
+ sync_class->receive_objects_sync = e_cal_backend_file_receive_objects;
+ sync_class->send_objects_sync = e_cal_backend_file_send_objects;
+ sync_class->get_object_sync = e_cal_backend_file_get_object;
+ sync_class->get_object_list_sync = e_cal_backend_file_get_object_list;
+ sync_class->get_attachment_uris_sync = e_cal_backend_file_get_attachment_uris;
+ sync_class->add_timezone_sync = e_cal_backend_file_add_timezone;
+ sync_class->get_free_busy_sync = e_cal_backend_file_get_free_busy;
+
+ backend_class->start_view = e_cal_backend_file_start_view;
/* Register our ESource extension. */
E_TYPE_SOURCE_LOCAL;
diff --git a/calendar/backends/http/e-cal-backend-http.c b/calendar/backends/http/e-cal-backend-http.c
index b4b70f4..1ba51d0 100644
--- a/calendar/backends/http/e-cal-backend-http.c
+++ b/calendar/backends/http/e-cal-backend-http.c
@@ -1486,19 +1486,19 @@ e_cal_backend_http_class_init (ECalBackendHttpClass *class)
backend_class->get_backend_property = e_cal_backend_http_get_backend_property;
- sync_class->open_sync = e_cal_backend_http_open;
- sync_class->refresh_sync = e_cal_backend_http_refresh;
- sync_class->create_objects_sync = e_cal_backend_http_create_objects;
- sync_class->modify_objects_sync = e_cal_backend_http_modify_objects;
- sync_class->remove_objects_sync = e_cal_backend_http_remove_objects;
- sync_class->receive_objects_sync = e_cal_backend_http_receive_objects;
- sync_class->send_objects_sync = e_cal_backend_http_send_objects;
- sync_class->get_object_sync = e_cal_backend_http_get_object;
- sync_class->get_object_list_sync = e_cal_backend_http_get_object_list;
- sync_class->add_timezone_sync = e_cal_backend_http_add_timezone;
- sync_class->get_free_busy_sync = e_cal_backend_http_get_free_busy;
-
- backend_class->start_view = e_cal_backend_http_start_view;
+ sync_class->open_sync = e_cal_backend_http_open;
+ sync_class->refresh_sync = e_cal_backend_http_refresh;
+ sync_class->create_objects_sync = e_cal_backend_http_create_objects;
+ sync_class->modify_objects_sync = e_cal_backend_http_modify_objects;
+ sync_class->remove_objects_sync = e_cal_backend_http_remove_objects;
+ sync_class->receive_objects_sync = e_cal_backend_http_receive_objects;
+ sync_class->send_objects_sync = e_cal_backend_http_send_objects;
+ sync_class->get_object_sync = e_cal_backend_http_get_object;
+ sync_class->get_object_list_sync = e_cal_backend_http_get_object_list;
+ sync_class->add_timezone_sync = e_cal_backend_http_add_timezone;
+ sync_class->get_free_busy_sync = e_cal_backend_http_get_free_busy;
+
+ backend_class->start_view = e_cal_backend_http_start_view;
}
static void
diff --git a/calendar/backends/weather/e-cal-backend-weather.c
b/calendar/backends/weather/e-cal-backend-weather.c
index 4399f3e..94e39d2 100644
--- a/calendar/backends/weather/e-cal-backend-weather.c
+++ b/calendar/backends/weather/e-cal-backend-weather.c
@@ -322,7 +322,7 @@ getCategory (GWeatherInfo *report)
static gchar *
cal_backend_weather_get_temp (gdouble value,
- GWeatherTemperatureUnit unit)
+ GWeatherTemperatureUnit unit)
{
switch (unit) {
case GWEATHER_TEMP_UNIT_FAHRENHEIT:
@@ -345,7 +345,7 @@ cal_backend_weather_get_temp (gdouble value,
static ECalComponent *
create_weather (ECalBackendWeather *cbw,
GWeatherInfo *report,
- GWeatherTemperatureUnit unit,
+ GWeatherTemperatureUnit unit,
gboolean is_forecast)
{
ECalComponent *cal_comp;
@@ -836,15 +836,15 @@ e_cal_backend_weather_class_init (ECalBackendWeatherClass *class)
backend_class->get_backend_property = e_cal_backend_weather_get_backend_property;
- sync_class->open_sync = e_cal_backend_weather_open;
- sync_class->refresh_sync = e_cal_backend_weather_refresh;
- sync_class->receive_objects_sync = e_cal_backend_weather_receive_objects;
- sync_class->get_object_sync = e_cal_backend_weather_get_object;
- sync_class->get_object_list_sync = e_cal_backend_weather_get_object_list;
- sync_class->add_timezone_sync = e_cal_backend_weather_add_timezone;
- sync_class->get_free_busy_sync = e_cal_backend_weather_get_free_busy;
+ sync_class->open_sync = e_cal_backend_weather_open;
+ sync_class->refresh_sync = e_cal_backend_weather_refresh;
+ sync_class->receive_objects_sync = e_cal_backend_weather_receive_objects;
+ sync_class->get_object_sync = e_cal_backend_weather_get_object;
+ sync_class->get_object_list_sync = e_cal_backend_weather_get_object_list;
+ sync_class->add_timezone_sync = e_cal_backend_weather_add_timezone;
+ sync_class->get_free_busy_sync = e_cal_backend_weather_get_free_busy;
- backend_class->start_view = e_cal_backend_weather_start_view;
+ backend_class->start_view = e_cal_backend_weather_start_view;
/* Register our ESource extension. */
E_TYPE_SOURCE_WEATHER;
diff --git a/calendar/backends/weather/e-weather-source.c b/calendar/backends/weather/e-weather-source.c
index 8288d99..2515d1c 100644
--- a/calendar/backends/weather/e-weather-source.c
+++ b/calendar/backends/weather/e-weather-source.c
@@ -73,8 +73,8 @@ e_weather_source_init (EWeatherSource *source)
static GWeatherLocation *
weather_source_find_location_by_coords (GWeatherLocation *start,
- gdouble latitude,
- gdouble longitude)
+ gdouble latitude,
+ gdouble longitude)
{
GWeatherLocation *location, **children;
gint ii;
diff --git a/calendar/libecal/e-cal-client-view.h b/calendar/libecal/e-cal-client-view.h
index eb534f9..ed22f11 100644
--- a/calendar/libecal/e-cal-client-view.h
+++ b/calendar/libecal/e-cal-client-view.h
@@ -68,7 +68,7 @@ struct _ECalClient;
* Since: 3.6
*/
typedef enum {
- E_CAL_CLIENT_VIEW_FLAGS_NONE = 0,
+ E_CAL_CLIENT_VIEW_FLAGS_NONE = 0,
E_CAL_CLIENT_VIEW_FLAGS_NOTIFY_INITIAL = (1 << 0)
} ECalClientViewFlags;
diff --git a/calendar/libecal/e-cal-client.c b/calendar/libecal/e-cal-client.c
index 17c6779..7aa4b88 100644
--- a/calendar/libecal/e-cal-client.c
+++ b/calendar/libecal/e-cal-client.c
@@ -3232,9 +3232,10 @@ cal_client_get_default_object_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -3404,9 +3405,10 @@ cal_client_get_object_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -3667,9 +3669,10 @@ cal_client_get_objects_for_uid_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -3907,9 +3910,10 @@ cal_client_get_object_list_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -4094,9 +4098,10 @@ cal_client_get_object_list_as_comps_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -4285,9 +4290,10 @@ cal_client_get_free_busy_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -4454,9 +4460,10 @@ cal_client_create_object_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -4622,9 +4629,10 @@ cal_client_create_objects_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -4824,9 +4832,10 @@ cal_client_modify_object_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -4973,9 +4982,10 @@ cal_client_modify_objects_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -5166,9 +5176,10 @@ cal_client_remove_object_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -5318,9 +5329,10 @@ cal_client_remove_objects_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -5534,9 +5546,10 @@ cal_client_receive_objects_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -5687,9 +5700,10 @@ cal_client_send_objects_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -5912,9 +5926,10 @@ cal_client_get_attachment_uris_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -6107,9 +6122,10 @@ cal_client_discard_alarm_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -6469,9 +6485,10 @@ cal_client_get_timezone_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
@@ -6682,9 +6699,10 @@ cal_client_add_timezone_thread (GSimpleAsyncResult *simple,
cancellable, &local_error)) {
if (!local_error)
- local_error = g_error_new_literal (E_CLIENT_ERROR,
- E_CLIENT_ERROR_OTHER_ERROR,
- _("Unknown error"));
+ local_error = g_error_new_literal (
+ E_CLIENT_ERROR,
+ E_CLIENT_ERROR_OTHER_ERROR,
+ _("Unknown error"));
}
if (local_error != NULL)
diff --git a/calendar/libecal/e-cal-recur.c b/calendar/libecal/e-cal-recur.c
index 306ac7f..462d1c1 100644
--- a/calendar/libecal/e-cal-recur.c
+++ b/calendar/libecal/e-cal-recur.c
@@ -850,19 +850,19 @@ e_cal_recur_generate_instances_of_rule (ECalComponent *comp,
chunk_end.year = year;
if (year != interval_start.year) {
- chunk_start.month = 0;
- chunk_start.day = 1;
- chunk_start.hour = 0;
+ chunk_start.month = 0;
+ chunk_start.day = 1;
+ chunk_start.hour = 0;
chunk_start.minute = 0;
chunk_start.second = 0;
}
if (end == -1 || year != interval_end.year) {
- chunk_end.month = 11;
- chunk_end.day = 31;
- chunk_end.hour = 23;
+ chunk_end.month = 11;
+ chunk_end.day = 31;
+ chunk_end.hour = 23;
chunk_end.minute = 59;
chunk_end.second = 61;
- chunk_end.flags = FALSE;
+ chunk_end.flags = FALSE;
}
if (!generate_instances_for_chunk (comp, dtstart_time,
@@ -1233,13 +1233,13 @@ generate_instances_for_chunk (ECalComponent *comp,
p = elem->data;
tt = icaltime_convert_to_zone (p->start, zone);
- cotime.year = tt.year;
- cotime.month = tt.month - 1;
- cotime.day = tt.day;
- cotime.hour = tt.hour;
- cotime.minute = tt.minute;
- cotime.second = tt.second;
- cotime.flags = FALSE;
+ cotime.year = tt.year;
+ cotime.month = tt.month - 1;
+ cotime.day = tt.day;
+ cotime.hour = tt.hour;
+ cotime.minute = tt.minute;
+ cotime.second = tt.second;
+ cotime.flags = FALSE;
/* If the rdate is after the current chunk we set finished
* to FALSE, and we skip it. */
@@ -1293,23 +1293,23 @@ generate_instances_for_chunk (ECalComponent *comp,
cdt = elem->data;
tt = icaltime_convert_to_zone (*cdt->value, zone);
- cotime.year = tt.year;
- cotime.month = tt.month - 1;
- cotime.day = tt.day;
+ cotime.year = tt.year;
+ cotime.month = tt.month - 1;
+ cotime.day = tt.day;
/* If the EXDATE has a DATE value, set the time to the start
* of the day and set flags to TRUE so we know to skip all
* occurrences on that date. */
if (cdt->value->is_date) {
- cotime.hour = 0;
- cotime.minute = 0;
- cotime.second = 0;
- cotime.flags = TRUE;
+ cotime.hour = 0;
+ cotime.minute = 0;
+ cotime.second = 0;
+ cotime.flags = TRUE;
} else {
- cotime.hour = tt.hour;
- cotime.minute = tt.minute;
- cotime.second = tt.second;
- cotime.flags = FALSE;
+ cotime.hour = tt.hour;
+ cotime.minute = tt.minute;
+ cotime.second = tt.second;
+ cotime.flags = FALSE;
}
g_array_append_val (ex_occs, cotime);
@@ -1339,10 +1339,10 @@ generate_instances_for_chunk (ECalComponent *comp,
cal_obj_time_to_string (occ));
#endif
start_tt = icaltime_null_time ();
- start_tt.year = occ->year;
- start_tt.month = occ->month + 1;
- start_tt.day = occ->day;
- start_tt.hour = occ->hour;
+ start_tt.year = occ->year;
+ start_tt.month = occ->month + 1;
+ start_tt.day = occ->day;
+ start_tt.hour = occ->hour;
start_tt.minute = occ->minute;
start_tt.second = occ->second;
start_time = icaltime_as_timet_with_zone (start_tt, zone);
@@ -1383,10 +1383,10 @@ generate_instances_for_chunk (ECalComponent *comp,
}
end_tt = icaltime_null_time ();
- end_tt.year = occ->year;
- end_tt.month = occ->month + 1;
- end_tt.day = occ->day;
- end_tt.hour = occ->hour;
+ end_tt.year = occ->year;
+ end_tt.month = occ->month + 1;
+ end_tt.day = occ->day;
+ end_tt.hour = occ->hour;
end_tt.minute = occ->minute;
end_tt.second = occ->second;
end_time = icaltime_as_timet_with_zone (end_tt, zone);
@@ -1464,13 +1464,13 @@ cal_object_get_rdate_end (CalObjTime *occ,
if (p->type == E_CAL_COMPONENT_PERIOD_DATETIME) {
struct icaltimetype tt =
icaltime_convert_to_zone (p->u.end, zone);
- occ->year = tt.year;
- occ->month = tt.month - 1;
- occ->day = tt.day;
- occ->hour = tt.hour;
- occ->minute = tt.minute;
- occ->second = tt.second;
- occ->flags = FALSE;
+ occ->year = tt.year;
+ occ->month = tt.month - 1;
+ occ->day = tt.day;
+ occ->hour = tt.hour;
+ occ->minute = tt.minute;
+ occ->second = tt.second;
+ occ->flags = FALSE;
} else {
cal_obj_time_add_days (
occ,
@@ -2016,7 +2016,7 @@ cal_obj_remove_duplicates_and_invalid_dates (GArray *occs)
if (keep_occ) {
if (i != j)
g_array_index (occs, CalObjTime, j)
- = g_array_index (occs, CalObjTime, i);
+ = g_array_index (occs, CalObjTime, i);
j++;
}
@@ -2117,7 +2117,7 @@ cal_obj_remove_exceptions (GArray *occs,
* kept). */
if (i != j)
g_array_index (occs, CalObjTime, j)
- = g_array_index (occs, CalObjTime, i);
+ = g_array_index (occs, CalObjTime, i);
j++;
}
@@ -3788,13 +3788,13 @@ cal_object_time_from_time (CalObjTime *cotime,
else
tt = icaltime_from_timet (t, FALSE);
- cotime->year = tt.year;
- cotime->month = tt.month - 1;
- cotime->day = tt.day;
- cotime->hour = tt.hour;
- cotime->minute = tt.minute;
- cotime->second = tt.second;
- cotime->flags = FALSE;
+ cotime->year = tt.year;
+ cotime->month = tt.month - 1;
+ cotime->day = tt.day;
+ cotime->hour = tt.hour;
+ cotime->minute = tt.minute;
+ cotime->second = tt.second;
+ cotime->flags = FALSE;
}
/* Debugging function to convert a CalObjTime to a string. It uses a static
diff --git a/calendar/libecal/e-cal-time-util.c b/calendar/libecal/e-cal-time-util.c
index 725a7ba..5f9ff56 100644
--- a/calendar/libecal/e-cal-time-util.c
+++ b/calendar/libecal/e-cal-time-util.c
@@ -262,9 +262,9 @@ time_year_begin_with_zone (time_t time,
tt = icaltime_from_timet_with_zone (time, FALSE, zone);
/* Set it to the start of the year. */
- tt.month = 1;
- tt.day = 1;
- tt.hour = 0;
+ tt.month = 1;
+ tt.day = 1;
+ tt.hour = 0;
tt.minute = 0;
tt.second = 0;
@@ -295,8 +295,8 @@ time_month_begin_with_zone (time_t time,
tt = icaltime_from_timet_with_zone (time, FALSE, zone);
/* Set it to the start of the month. */
- tt.day = 1;
- tt.hour = 0;
+ tt.day = 1;
+ tt.hour = 0;
tt.minute = 0;
tt.second = 0;
@@ -338,7 +338,7 @@ time_week_begin_with_zone (time_t time,
/* Set it to the start of the month. */
tt.day -= offset;
- tt.hour = 0;
+ tt.hour = 0;
tt.minute = 0;
tt.second = 0;
@@ -372,7 +372,7 @@ time_day_begin_with_zone (time_t time,
tt = icaltime_from_timet_with_zone (time, FALSE, zone);
/* Set it to the start of the day. */
- tt.hour = 0;
+ tt.hour = 0;
tt.minute = 0;
tt.second = 0;
@@ -404,7 +404,7 @@ time_day_end_with_zone (time_t time,
/* Set it to the start of the next day. */
tt.day++;
- tt.hour = 0;
+ tt.hour = 0;
tt.minute = 0;
tt.second = 0;
@@ -645,9 +645,9 @@ time_from_isodate (const gchar *str)
if (len > 8) {
tt.hour = digit_at (str, 9) * 10
+ digit_at (str, 10);
- tt.minute = digit_at (str, 11) * 10
+ tt.minute = digit_at (str, 11) * 10
+ digit_at (str, 12);
- tt.second = digit_at (str, 13) * 10
+ tt.second = digit_at (str, 13) * 10
+ digit_at (str, 14);
}
diff --git a/calendar/libecal/e-cal-types.h b/calendar/libecal/e-cal-types.h
index a496dee..1e0b73c 100644
--- a/calendar/libecal/e-cal-types.h
+++ b/calendar/libecal/e-cal-types.h
@@ -60,11 +60,11 @@ typedef enum {
* Since: 3.8
**/
typedef enum {
- E_CAL_OBJ_MOD_THIS = 1 << 0,
- E_CAL_OBJ_MOD_THIS_AND_PRIOR = 1 << 1,
+ E_CAL_OBJ_MOD_THIS = 1 << 0,
+ E_CAL_OBJ_MOD_THIS_AND_PRIOR = 1 << 1,
E_CAL_OBJ_MOD_THIS_AND_FUTURE = 1 << 2,
- E_CAL_OBJ_MOD_ALL = 0x07,
- E_CAL_OBJ_MOD_ONLY_THIS = 1 << 3
+ E_CAL_OBJ_MOD_ALL = 0x07,
+ E_CAL_OBJ_MOD_ONLY_THIS = 1 << 3
} ECalObjModType;
/** Everything below this point is deprecated. **/
diff --git a/calendar/libecal/e-cal-util.h b/calendar/libecal/e-cal-util.h
index e336ff1..1adc753 100644
--- a/calendar/libecal/e-cal-util.h
+++ b/calendar/libecal/e-cal-util.h
@@ -210,14 +210,14 @@ void e_cal_util_get_component_occur_times
/* Used for mode stuff */
typedef enum {
CAL_MODE_INVALID = -1,
- CAL_MODE_LOCAL = 1 << 0,
- CAL_MODE_REMOTE = 1 << 1,
- CAL_MODE_ANY = 0x07
+ CAL_MODE_LOCAL = 1 << 0,
+ CAL_MODE_REMOTE = 1 << 1,
+ CAL_MODE_ANY = 0x07
} CalMode;
#define cal_mode_to_corba(mode) \
- (mode == CAL_MODE_LOCAL ? Local : \
- mode == CAL_MODE_REMOTE ? Remote : \
+ (mode == CAL_MODE_LOCAL ? Local : \
+ mode == CAL_MODE_REMOTE ? Remote : \
AnyMode)
#endif /* EDS_DISABLE_DEPRECATED */
diff --git a/calendar/libedata-cal/e-cal-backend-sexp.c b/calendar/libedata-cal/e-cal-backend-sexp.c
index 78f85ad..0dc6b6e 100644
--- a/calendar/libedata-cal/e-cal-backend-sexp.c
+++ b/calendar/libedata-cal/e-cal-backend-sexp.c
@@ -575,17 +575,17 @@ matches_status (ECalComponent *comp ,const gchar *str)
return TRUE;
else if (g_str_equal (str, "CANCELLED") && status == ICAL_STATUS_CANCELLED)
return TRUE;
- else if (g_str_equal (str, "IN PROGRESS") && status == ICAL_STATUS_INPROCESS)
+ else if (g_str_equal (str, "IN PROGRESS") && status == ICAL_STATUS_INPROCESS)
return TRUE;
- else if (g_str_equal (str, "NEEDS ACTION") && status == ICAL_STATUS_NEEDSACTION)
+ else if (g_str_equal (str, "NEEDS ACTION") && status == ICAL_STATUS_NEEDSACTION)
return TRUE;
- else if (g_str_equal (str, "TENTATIVE") && status == ICAL_STATUS_TENTATIVE)
+ else if (g_str_equal (str, "TENTATIVE") && status == ICAL_STATUS_TENTATIVE)
return TRUE;
- else if (g_str_equal (str, "CONFIRMED") && status == ICAL_STATUS_CONFIRMED)
+ else if (g_str_equal (str, "CONFIRMED") && status == ICAL_STATUS_CONFIRMED)
return TRUE;
- else if (g_str_equal (str, "DRAFT") && status == ICAL_STATUS_DRAFT)
+ else if (g_str_equal (str, "DRAFT") && status == ICAL_STATUS_DRAFT)
return TRUE;
- else if (g_str_equal (str, "FINAL") && status == ICAL_STATUS_FINAL)
+ else if (g_str_equal (str, "FINAL") && status == ICAL_STATUS_FINAL)
return TRUE;
return FALSE;
diff --git a/calendar/libedata-cal/e-cal-backend-sync.c b/calendar/libedata-cal/e-cal-backend-sync.c
index 2158ffe..3c20981 100644
--- a/calendar/libedata-cal/e-cal-backend-sync.c
+++ b/calendar/libedata-cal/e-cal-backend-sync.c
@@ -914,20 +914,20 @@ e_cal_backend_sync_class_init (ECalBackendSyncClass *class)
ECalBackendClass *backend_class;
backend_class = E_CAL_BACKEND_CLASS (class);
- backend_class->open = cal_backend_open;
- backend_class->refresh = cal_backend_refresh;
- backend_class->get_object = cal_backend_get_object;
- backend_class->get_object_list = cal_backend_get_object_list;
- backend_class->get_free_busy = cal_backend_get_free_busy;
- backend_class->create_objects = cal_backend_create_objects;
- backend_class->modify_objects = cal_backend_modify_objects;
- backend_class->remove_objects = cal_backend_remove_objects;
- backend_class->receive_objects = cal_backend_receive_objects;
- backend_class->send_objects = cal_backend_send_objects;
- backend_class->get_attachment_uris = cal_backend_get_attachment_uris;
- backend_class->discard_alarm = cal_backend_discard_alarm;
- backend_class->get_timezone = cal_backend_get_timezone;
- backend_class->add_timezone = cal_backend_add_timezone;
+ backend_class->open = cal_backend_open;
+ backend_class->refresh = cal_backend_refresh;
+ backend_class->get_object = cal_backend_get_object;
+ backend_class->get_object_list = cal_backend_get_object_list;
+ backend_class->get_free_busy = cal_backend_get_free_busy;
+ backend_class->create_objects = cal_backend_create_objects;
+ backend_class->modify_objects = cal_backend_modify_objects;
+ backend_class->remove_objects = cal_backend_remove_objects;
+ backend_class->receive_objects = cal_backend_receive_objects;
+ backend_class->send_objects = cal_backend_send_objects;
+ backend_class->get_attachment_uris = cal_backend_get_attachment_uris;
+ backend_class->discard_alarm = cal_backend_discard_alarm;
+ backend_class->get_timezone = cal_backend_get_timezone;
+ backend_class->add_timezone = cal_backend_add_timezone;
}
static void
diff --git a/calendar/libedata-cal/e-data-cal-view.c b/calendar/libedata-cal/e-data-cal-view.c
index 7e5abf0..7df931f 100644
--- a/calendar/libedata-cal/e-data-cal-view.c
+++ b/calendar/libedata-cal/e-data-cal-view.c
@@ -774,7 +774,7 @@ notify_remove (EDataCalView *view,
ECalComponentId *id)
{
gchar *ids;
- gsize ids_len, ids_offset;
+ gsize ids_len, ids_offset;
gchar *uid, *rid;
gsize uid_len, rid_len;
@@ -1077,7 +1077,7 @@ filter_component (icalcomponent *icomponent,
/* kind_string = icomponent->x_name; */
/* } */
- kind_string = icalcomponent_kind_to_string (kind);
+ kind_string = icalcomponent_kind_to_string (kind);
g_string_append (string, kind_string);
g_string_append (string, newline);
diff --git a/camel/camel-block-file.h b/camel/camel-block-file.h
index d2a7938..a6a3348 100644
--- a/camel/camel-block-file.h
+++ b/camel/camel-block-file.h
@@ -86,7 +86,7 @@ typedef enum {
#define CAMEL_BLOCK_SIZE_BITS (10) /* # bits to contain block_size bytes */
typedef enum {
- CAMEL_BLOCK_DIRTY = 1 << 0,
+ CAMEL_BLOCK_DIRTY = 1 << 0,
CAMEL_BLOCK_DETACHED = 1 << 1
} CamelBlockFlags;
diff --git a/camel/camel-charset-map-private.h b/camel/camel-charset-map-private.h
index 80fd9fc..5497497 100644
--- a/camel/camel-charset-map-private.h
+++ b/camel/camel-charset-map-private.h
@@ -11136,7 +11136,7 @@ static const struct {
};
#define charset_mask(x) \
- (camel_charmap[(x) >> 8].bits0 ? camel_charmap[(x) >> 8].bits0[(x) & 0xff] << 0 : 0) \
- | (camel_charmap[(x) >> 8].bits1 ? camel_charmap[(x) >> 8].bits1[(x) & 0xff] << 8 : 0) \
+ (camel_charmap[(x) >> 8].bits0 ? camel_charmap[(x) >> 8].bits0[(x) & 0xff] << 0 : 0) \
+ | (camel_charmap[(x) >> 8].bits1 ? camel_charmap[(x) >> 8].bits1[(x) & 0xff] << 8 : 0) \
| (camel_charmap[(x) >> 8].bits2 ? camel_charmap[(x) >> 8].bits2[(x) & 0xff] << 16 : 0)
diff --git a/camel/camel-db.c b/camel/camel-db.c
index 7b53c35..7e02594 100644
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -182,18 +182,18 @@ sync_push_request_timeout (CamelSqlite3File *cFile)
return FALSE;
}
-#define def_subclassed(_nm, _params, _call) \
-static gint \
-camel_sqlite3_file_ ## _nm _params \
-{ \
- CamelSqlite3File *cFile; \
- \
- g_return_val_if_fail (old_vfs != NULL, SQLITE_ERROR); \
- g_return_val_if_fail (pFile != NULL, SQLITE_ERROR); \
- \
- cFile = (CamelSqlite3File *) pFile; \
- g_return_val_if_fail (cFile->old_vfs_file->pMethods != NULL, SQLITE_ERROR); \
- return cFile->old_vfs_file->pMethods->_nm _call; \
+#define def_subclassed(_nm, _params, _call) \
+static gint \
+camel_sqlite3_file_ ## _nm _params \
+{ \
+ CamelSqlite3File *cFile; \
+ \
+ g_return_val_if_fail (old_vfs != NULL, SQLITE_ERROR); \
+ g_return_val_if_fail (pFile != NULL, SQLITE_ERROR); \
+ \
+ cFile = (CamelSqlite3File *) pFile; \
+ g_return_val_if_fail (cFile->old_vfs_file->pMethods != NULL, SQLITE_ERROR); \
+ return cFile->old_vfs_file->pMethods->_nm _call; \
}
def_subclassed (xRead, (sqlite3_file *pFile, gpointer pBuf, gint iAmt, sqlite3_int64 iOfst),
(cFile->old_vfs_file, pBuf, iAmt, iOfst))
diff --git a/camel/camel-debug.c b/camel/camel-debug.c
index 787a7da..d5e697d 100644
--- a/camel/camel-debug.c
+++ b/camel/camel-debug.c
@@ -208,7 +208,7 @@ i386_length_and_rw_bits (gint len,
#define I386_DR_SET_RW_LEN(i,rwlen) \
do { \
- dr_control_mirror &= ~(0x0f << (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i))); \
+ dr_control_mirror &= ~(0x0f << (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i))); \
dr_control_mirror |= ((rwlen) << (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * (i))); \
} while (0)
@@ -216,12 +216,12 @@ i386_length_and_rw_bits (gint len,
dr_control_mirror |= (1 << (DR_LOCAL_ENABLE_SHIFT + DR_ENABLE_SIZE * (i)))
#define set_dr(regnum, val) \
- __asm__("movl %0,%%db" #regnum \
+ __asm__("movl %0,%%db" #regnum \
: /* no output */ \
:"r" (val))
#define get_dr(regnum, val) \
- __asm__("movl %%db" #regnum ", %0" \
+ __asm__("movl %%db" #regnum ", %0" \
:"=r" (val))
/* fine idea, but it doesn't work, crashes in get_dr :-/ */
@@ -240,7 +240,7 @@ camel_debug_hwatch (gint wp,
control &= ~(((1 << DR_CONTROL_SIZE) - 1) << (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * wp));
control |= rw << (DR_CONTROL_SHIFT + DR_CONTROL_SIZE * wp);
/* set watch enable */
- control |= ( 1<< (DR_LOCAL_ENABLE_SHIFT + DR_ENABLE_SIZE * wp));
+ control |= ( 1<< (DR_LOCAL_ENABLE_SHIFT + DR_ENABLE_SIZE * wp));
control |= DR_LOCAL_SLOWDOWN;
control &= ~DR_CONTROL_RESERVED;
diff --git a/camel/camel-enums.h b/camel/camel-enums.h
index 198bbc6..e2b30b9 100644
--- a/camel/camel-enums.h
+++ b/camel/camel-enums.h
@@ -44,11 +44,11 @@ typedef enum {
typedef enum { /*< flags >*/
CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY = 1 << 0,
- CAMEL_FOLDER_FILTER_RECENT = 1 << 2,
- CAMEL_FOLDER_HAS_BEEN_DELETED = 1 << 3,
- CAMEL_FOLDER_IS_TRASH = 1 << 4,
- CAMEL_FOLDER_IS_JUNK = 1 << 5,
- CAMEL_FOLDER_FILTER_JUNK = 1 << 6
+ CAMEL_FOLDER_FILTER_RECENT = 1 << 2,
+ CAMEL_FOLDER_HAS_BEEN_DELETED = 1 << 3,
+ CAMEL_FOLDER_IS_TRASH = 1 << 4,
+ CAMEL_FOLDER_IS_JUNK = 1 << 5,
+ CAMEL_FOLDER_FILTER_JUNK = 1 << 6
} CamelFolderFlags;
#define CAMEL_FOLDER_TYPE_BIT (10)
@@ -106,29 +106,29 @@ typedef enum { /*< flags >*/
/* WARNING: This enum and CamelStoreInfoFlags must stay in sync.
* FIXME: Eliminate the need for two separate types. */
typedef enum { /*< flags >*/
- CAMEL_FOLDER_NOSELECT = 1 << 0,
- CAMEL_FOLDER_NOINFERIORS = 1 << 1,
- CAMEL_FOLDER_CHILDREN = 1 << 2,
- CAMEL_FOLDER_NOCHILDREN = 1 << 3,
- CAMEL_FOLDER_SUBSCRIBED = 1 << 4,
- CAMEL_FOLDER_VIRTUAL = 1 << 5,
- CAMEL_FOLDER_SYSTEM = 1 << 6,
- CAMEL_FOLDER_VTRASH = 1 << 7,
- CAMEL_FOLDER_SHARED_TO_ME = 1 << 8,
- CAMEL_FOLDER_SHARED_BY_ME = 1 << 9,
- CAMEL_FOLDER_TYPE_NORMAL = 0 << CAMEL_FOLDER_TYPE_BIT,
- CAMEL_FOLDER_TYPE_INBOX = 1 << CAMEL_FOLDER_TYPE_BIT,
- CAMEL_FOLDER_TYPE_OUTBOX = 2 << CAMEL_FOLDER_TYPE_BIT,
- CAMEL_FOLDER_TYPE_TRASH = 3 << CAMEL_FOLDER_TYPE_BIT,
- CAMEL_FOLDER_TYPE_JUNK = 4 << CAMEL_FOLDER_TYPE_BIT,
- CAMEL_FOLDER_TYPE_SENT = 5 << CAMEL_FOLDER_TYPE_BIT,
+ CAMEL_FOLDER_NOSELECT = 1 << 0,
+ CAMEL_FOLDER_NOINFERIORS = 1 << 1,
+ CAMEL_FOLDER_CHILDREN = 1 << 2,
+ CAMEL_FOLDER_NOCHILDREN = 1 << 3,
+ CAMEL_FOLDER_SUBSCRIBED = 1 << 4,
+ CAMEL_FOLDER_VIRTUAL = 1 << 5,
+ CAMEL_FOLDER_SYSTEM = 1 << 6,
+ CAMEL_FOLDER_VTRASH = 1 << 7,
+ CAMEL_FOLDER_SHARED_TO_ME = 1 << 8,
+ CAMEL_FOLDER_SHARED_BY_ME = 1 << 9,
+ CAMEL_FOLDER_TYPE_NORMAL = 0 << CAMEL_FOLDER_TYPE_BIT,
+ CAMEL_FOLDER_TYPE_INBOX = 1 << CAMEL_FOLDER_TYPE_BIT,
+ CAMEL_FOLDER_TYPE_OUTBOX = 2 << CAMEL_FOLDER_TYPE_BIT,
+ CAMEL_FOLDER_TYPE_TRASH = 3 << CAMEL_FOLDER_TYPE_BIT,
+ CAMEL_FOLDER_TYPE_JUNK = 4 << CAMEL_FOLDER_TYPE_BIT,
+ CAMEL_FOLDER_TYPE_SENT = 5 << CAMEL_FOLDER_TYPE_BIT,
CAMEL_FOLDER_TYPE_CONTACTS = 6 << CAMEL_FOLDER_TYPE_BIT,
- CAMEL_FOLDER_TYPE_EVENTS = 7 << CAMEL_FOLDER_TYPE_BIT,
- CAMEL_FOLDER_TYPE_MEMOS = 8 << CAMEL_FOLDER_TYPE_BIT,
- CAMEL_FOLDER_TYPE_TASKS = 9 << CAMEL_FOLDER_TYPE_BIT,
- CAMEL_FOLDER_READONLY = 1 << 16,
+ CAMEL_FOLDER_TYPE_EVENTS = 7 << CAMEL_FOLDER_TYPE_BIT,
+ CAMEL_FOLDER_TYPE_MEMOS = 8 << CAMEL_FOLDER_TYPE_BIT,
+ CAMEL_FOLDER_TYPE_TASKS = 9 << CAMEL_FOLDER_TYPE_BIT,
+ CAMEL_FOLDER_READONLY = 1 << 16,
/* empty gap from unused flag removal */
- CAMEL_FOLDER_FLAGGED = 1 << 18,
+ CAMEL_FOLDER_FLAGGED = 1 << 18,
CAMEL_FOLDER_FLAGS_LAST = 1 << 24 /*< skip >*/
} CamelFolderInfoFlags;
@@ -167,35 +167,35 @@ typedef enum { /*< flags >*/
* Flags for converting text/plain content into text/html.
**/
typedef enum { /*< flags >*/
- CAMEL_MIME_FILTER_TOHTML_PRE = 1 << 0,
- CAMEL_MIME_FILTER_TOHTML_CONVERT_NL = 1 << 1,
- CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES = 1 << 2,
- CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS = 1 << 3,
- CAMEL_MIME_FILTER_TOHTML_MARK_CITATION = 1 << 4,
+ CAMEL_MIME_FILTER_TOHTML_PRE = 1 << 0,
+ CAMEL_MIME_FILTER_TOHTML_CONVERT_NL = 1 << 1,
+ CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES = 1 << 2,
+ CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS = 1 << 3,
+ CAMEL_MIME_FILTER_TOHTML_MARK_CITATION = 1 << 4,
CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES = 1 << 5,
- CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT = 1 << 6,
- CAMEL_MIME_FILTER_TOHTML_CITE = 1 << 7,
- CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT = 1 << 8,
- CAMEL_MIME_FILTER_TOHTML_FORMAT_FLOWED = 1 << 9,
- CAMEL_MIME_FILTER_TOHTML_QUOTE_CITATION = 1 << 10
+ CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT = 1 << 6,
+ CAMEL_MIME_FILTER_TOHTML_CITE = 1 << 7,
+ CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT = 1 << 8,
+ CAMEL_MIME_FILTER_TOHTML_FORMAT_FLOWED = 1 << 9,
+ CAMEL_MIME_FILTER_TOHTML_QUOTE_CITATION = 1 << 10
} CamelMimeFilterToHTMLFlags;
/* WARNING: This enum and CamelFolderInfoFlags must stay in sync.
* FIXME: Eliminate the need for two separate types. */
typedef enum { /*< flags >*/
- CAMEL_STORE_INFO_FOLDER_NOSELECT = 1 << 0,
- CAMEL_STORE_INFO_FOLDER_NOINFERIORS = 1 << 1,
- CAMEL_STORE_INFO_FOLDER_CHILDREN = 1 << 2,
- CAMEL_STORE_INFO_FOLDER_NOCHILDREN = 1 << 3,
- CAMEL_STORE_INFO_FOLDER_SUBSCRIBED = 1 << 4,
- CAMEL_STORE_INFO_FOLDER_VIRTUAL = 1 << 5,
- CAMEL_STORE_INFO_FOLDER_SYSTEM = 1 << 6,
- CAMEL_STORE_INFO_FOLDER_VTRASH = 1 << 7,
- CAMEL_STORE_INFO_FOLDER_SHARED_TO_ME = 1 << 8,
- CAMEL_STORE_INFO_FOLDER_SHARED_BY_ME = 1 << 9,
- CAMEL_STORE_INFO_FOLDER_READONLY = 1 << 16,
+ CAMEL_STORE_INFO_FOLDER_NOSELECT = 1 << 0,
+ CAMEL_STORE_INFO_FOLDER_NOINFERIORS = 1 << 1,
+ CAMEL_STORE_INFO_FOLDER_CHILDREN = 1 << 2,
+ CAMEL_STORE_INFO_FOLDER_NOCHILDREN = 1 << 3,
+ CAMEL_STORE_INFO_FOLDER_SUBSCRIBED = 1 << 4,
+ CAMEL_STORE_INFO_FOLDER_VIRTUAL = 1 << 5,
+ CAMEL_STORE_INFO_FOLDER_SYSTEM = 1 << 6,
+ CAMEL_STORE_INFO_FOLDER_VTRASH = 1 << 7,
+ CAMEL_STORE_INFO_FOLDER_SHARED_TO_ME = 1 << 8,
+ CAMEL_STORE_INFO_FOLDER_SHARED_BY_ME = 1 << 9,
+ CAMEL_STORE_INFO_FOLDER_READONLY = 1 << 16,
/* empty gap from unused flag removal */
- CAMEL_STORE_INFO_FOLDER_FLAGGED = 1 << 18,
+ CAMEL_STORE_INFO_FOLDER_FLAGGED = 1 << 18,
CAMEL_STORE_INFO_FOLDER_LAST = 1 << 24 /*< skip >*/
} CamelStoreInfoFlags;
@@ -332,18 +332,18 @@ typedef enum {
*
**/
typedef enum { /*< flags >*/
- CAMEL_PROVIDER_IS_REMOTE = 1 << 0,
- CAMEL_PROVIDER_IS_LOCAL = 1 << 1,
- CAMEL_PROVIDER_IS_EXTERNAL = 1 << 2,
- CAMEL_PROVIDER_IS_SOURCE = 1 << 3,
- CAMEL_PROVIDER_IS_STORAGE = 1 << 4,
- CAMEL_PROVIDER_SUPPORTS_SSL = 1 << 5,
- CAMEL_PROVIDER_HAS_LICENSE = 1 << 6,
- CAMEL_PROVIDER_DISABLE_SENT_FOLDER = 1 << 7,
+ CAMEL_PROVIDER_IS_REMOTE = 1 << 0,
+ CAMEL_PROVIDER_IS_LOCAL = 1 << 1,
+ CAMEL_PROVIDER_IS_EXTERNAL = 1 << 2,
+ CAMEL_PROVIDER_IS_SOURCE = 1 << 3,
+ CAMEL_PROVIDER_IS_STORAGE = 1 << 4,
+ CAMEL_PROVIDER_SUPPORTS_SSL = 1 << 5,
+ CAMEL_PROVIDER_HAS_LICENSE = 1 << 6,
+ CAMEL_PROVIDER_DISABLE_SENT_FOLDER = 1 << 7,
CAMEL_PROVIDER_ALLOW_REAL_TRASH_FOLDER = 1 << 8,
- CAMEL_PROVIDER_ALLOW_REAL_JUNK_FOLDER = 1 << 9,
+ CAMEL_PROVIDER_ALLOW_REAL_JUNK_FOLDER = 1 << 9,
CAMEL_PROVIDER_SUPPORTS_MOBILE_DEVICES = 1 << 10,
- CAMEL_PROVIDER_SUPPORTS_BATCH_FETCH = 1 << 11,
+ CAMEL_PROVIDER_SUPPORTS_BATCH_FETCH = 1 << 11,
CAMEL_PROVIDER_SUPPORTS_PURGE_MESSAGE_CACHE = 1 << 12
} CamelProviderFlags;
@@ -404,13 +404,13 @@ typedef enum {
} CamelSortType;
typedef enum { /*< flags >*/
- CAMEL_STORE_VTRASH = 1 << 0,
- CAMEL_STORE_VJUNK = 1 << 1,
- CAMEL_STORE_PROXY = 1 << 2,
- CAMEL_STORE_IS_MIGRATING = 1 << 3,
+ CAMEL_STORE_VTRASH = 1 << 0,
+ CAMEL_STORE_VJUNK = 1 << 1,
+ CAMEL_STORE_PROXY = 1 << 2,
+ CAMEL_STORE_IS_MIGRATING = 1 << 3,
CAMEL_STORE_REAL_JUNK_FOLDER = 1 << 4,
CAMEL_STORE_CAN_EDIT_FOLDERS = 1 << 5,
- CAMEL_STORE_USE_CACHE_DIR = 1 << 6
+ CAMEL_STORE_USE_CACHE_DIR = 1 << 6
} CamelStoreFlags;
/**
@@ -427,15 +427,15 @@ typedef enum { /*< flags >*/
* folder fetching.
**/
typedef enum { /*< flags >*/
- CAMEL_STORE_FOLDER_INFO_FAST = 1 << 0,
- CAMEL_STORE_FOLDER_INFO_RECURSIVE = 1 << 1,
- CAMEL_STORE_FOLDER_INFO_SUBSCRIBED = 1 << 2,
- CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL = 1 << 3,
+ CAMEL_STORE_FOLDER_INFO_FAST = 1 << 0,
+ CAMEL_STORE_FOLDER_INFO_RECURSIVE = 1 << 1,
+ CAMEL_STORE_FOLDER_INFO_SUBSCRIBED = 1 << 2,
+ CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL = 1 << 3,
CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST = 1 << 4
} CamelStoreGetFolderInfoFlags;
typedef enum { /*< flags >*/
- CAMEL_STORE_READ = 1 << 0,
+ CAMEL_STORE_READ = 1 << 0,
CAMEL_STORE_WRITE = 1 << 1
} CamelStorePermissionFlags;
diff --git a/camel/camel-file-utils.c b/camel/camel-file-utils.c
index c80cf3e..7908d80 100644
--- a/camel/camel-file-utils.c
+++ b/camel/camel-file-utils.c
@@ -154,35 +154,35 @@ camel_file_util_decode_fixed_int32 (FILE *in,
}
}
-#define CFU_ENCODE_T(type) \
-gint \
-camel_file_util_encode_##type (FILE *out, type value) \
-{ \
- gint i; \
- \
- for (i = sizeof (type) - 1; i >= 0; i--) { \
- if (fputc ((value >> (i * 8)) & 0xff, out) == -1) \
- return -1; \
- } \
- return 0; \
+#define CFU_ENCODE_T(type) \
+gint \
+camel_file_util_encode_##type (FILE *out, type value) \
+{ \
+ gint i; \
+ \
+ for (i = sizeof (type) - 1; i >= 0; i--) { \
+ if (fputc ((value >> (i * 8)) & 0xff, out) == -1) \
+ return -1; \
+ } \
+ return 0; \
}
-#define CFU_DECODE_T(type) \
-gint \
-camel_file_util_decode_##type (FILE *in, type *dest) \
-{ \
- type save = 0; \
- gint i = sizeof (type) - 1; \
- gint v = EOF; \
- \
- while (i >= 0 && (v = fgetc (in)) != EOF) { \
- save |= ((type) v) << (i * 8); \
- i--; \
- } \
- *dest = save; \
- if (v == EOF) \
- return -1; \
- return 0; \
+#define CFU_DECODE_T(type) \
+gint \
+camel_file_util_decode_##type (FILE *in, type *dest) \
+{ \
+ type save = 0; \
+ gint i = sizeof (type) - 1; \
+ gint v = EOF; \
+ \
+ while (i >= 0 && (v = fgetc (in)) != EOF) { \
+ save |= ((type) v) << (i * 8); \
+ i--; \
+ } \
+ *dest = save; \
+ if (v == EOF) \
+ return -1; \
+ return 0; \
}
/**
diff --git a/camel/camel-filter-search.h b/camel/camel-filter-search.h
index 0b86806..43e65d2 100644
--- a/camel/camel-filter-search.h
+++ b/camel/camel-filter-search.h
@@ -36,9 +36,9 @@ G_BEGIN_DECLS
struct _CamelSession;
enum {
- CAMEL_SEARCH_ERROR = -1,
- CAMEL_SEARCH_NOMATCH = 0,
- CAMEL_SEARCH_MATCHED = 1
+ CAMEL_SEARCH_ERROR = -1,
+ CAMEL_SEARCH_NOMATCH = 0,
+ CAMEL_SEARCH_MATCHED = 1
};
typedef CamelMimeMessage * (*CamelFilterSearchGetMessageFunc) (gpointer data, GError **error);
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 2078932..36cda9f 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -69,9 +69,9 @@ struct _CamelFolderSearchPrivate {
};
typedef enum {
- CAMEL_FOLDER_SEARCH_NONE = 0,
+ CAMEL_FOLDER_SEARCH_NONE = 0,
CAMEL_FOLDER_SEARCH_ALWAYS_ENTER = 1 << 0,
- CAMEL_FOLDER_SEARCH_IMMEDIATE = 1 << 1
+ CAMEL_FOLDER_SEARCH_IMMEDIATE = 1 << 1
} CamelFolderSearchFlags;
static struct {
@@ -598,7 +598,7 @@ match_words_messages (CamelFolderSearch *search,
GPtrArray *v = search->summary_set ? search->summary_set : search->summary;
for (i = 0; i < v->len && !g_cancellable_is_cancelled (cancellable); i++) {
- gchar *uid = g_ptr_array_index (v, i);
+ gchar *uid = g_ptr_array_index (v, i);
if (match_words_message (
search->folder, uid, words,
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 8c91ac3..e5044d5 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -523,7 +523,7 @@ summary_header_to_db (CamelFolderSummary *summary,
/* we always write out the current version */
record->version = CAMEL_FOLDER_SUMMARY_VERSION;
- record->flags = summary->flags;
+ record->flags = summary->flags;
record->nextuid = summary->priv->nextuid;
record->time = summary->time;
@@ -647,7 +647,7 @@ message_info_to_db (CamelFolderSummary *summary,
record->uid = (gchar *) camel_pstring_strdup (camel_message_info_uid (mi));
record->flags = mi->flags;
- record->read = ((mi->flags & (CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_JUNK))) ? 1
: 0;
+ record->read = ((mi->flags & (CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_JUNK))) ? 1
: 0;
record->deleted = mi->flags & CAMEL_MESSAGE_DELETED ? 1 : 0;
record->replied = mi->flags & CAMEL_MESSAGE_ANSWERED ? 1 : 0;
record->important = mi->flags & CAMEL_MESSAGE_FLAGGED ? 1 : 0;
@@ -1162,14 +1162,14 @@ camel_folder_summary_class_init (CamelFolderSummaryClass *class)
class->content_info_from_db = content_info_from_db;
class->content_info_to_db = content_info_to_db;
- class->message_info_new_from_header = message_info_new_from_header;
+ class->message_info_new_from_header = message_info_new_from_header;
class->message_info_new_from_parser = message_info_new_from_parser;
class->message_info_new_from_message = message_info_new_from_message;
class->message_info_free = message_info_free;
class->message_info_clone = message_info_clone;
class->message_info_from_uid = message_info_from_uid;
- class->content_info_new_from_header = content_info_new_from_header;
+ class->content_info_new_from_header = content_info_new_from_header;
class->content_info_new_from_parser = content_info_new_from_parser;
class->content_info_new_from_message = content_info_new_from_message;
class->content_info_free = content_info_free;
@@ -2416,7 +2416,7 @@ mir_from_cols (CamelMIRecord *mir,
mir->flags = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
break;
case CAMEL_DB_COLUMN_READ:
- mir->read = (cols[i]) ? ( ((strtoul (cols[i], NULL, 10)) ? TRUE : FALSE)) :
FALSE;
+ mir->read = (cols[i]) ? ( ((strtoul (cols[i], NULL, 10)) ? TRUE : FALSE)) :
FALSE;
break;
case CAMEL_DB_COLUMN_DELETED:
mir->deleted = (cols[i]) ? ( ((strtoul (cols[i], NULL, 10)) ? TRUE : FALSE))
: FALSE;
@@ -2434,7 +2434,7 @@ mir_from_cols (CamelMIRecord *mir,
mir->attachment = (cols[i]) ? ( ((strtoul (cols[i], NULL, 10)) ? TRUE :
FALSE)) : FALSE;
break;
case CAMEL_DB_COLUMN_SIZE:
- mir->size = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
+ mir->size = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
break;
case CAMEL_DB_COLUMN_DSENT:
mir->dsent = cols[i] ? strtol (cols[i], NULL, 10) : 0;
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index c808ed7..6f1b7f7 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -221,8 +221,8 @@ struct _CamelMessageInfoBase {
* it is always created on the fly.
**/
typedef enum {
- CAMEL_FOLDER_SUMMARY_DIRTY = 1 << 0,
- CAMEL_FOLDER_SUMMARY_IN_MEMORY_ONLY = 1 << 1
+ CAMEL_FOLDER_SUMMARY_DIRTY = 1 << 0,
+ CAMEL_FOLDER_SUMMARY_IN_MEMORY_ONLY = 1 << 1
} CamelFolderSummaryFlags;
struct _CamelFolderSummary {
diff --git a/camel/camel-folder-thread.h b/camel/camel-folder-thread.h
index bd08039..1f9bfb6 100644
--- a/camel/camel-folder-thread.h
+++ b/camel/camel-folder-thread.h
@@ -41,8 +41,8 @@ typedef struct _CamelFolderThreadNode {
} CamelFolderThreadNode;
typedef struct _CamelFolderThread {
- guint32 refcount : 31;
- guint32 subject : 1;
+ guint32 refcount : 31;
+ guint32 subject : 1;
struct _CamelFolderThreadNode *tree;
CamelMemChunk *node_chunks;
diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
index 36b6937..b554b9e 100644
--- a/camel/camel-gpg-context.c
+++ b/camel/camel-gpg-context.c
@@ -1131,24 +1131,24 @@ gpg_ctx_parse_status (struct _GpgCtx *gpg,
#endif
-#define status_backup(gpg, start, len) G_STMT_START { \
- if (gpg->statusleft <= len) { \
- guint slen, soff; \
- \
- slen = soff = gpg->statusptr - gpg->statusbuf; \
- slen = slen ? slen : 1; \
- \
- while (slen < soff + len) \
- slen <<= 1; \
- \
- gpg->statusbuf = g_realloc (gpg->statusbuf, slen + 1); \
- gpg->statusptr = gpg->statusbuf + soff; \
- gpg->statusleft = slen - soff; \
- } \
- \
- memcpy (gpg->statusptr, start, len); \
- gpg->statusptr += len; \
- gpg->statusleft -= len; \
+#define status_backup(gpg, start, len) G_STMT_START { \
+ if (gpg->statusleft <= len) { \
+ guint slen, soff; \
+ \
+ slen = soff = gpg->statusptr - gpg->statusbuf; \
+ slen = slen ? slen : 1; \
+ \
+ while (slen < soff + len) \
+ slen <<= 1; \
+ \
+ gpg->statusbuf = g_realloc (gpg->statusbuf, slen + 1); \
+ gpg->statusptr = gpg->statusbuf + soff; \
+ gpg->statusleft = slen - soff; \
+ } \
+ \
+ memcpy (gpg->statusptr, start, len); \
+ gpg->statusptr += len; \
+ gpg->statusleft -= len; \
} G_STMT_END
static void
diff --git a/camel/camel-lock.c b/camel/camel-lock.c
index 768f929..c719803 100644
--- a/camel/camel-lock.c
+++ b/camel/camel-lock.c
@@ -103,7 +103,6 @@ camel_lock_dot (const gchar *path,
if (retry > 0)
sleep (CAMEL_LOCK_DOT_DELAY);
-
g_snprintf (locktmp, locktmp_len, "%sXXXXXX", path);
fdtmp = g_mkstemp (locktmp);
if (fdtmp == -1) {
diff --git a/camel/camel-mime-filter-gzip.c b/camel/camel-mime-filter-gzip.c
index 77eac48..6184ac4 100644
--- a/camel/camel-mime-filter-gzip.c
+++ b/camel/camel-mime-filter-gzip.c
@@ -38,11 +38,11 @@
/* rfc1952 */
enum {
- GZIP_FLAG_FTEXT = (1 << 0),
- GZIP_FLAG_FHCRC = (1 << 1),
- GZIP_FLAG_FEXTRA = (1 << 2),
- GZIP_FLAG_FNAME = (1 << 3),
- GZIP_FLAG_FCOMMENT = (1 << 4),
+ GZIP_FLAG_FTEXT = (1 << 0),
+ GZIP_FLAG_FHCRC = (1 << 1),
+ GZIP_FLAG_FEXTRA = (1 << 2),
+ GZIP_FLAG_FNAME = (1 << 3),
+ GZIP_FLAG_FCOMMENT = (1 << 4),
GZIP_FLAG_RESERVED0 = (1 << 5),
GZIP_FLAG_RESERVED1 = (1 << 6),
GZIP_FLAG_RESERVED2 = (1 << 7)
diff --git a/camel/camel-mime-filter-tohtml.c b/camel/camel-mime-filter-tohtml.c
index 4d8e753..ef28c1e 100644
--- a/camel/camel-mime-filter-tohtml.c
+++ b/camel/camel-mime-filter-tohtml.c
@@ -44,7 +44,7 @@ struct _CamelMimeFilterToHTMLPrivate {
guint blockquote_depth;
- guint32 column : 31;
+ guint32 column : 31;
guint32 pre_open : 1;
};
diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
index 0c22bfd..12605e4 100644
--- a/camel/camel-mime-parser.c
+++ b/camel/camel-mime-parser.c
@@ -1182,26 +1182,26 @@ header_append_mempool (struct _header_scan_state *s,
* remove trailing \r chars (\n's assumed already removed)
* and track the start offset of the header */
/* Basically an optimised version of g_byte_array_append() */
-#define header_append(s, start, inptr) \
-{ \
- register gint headerlen = inptr - start; \
- \
- if (headerlen > 0) { \
- if (headerlen >= (s->outend - s->outptr)) { \
- register gchar *outnew; \
- register gint olen = ((s->outend - s->outbuf) + headerlen) * 2 + 1; \
- outnew = g_realloc (s->outbuf, olen); \
- s->outptr = s->outptr - s->outbuf + outnew; \
- s->outbuf = outnew; \
- s->outend = outnew + olen; \
- } \
- if (start[headerlen - 1] == '\r') \
- headerlen--; \
- memcpy (s->outptr, start, headerlen); \
- s->outptr += headerlen; \
- } \
- if (s->header_start == -1) \
- s->header_start = (start - s->inbuf) + s->seek; \
+#define header_append(s, start, inptr) \
+{ \
+ register gint headerlen = inptr - start; \
+ \
+ if (headerlen > 0) { \
+ if (headerlen >= (s->outend - s->outptr)) { \
+ register gchar *outnew; \
+ register gint olen = ((s->outend - s->outbuf) + headerlen) * 2 + 1; \
+ outnew = g_realloc (s->outbuf, olen); \
+ s->outptr = s->outptr - s->outbuf + outnew; \
+ s->outbuf = outnew; \
+ s->outend = outnew + olen; \
+ } \
+ if (start[headerlen - 1] == '\r') \
+ headerlen--; \
+ memcpy (s->outptr, start, headerlen); \
+ s->outptr += headerlen; \
+ } \
+ if (s->header_start == -1) \
+ s->header_start = (start - s->inbuf) + s->seek; \
}
static struct _header_scan_stack *
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index 3fb1ec4..747e857 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -523,15 +523,15 @@ camel_quoted_encode_step (guchar *in,
register gint sofar = *save; /* keeps track of how many chars on a line */
register gint last = *statep; /* keeps track if last gchar to end was a space cr etc */
- #define output_last() \
- if (sofar + 3 > 74) { \
- *outptr++ = '='; \
- *outptr++ = '\n'; \
- sofar = 0; \
- } \
- *outptr++ = '='; \
- *outptr++ = tohex[(last >> 4) & 0xf]; \
- *outptr++ = tohex[last & 0xf]; \
+ #define output_last() \
+ if (sofar + 3 > 74) { \
+ *outptr++ = '='; \
+ *outptr++ = '\n'; \
+ sofar = 0; \
+ } \
+ *outptr++ = '='; \
+ *outptr++ = tohex[(last >> 4) & 0xf]; \
+ *outptr++ = tohex[last & 0xf]; \
sofar += 3;
inptr = in;
diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h
index a207a0b..29413d0 100644
--- a/camel/camel-mime-utils.h
+++ b/camel/camel-mime-utils.h
@@ -240,13 +240,13 @@ gsize camel_quoted_encode_close (guchar *in, gsize len, guchar *out, gint *state
/* camel ctype type functions for rfc822/rfc2047/other, which are non-locale specific */
enum {
- CAMEL_MIME_IS_CTRL = 1 << 0,
- CAMEL_MIME_IS_LWSP = 1 << 1,
- CAMEL_MIME_IS_TSPECIAL = 1 << 2,
- CAMEL_MIME_IS_SPECIAL = 1 << 3,
- CAMEL_MIME_IS_SPACE = 1 << 4,
- CAMEL_MIME_IS_DSPECIAL = 1 << 5,
- CAMEL_MIME_IS_QPSAFE = 1 << 6,
+ CAMEL_MIME_IS_CTRL = 1 << 0,
+ CAMEL_MIME_IS_LWSP = 1 << 1,
+ CAMEL_MIME_IS_TSPECIAL = 1 << 2,
+ CAMEL_MIME_IS_SPECIAL = 1 << 3,
+ CAMEL_MIME_IS_SPACE = 1 << 4,
+ CAMEL_MIME_IS_DSPECIAL = 1 << 5,
+ CAMEL_MIME_IS_QPSAFE = 1 << 6,
CAMEL_MIME_IS_ESAFE = 1 << 7, /* encoded word safe */
CAMEL_MIME_IS_PSAFE = 1 << 8, /* encoded word in phrase safe */
CAMEL_MIME_IS_ATTRCHAR = 1 << 9 /* attribute-char safe (rfc2184) */
diff --git a/camel/camel-msgport.c b/camel/camel-msgport.c
index 2e0050f..fee65b9 100644
--- a/camel/camel-msgport.c
+++ b/camel/camel-msgport.c
@@ -48,7 +48,7 @@
/* message flags */
enum {
- MSG_FLAG_SYNC_WITH_PIPE = 1 << 0,
+ MSG_FLAG_SYNC_WITH_PIPE = 1 << 0,
MSG_FLAG_SYNC_WITH_PR_PIPE = 1 << 1
};
diff --git a/camel/camel-net-utils.c b/camel/camel-net-utils.c
index c428c15..32683c0 100644
--- a/camel/camel-net-utils.c
+++ b/camel/camel-net-utils.c
@@ -92,78 +92,78 @@ G_LOCK_DEFINE_STATIC (gethost_mutex);
#define ALIGN(x) (((x) + (sizeof (gchar *) - 1)) & ~(sizeof (gchar *) - 1))
-#define GETHOST_PROCESS(h, host, buf, buflen, herr) G_STMT_START { \
- gint num_aliases = 0, num_addrs = 0; \
- gint req_length; \
- gchar *p; \
- gint i; \
- \
- /* check to make sure we have enough room in our buffer */ \
- req_length = 0; \
- if (h->h_aliases) { \
- for (i = 0; h->h_aliases[i]; i++) \
- req_length += strlen (h->h_aliases[i]) + 1; \
- num_aliases = i; \
- } \
- \
- if (h->h_addr_list) { \
- for (i = 0; h->h_addr_list[i]; i++) \
- req_length += h->h_length; \
- num_addrs = i; \
- } \
- \
- req_length += sizeof (gchar *) * (num_aliases + 1); \
- req_length += sizeof (gchar *) * (num_addrs + 1); \
- req_length += strlen (h->h_name) + 1; \
- \
- if (buflen < req_length) { \
- *herr = ERANGE; \
- G_UNLOCK (gethost_mutex); \
- return ERANGE; \
- } \
- \
- /* we store the alias/addr pointers in the buffer */ \
- /* their addresses here. */ \
- p = buf; \
- if (num_aliases) { \
- host->h_aliases = (gchar **) p; \
- p += sizeof (gchar *) * (num_aliases + 1); \
- } else \
- host->h_aliases = NULL; \
- \
- if (num_addrs) { \
- host->h_addr_list = (gchar **) p; \
- p += sizeof (gchar *) * (num_addrs + 1); \
- } else \
- host->h_addr_list = NULL; \
- \
- /* copy the host name into the buffer */ \
- host->h_name = p; \
- strcpy (p, h->h_name); \
- p += strlen (h->h_name) + 1; \
- host->h_addrtype = h->h_addrtype; \
- host->h_length = h->h_length; \
- \
- /* copy the aliases/addresses into the buffer */ \
- /* and assign pointers into the hostent */ \
- *p = 0; \
- if (num_aliases) { \
- for (i = 0; i < num_aliases; i++) { \
- strcpy (p, h->h_aliases[i]); \
- host->h_aliases[i] = p; \
- p += strlen (h->h_aliases[i]); \
- } \
- host->h_aliases[num_aliases] = NULL; \
- } \
- \
- if (num_addrs) { \
- for (i = 0; i < num_addrs; i++) { \
- memcpy (p, h->h_addr_list[i], h->h_length); \
- host->h_addr_list[i] = p; \
- p += h->h_length; \
- } \
- host->h_addr_list[num_addrs] = NULL; \
- } \
+#define GETHOST_PROCESS(h, host, buf, buflen, herr) G_STMT_START { \
+ gint num_aliases = 0, num_addrs = 0; \
+ gint req_length; \
+ gchar *p; \
+ gint i; \
+ \
+ /* check to make sure we have enough room in our buffer */ \
+ req_length = 0; \
+ if (h->h_aliases) { \
+ for (i = 0; h->h_aliases[i]; i++) \
+ req_length += strlen (h->h_aliases[i]) + 1; \
+ num_aliases = i; \
+ } \
+ \
+ if (h->h_addr_list) { \
+ for (i = 0; h->h_addr_list[i]; i++) \
+ req_length += h->h_length; \
+ num_addrs = i; \
+ } \
+ \
+ req_length += sizeof (gchar *) * (num_aliases + 1); \
+ req_length += sizeof (gchar *) * (num_addrs + 1); \
+ req_length += strlen (h->h_name) + 1; \
+ \
+ if (buflen < req_length) { \
+ *herr = ERANGE; \
+ G_UNLOCK (gethost_mutex); \
+ return ERANGE; \
+ } \
+ \
+ /* we store the alias/addr pointers in the buffer */ \
+ /* their addresses here. */ \
+ p = buf; \
+ if (num_aliases) { \
+ host->h_aliases = (gchar **) p; \
+ p += sizeof (gchar *) * (num_aliases + 1); \
+ } else \
+ host->h_aliases = NULL; \
+ \
+ if (num_addrs) { \
+ host->h_addr_list = (gchar **) p; \
+ p += sizeof (gchar *) * (num_addrs + 1); \
+ } else \
+ host->h_addr_list = NULL; \
+ \
+ /* copy the host name into the buffer */ \
+ host->h_name = p; \
+ strcpy (p, h->h_name); \
+ p += strlen (h->h_name) + 1; \
+ host->h_addrtype = h->h_addrtype; \
+ host->h_length = h->h_length; \
+ \
+ /* copy the aliases/addresses into the buffer */ \
+ /* and assign pointers into the hostent */ \
+ *p = 0; \
+ if (num_aliases) { \
+ for (i = 0; i < num_aliases; i++) { \
+ strcpy (p, h->h_aliases[i]); \
+ host->h_aliases[i] = p; \
+ p += strlen (h->h_aliases[i]); \
+ } \
+ host->h_aliases[num_aliases] = NULL; \
+ } \
+ \
+ if (num_addrs) { \
+ for (i = 0; i < num_addrs; i++) { \
+ memcpy (p, h->h_addr_list[i], h->h_length); \
+ host->h_addr_list[i] = p; \
+ p += h->h_length; \
+ } \
+ host->h_addr_list[num_addrs] = NULL; \
+ } \
} G_STMT_END
#ifdef ENABLE_IPv6
diff --git a/camel/camel-partition-table.c b/camel/camel-partition-table.c
index 4d5bc18..9efe624 100644
--- a/camel/camel-partition-table.c
+++ b/camel/camel-partition-table.c
@@ -825,7 +825,7 @@ camel_key_table_set_data (CamelKeyTable *ki,
g_return_val_if_fail (CAMEL_IS_KEY_TABLE (ki), FALSE);
g_return_val_if_fail (keyid != 0, FALSE);
- blockid = keyid & (~(CAMEL_BLOCK_SIZE - 1));
+ blockid = keyid & (~(CAMEL_BLOCK_SIZE - 1));
index = keyid & (CAMEL_BLOCK_SIZE - 1);
bl = camel_block_file_get_block (ki->blocks, blockid);
@@ -862,7 +862,7 @@ camel_key_table_set_flags (CamelKeyTable *ki,
g_return_val_if_fail (CAMEL_IS_KEY_TABLE (ki), FALSE);
g_return_val_if_fail (keyid != 0, FALSE);
- blockid = keyid & (~(CAMEL_BLOCK_SIZE - 1));
+ blockid = keyid & (~(CAMEL_BLOCK_SIZE - 1));
index = keyid & (CAMEL_BLOCK_SIZE - 1);
bl = camel_block_file_get_block (ki->blocks, blockid);
@@ -910,7 +910,7 @@ camel_key_table_lookup (CamelKeyTable *ki,
if (flags)
*flags = 0;
- blockid = keyid & (~(CAMEL_BLOCK_SIZE - 1));
+ blockid = keyid & (~(CAMEL_BLOCK_SIZE - 1));
index = keyid & (CAMEL_BLOCK_SIZE - 1);
bl = camel_block_file_get_block (ki->blocks, blockid);
@@ -982,7 +982,7 @@ camel_key_table_next (CamelKeyTable *ki,
next++;
do {
- blockid = next & (~(CAMEL_BLOCK_SIZE - 1));
+ blockid = next & (~(CAMEL_BLOCK_SIZE - 1));
index = next & (CAMEL_BLOCK_SIZE - 1);
bl = camel_block_file_get_block (ki->blocks, blockid);
diff --git a/camel/camel-provider.h b/camel/camel-provider.h
index 820963c..b051fb1 100644
--- a/camel/camel-provider.h
+++ b/camel/camel-provider.h
@@ -79,27 +79,27 @@ extern gchar *camel_provider_type_name[CAMEL_NUM_PROVIDER_TYPES];
/* Providers use these macros to actually define their url_flags */
typedef enum {
- CAMEL_URL_ALLOW_USER = CAMEL_URL_PART_USER,
- CAMEL_URL_ALLOW_AUTH = CAMEL_URL_PART_AUTH,
- CAMEL_URL_ALLOW_PASSWORD = CAMEL_URL_PART_PASSWORD,
- CAMEL_URL_ALLOW_HOST = CAMEL_URL_PART_HOST,
- CAMEL_URL_ALLOW_PORT = CAMEL_URL_PART_PORT,
- CAMEL_URL_ALLOW_PATH = CAMEL_URL_PART_PATH,
-
- CAMEL_URL_NEED_USER = CAMEL_URL_PART_USER << CAMEL_URL_PART_NEED,
- CAMEL_URL_NEED_AUTH = CAMEL_URL_PART_AUTH << CAMEL_URL_PART_NEED,
- CAMEL_URL_NEED_PASSWORD = CAMEL_URL_PART_PASSWORD << CAMEL_URL_PART_NEED,
- CAMEL_URL_NEED_HOST = CAMEL_URL_PART_HOST << CAMEL_URL_PART_NEED,
- CAMEL_URL_NEED_PORT = CAMEL_URL_PART_PORT << CAMEL_URL_PART_NEED,
- CAMEL_URL_NEED_PATH = CAMEL_URL_PART_PATH << CAMEL_URL_PART_NEED,
- CAMEL_URL_NEED_PATH_DIR = CAMEL_URL_PART_PATH_DIR << CAMEL_URL_PART_NEED,
-
- CAMEL_URL_HIDDEN_USER = CAMEL_URL_PART_USER << CAMEL_URL_PART_HIDDEN,
- CAMEL_URL_HIDDEN_AUTH = CAMEL_URL_PART_AUTH << CAMEL_URL_PART_HIDDEN,
- CAMEL_URL_HIDDEN_PASSWORD = CAMEL_URL_PART_PASSWORD << CAMEL_URL_PART_HIDDEN,
- CAMEL_URL_HIDDEN_HOST = CAMEL_URL_PART_HOST << CAMEL_URL_PART_HIDDEN,
- CAMEL_URL_HIDDEN_PORT = CAMEL_URL_PART_PORT << CAMEL_URL_PART_HIDDEN,
- CAMEL_URL_HIDDEN_PATH = CAMEL_URL_PART_PATH << CAMEL_URL_PART_HIDDEN,
+ CAMEL_URL_ALLOW_USER = CAMEL_URL_PART_USER,
+ CAMEL_URL_ALLOW_AUTH = CAMEL_URL_PART_AUTH,
+ CAMEL_URL_ALLOW_PASSWORD = CAMEL_URL_PART_PASSWORD,
+ CAMEL_URL_ALLOW_HOST = CAMEL_URL_PART_HOST,
+ CAMEL_URL_ALLOW_PORT = CAMEL_URL_PART_PORT,
+ CAMEL_URL_ALLOW_PATH = CAMEL_URL_PART_PATH,
+
+ CAMEL_URL_NEED_USER = CAMEL_URL_PART_USER << CAMEL_URL_PART_NEED,
+ CAMEL_URL_NEED_AUTH = CAMEL_URL_PART_AUTH << CAMEL_URL_PART_NEED,
+ CAMEL_URL_NEED_PASSWORD = CAMEL_URL_PART_PASSWORD << CAMEL_URL_PART_NEED,
+ CAMEL_URL_NEED_HOST = CAMEL_URL_PART_HOST << CAMEL_URL_PART_NEED,
+ CAMEL_URL_NEED_PORT = CAMEL_URL_PART_PORT << CAMEL_URL_PART_NEED,
+ CAMEL_URL_NEED_PATH = CAMEL_URL_PART_PATH << CAMEL_URL_PART_NEED,
+ CAMEL_URL_NEED_PATH_DIR = CAMEL_URL_PART_PATH_DIR << CAMEL_URL_PART_NEED,
+
+ CAMEL_URL_HIDDEN_USER = CAMEL_URL_PART_USER << CAMEL_URL_PART_HIDDEN,
+ CAMEL_URL_HIDDEN_AUTH = CAMEL_URL_PART_AUTH << CAMEL_URL_PART_HIDDEN,
+ CAMEL_URL_HIDDEN_PASSWORD = CAMEL_URL_PART_PASSWORD << CAMEL_URL_PART_HIDDEN,
+ CAMEL_URL_HIDDEN_HOST = CAMEL_URL_PART_HOST << CAMEL_URL_PART_HIDDEN,
+ CAMEL_URL_HIDDEN_PORT = CAMEL_URL_PART_PORT << CAMEL_URL_PART_HIDDEN,
+ CAMEL_URL_HIDDEN_PATH = CAMEL_URL_PART_PATH << CAMEL_URL_PART_HIDDEN,
CAMEL_URL_FRAGMENT_IS_PATH = 1 << 30, /* url uses fragment for folder name path, not path */
CAMEL_URL_PATH_IS_ABSOLUTE = 1 << 31,
diff --git a/camel/camel-sasl-ntlm.c b/camel/camel-sasl-ntlm.c
index 112abae..1387bb7 100644
--- a/camel/camel-sasl-ntlm.c
+++ b/camel/camel-sasl-ntlm.c
@@ -268,7 +268,7 @@ md4sum (const guchar *in,
for (i = 0; i < nbytes + pbytes + 8; i += 64) {
for (j = 0; j < 16; j++) {
- X[j] = (M[i + j * 4]) |
+ X[j] = (M[i + j * 4]) |
(M[i + j * 4 + 1] << 8) |
(M[i + j * 4 + 2] << 16) |
(M[i + j * 4 + 3] << 24);
@@ -336,20 +336,20 @@ md4sum (const guchar *in,
D += DD;
}
- digest[0] = A & 0xFF;
- digest[1] = (A >> 8) & 0xFF;
- digest[2] = (A >> 16) & 0xFF;
- digest[3] = (A >> 24) & 0xFF;
- digest[4] = B & 0xFF;
- digest[5] = (B >> 8) & 0xFF;
- digest[6] = (B >> 16) & 0xFF;
- digest[7] = (B >> 24) & 0xFF;
- digest[8] = C & 0xFF;
- digest[9] = (C >> 8) & 0xFF;
+ digest[0] = A & 0xFF;
+ digest[1] = (A >> 8) & 0xFF;
+ digest[2] = (A >> 16) & 0xFF;
+ digest[3] = (A >> 24) & 0xFF;
+ digest[4] = B & 0xFF;
+ digest[5] = (B >> 8) & 0xFF;
+ digest[6] = (B >> 16) & 0xFF;
+ digest[7] = (B >> 24) & 0xFF;
+ digest[8] = C & 0xFF;
+ digest[9] = (C >> 8) & 0xFF;
digest[10] = (C >> 16) & 0xFF;
digest[11] = (C >> 24) & 0xFF;
- digest[12] = D & 0xFF;
- digest[13] = (D >> 8) & 0xFF;
+ digest[12] = D & 0xFF;
+ digest[13] = (D >> 8) & 0xFF;
digest[14] = (D >> 16) & 0xFF;
digest[15] = (D >> 24) & 0xFF;
}
@@ -568,7 +568,7 @@ des (guint32 ks[16][2],
work = (left ^ right) & 0xaaaaaaaa;
left ^= work;
right ^= work;
- left = (left >> 1) | (left << 31);
+ left = (left >> 1) | (left << 31);
work = ((left >> 8) ^ right) & 0xff00ff;
right ^= work;
left ^= work << 8;
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c
index b3029ab..d3fd539 100644
--- a/camel/camel-search-private.c
+++ b/camel/camel-search-private.c
@@ -257,14 +257,14 @@ camel_ustrstrcase (const gchar *haystack,
return NULL;
}
-#define CAMEL_SEARCH_COMPARE(x, y, z) G_STMT_START { \
- if ((x) == (z)) { \
- if ((y) == (z)) \
- return 0; \
- else \
- return -1; \
- } else if ((y) == (z)) \
- return 1; \
+#define CAMEL_SEARCH_COMPARE(x, y, z) G_STMT_START { \
+ if ((x) == (z)) { \
+ if ((y) == (z)) \
+ return 0; \
+ else \
+ return -1; \
+ } else if ((y) == (z)) \
+ return 1; \
} G_STMT_END
static gint
diff --git a/camel/camel-search-sql-sexp.c b/camel/camel-search-sql-sexp.c
index 774bba1..878c5d3 100644
--- a/camel/camel-search-sql-sexp.c
+++ b/camel/camel-search-sql-sexp.c
@@ -98,7 +98,7 @@ func_and (CamelSExp *f,
continue;
}
if (r1->value.string && *r1->value.string)
- g_string_append_printf (string, "%s%s", r1->value.string, ((argc > 1) && (i != argc -
1)) ? " AND ":"");
+ g_string_append_printf (string, "%s%s", r1->value.string, ((argc > 1) && (i != argc -
1)) ? " AND ":"");
camel_sexp_result_free (f, r1);
}
g_string_append (string, " )");
@@ -133,7 +133,7 @@ func_or (CamelSExp *f,
camel_sexp_result_free (f, r1);
continue;
}
- g_string_append_printf (string, "%s%s", r1->value.string, ((argc > 1) && (i != argc - 1)) ?
" OR ":"");
+ g_string_append_printf (string, "%s%s", r1->value.string, ((argc > 1) && (i != argc - 1)) ? "
OR ":"");
camel_sexp_result_free (f, r1);
}
g_string_append (string, " )");
@@ -346,7 +346,7 @@ match_threads (struct _CamelSExp *f,
for (i = 1; i < argc; i++) {
r = camel_sexp_term_eval (f, argv[i]);
- g_string_append_printf (str, "%s%s", r->value.string, ((argc > 1) && (i != argc - 1)) ? "
AND ":"");
+ g_string_append_printf (str, "%s%s", r->value.string, ((argc > 1) && (i != argc - 1)) ? " AND
":"");
camel_sexp_result_free (f, r);
}
diff --git a/camel/camel-service.c b/camel/camel-service.c
index 2fea2e8..53d3f4c 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -1127,8 +1127,9 @@ camel_service_migrate_files (CamelService *service)
* it to the new data directory. Failure is non-fatal. */
if (old_data_dir != NULL) {
if (g_rename (old_data_dir, new_data_dir) == -1) {
- g_warning ("%s: Failed to rename '%s' to '%s': %s",
- G_STRFUNC, old_data_dir, new_data_dir, g_strerror (errno));
+ g_warning (
+ "%s: Failed to rename '%s' to '%s': %s",
+ G_STRFUNC, old_data_dir, new_data_dir, g_strerror (errno));
}
g_free (old_data_dir);
}
diff --git a/camel/camel-session.c b/camel/camel-session.c
index 98d1997..f166856 100644
--- a/camel/camel-session.c
+++ b/camel/camel-session.c
@@ -74,7 +74,7 @@ struct _CamelSessionPrivate {
GMainContext *main_context;
- guint online : 1;
+ guint online : 1;
};
struct _AsyncContext {
diff --git a/camel/camel-store-summary.c b/camel/camel-store-summary.c
index a38ebdf..619eeb6 100644
--- a/camel/camel-store-summary.c
+++ b/camel/camel-store-summary.c
@@ -267,7 +267,7 @@ camel_store_summary_class_init (CamelStoreSummaryClass *class)
class->store_info_size = sizeof (CamelStoreInfo);
class->summary_header_load = store_summary_summary_header_load;
class->summary_header_save = store_summary_summary_header_save;
- class->store_info_new = store_summary_store_info_new;
+ class->store_info_new = store_summary_store_info_new;
class->store_info_load = store_summary_store_info_load;
class->store_info_save = store_summary_store_info_save;
class->store_info_free = store_summary_store_info_free;
diff --git a/camel/camel-store.h b/camel/camel-store.h
index d15f7c6..d77dd39 100644
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -98,8 +98,8 @@ typedef struct _CamelStorePrivate CamelStorePrivate;
/* open mode for folder */
typedef enum {
- CAMEL_STORE_FOLDER_CREATE = 1 << 0,
- CAMEL_STORE_FOLDER_EXCL = 1 << 1,
+ CAMEL_STORE_FOLDER_CREATE = 1 << 0,
+ CAMEL_STORE_FOLDER_EXCL = 1 << 1,
CAMEL_STORE_FOLDER_BODY_INDEX = 1 << 2,
CAMEL_STORE_FOLDER_PRIVATE = 1 << 3 /* a private folder that
should not show up in
diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c
index 936211e..a05630f 100644
--- a/camel/camel-text-index.c
+++ b/camel/camel-text-index.c
@@ -1025,8 +1025,9 @@ camel_text_index_rename (const gchar *old,
g_snprintf (oldname, oldname_len, "%s.index", old);
g_snprintf (newname, newname_len, "%s.index", new);
if (g_rename (newname, oldname) == -1) {
- g_warning ("%s: Failed to rename '%s' to '%s': %s",
- G_STRFUNC, newname, oldname, g_strerror (errno));
+ g_warning (
+ "%s: Failed to rename '%s' to '%s': %s",
+ G_STRFUNC, newname, oldname, g_strerror (errno));
}
errno = err;
return -1;
diff --git a/camel/camel-url-scanner.c b/camel/camel-url-scanner.c
index 1bae03d..8c2dd35 100644
--- a/camel/camel-url-scanner.c
+++ b/camel/camel-url-scanner.c
@@ -132,14 +132,14 @@ static guchar url_scanner_table[256] = {
};
enum {
- IS_CTRL = (1 << 0),
- IS_ALPHA = (1 << 1),
- IS_DIGIT = (1 << 2),
- IS_LWSP = (1 << 3),
- IS_SPACE = (1 << 4),
- IS_SPECIAL = (1 << 5),
- IS_DOMAIN = (1 << 6),
- IS_URLSAFE = (1 << 7)
+ IS_CTRL = (1 << 0),
+ IS_ALPHA = (1 << 1),
+ IS_DIGIT = (1 << 2),
+ IS_LWSP = (1 << 3),
+ IS_SPACE = (1 << 4),
+ IS_SPECIAL = (1 << 5),
+ IS_DOMAIN = (1 << 6),
+ IS_URLSAFE = (1 << 7)
};
#define is_ctrl(x) ((url_scanner_table[(guchar)(x)] & IS_CTRL) != 0)
diff --git a/camel/camel-url.h b/camel/camel-url.h
index 660a10d..9d1f748 100644
--- a/camel/camel-url.h
+++ b/camel/camel-url.h
@@ -52,8 +52,8 @@ struct _CamelURL {
};
typedef enum {
- CAMEL_URL_HIDE_PARAMS = 1 << 0,
- CAMEL_URL_HIDE_AUTH = 1 << 1
+ CAMEL_URL_HIDE_PARAMS = 1 << 0,
+ CAMEL_URL_HIDE_AUTH = 1 << 1
} CamelURLFlags;
#define CAMEL_URL_HIDE_ALL \
diff --git a/camel/camel-vee-summary.c b/camel/camel-vee-summary.c
index ec70318..1e07053 100644
--- a/camel/camel-vee-summary.c
+++ b/camel/camel-vee-summary.c
@@ -134,7 +134,7 @@ vee_info_user_flag (const CamelMessageInfo *mi,
gboolean ret;
HANDLE_NULL_INFO (FALSE);
- ret = camel_message_info_user_flag (rmi, id);
+ ret = camel_message_info_user_flag (rmi, id);
camel_message_info_unref (rmi);
return ret;
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 81babb7..8c6da08 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -548,12 +548,12 @@ add_initial_untagged_descriptor (GHashTable *untagged_handlers,
guint untagged_id)
{
const CamelIMAPXUntaggedRespHandlerDesc *prev = NULL;
- const CamelIMAPXUntaggedRespHandlerDesc *cur = NULL;
+ const CamelIMAPXUntaggedRespHandlerDesc *cur = NULL;
g_return_if_fail (untagged_handlers != NULL);
g_return_if_fail (untagged_id < IMAPX_UNTAGGED_LAST_ID);
- cur = &(_untagged_descr[untagged_id]);
+ cur = &(_untagged_descr[untagged_id]);
prev = replace_untagged_descriptor (
untagged_handlers,
cur->untagged_response,
@@ -3228,7 +3228,7 @@ imapx_step (CamelIMAPXServer *is,
gint tok;
gboolean success = FALSE;
- // poll ? wait for other stuff? loop?
+ // poll ? wait for other stuff? loop?
tok = camel_imapx_stream_token (
stream, &token, &len, cancellable, error);
@@ -4313,7 +4313,7 @@ imapx_connect_to_server (CamelIMAPXServer *is,
CAMEL_IMAPX_STREAM (imapx_stream)->tagprefix = is->tagprefix;
while (1) {
- // poll ? wait for other stuff? loop?
+ // poll ? wait for other stuff? loop?
if (camel_application_is_exiting || is->priv->parser_quit) {
g_set_error (
error, G_IO_ERROR,
diff --git a/camel/providers/imapx/camel-imapx-utils.c b/camel/providers/imapx/camel-imapx-utils.c
index 140ae17..3107313 100644
--- a/camel/providers/imapx/camel-imapx-utils.c
+++ b/camel/providers/imapx/camel-imapx-utils.c
@@ -39,9 +39,9 @@ gint camel_imapx_debug_flags;
extern gint camel_verbose_debug;
#define debug_set_flag(flag) do { \
- if ((CAMEL_IMAPX_DEBUG_ALL & CAMEL_IMAPX_DEBUG_ ## flag) && \
- camel_debug ("imapx:" #flag)) \
- camel_imapx_debug_flags |= CAMEL_IMAPX_DEBUG_ ## flag; \
+ if ((CAMEL_IMAPX_DEBUG_ALL & CAMEL_IMAPX_DEBUG_ ## flag) && \
+ camel_debug ("imapx:" #flag)) \
+ camel_imapx_debug_flags |= CAMEL_IMAPX_DEBUG_ ## flag; \
} while (0)
static void camel_imapx_set_debug_flags (void)
diff --git a/camel/providers/imapx/camel-imapx-utils.h b/camel/providers/imapx/camel-imapx-utils.h
index 8ae8450..cb2b615 100644
--- a/camel/providers/imapx/camel-imapx-utils.h
+++ b/camel/providers/imapx/camel-imapx-utils.h
@@ -170,22 +170,22 @@ gchar * camel_imapx_dup_uid_from_summary_index
((info) != NULL && ((info)->capa & IMAPX_CAPABILITY_##name) == 0)
enum {
- IMAPX_CAPABILITY_IMAP4 = (1 << 0),
- IMAPX_CAPABILITY_IMAP4REV1 = (1 << 1),
- IMAPX_CAPABILITY_STATUS = (1 << 2),
- IMAPX_CAPABILITY_NAMESPACE = (1 << 3),
- IMAPX_CAPABILITY_UIDPLUS = (1 << 4),
- IMAPX_CAPABILITY_LITERALPLUS = (1 << 5),
- IMAPX_CAPABILITY_STARTTLS = (1 << 6),
- IMAPX_CAPABILITY_IDLE = (1 << 7),
- IMAPX_CAPABILITY_CONDSTORE = (1 << 8),
- IMAPX_CAPABILITY_QRESYNC = (1 << 9),
- IMAPX_CAPABILITY_LIST_STATUS = (1 << 10),
- IMAPX_CAPABILITY_LIST_EXTENDED = (1 << 11),
- IMAPX_CAPABILITY_QUOTA = (1 << 12),
- IMAPX_CAPABILITY_MOVE = (1 << 13),
- IMAPX_CAPABILITY_NOTIFY = (1 << 14),
- IMAPX_CAPABILITY_SPECIAL_USE = (1 << 15)
+ IMAPX_CAPABILITY_IMAP4 = (1 << 0),
+ IMAPX_CAPABILITY_IMAP4REV1 = (1 << 1),
+ IMAPX_CAPABILITY_STATUS = (1 << 2),
+ IMAPX_CAPABILITY_NAMESPACE = (1 << 3),
+ IMAPX_CAPABILITY_UIDPLUS = (1 << 4),
+ IMAPX_CAPABILITY_LITERALPLUS = (1 << 5),
+ IMAPX_CAPABILITY_STARTTLS = (1 << 6),
+ IMAPX_CAPABILITY_IDLE = (1 << 7),
+ IMAPX_CAPABILITY_CONDSTORE = (1 << 8),
+ IMAPX_CAPABILITY_QRESYNC = (1 << 9),
+ IMAPX_CAPABILITY_LIST_STATUS = (1 << 10),
+ IMAPX_CAPABILITY_LIST_EXTENDED = (1 << 11),
+ IMAPX_CAPABILITY_QUOTA = (1 << 12),
+ IMAPX_CAPABILITY_MOVE = (1 << 13),
+ IMAPX_CAPABILITY_NOTIFY = (1 << 14),
+ IMAPX_CAPABILITY_SPECIAL_USE = (1 << 15)
};
struct _capability_info {
diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c
index 14a5d78..0abd11e 100644
--- a/camel/providers/local/camel-local-summary.c
+++ b/camel/providers/local/camel-local-summary.c
@@ -127,7 +127,7 @@ camel_local_summary_class_init (CamelLocalSummaryClass *class)
folder_summary_class->content_info_size = sizeof (CamelMessageContentInfo);
folder_summary_class->summary_header_from_db = summary_header_from_db;
folder_summary_class->summary_header_to_db = summary_header_to_db;
- folder_summary_class->message_info_new_from_header = message_info_new_from_header;
+ folder_summary_class->message_info_new_from_header = message_info_new_from_header;
class->load = local_summary_load;
class->check = local_summary_check;
diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index de5abf5..f0e3938 100644
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -1113,7 +1113,7 @@ scan_old_dir_info (CamelStore *store,
fi->display_name = g_strdup (d->d_name);
snew->fi = fi;
- last->next = snew->fi;
+ last->next = snew->fi;
last = snew->fi;
snew->fi->parent = sn->fi;
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index 79d6b3e..da3f58f 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -183,7 +183,7 @@ camel_mbox_summary_class_init (CamelMboxSummaryClass *class)
folder_summary_class->summary_header_to_db = summary_header_to_db;
folder_summary_class->message_info_from_db = message_info_from_db;
folder_summary_class->message_info_to_db = message_info_to_db;
- folder_summary_class->message_info_new_from_header = message_info_new_from_header;
+ folder_summary_class->message_info_new_from_header = message_info_new_from_header;
folder_summary_class->message_info_new_from_parser = message_info_new_from_parser;
folder_summary_class->info_set_user_flag = mbox_info_set_user_flag;
folder_summary_class->info_set_user_tag = mbox_info_set_user_tag;
@@ -939,8 +939,9 @@ mbox_summary_sync_quick (CamelMboxSummary *mbs,
} while (len == -1 && errno == EINTR);
if (lastpos != -1 && lseek (fd, lastpos, SEEK_SET) == (off_t) -1) {
- g_warning ("%s: Failed to rewind file to last position: %s",
- G_STRFUNC, g_strerror (errno));
+ g_warning (
+ "%s: Failed to rewind file to last position: %s",
+ G_STRFUNC, g_strerror (errno));
}
g_free (xevnew);
diff --git a/camel/providers/local/camel-mh-summary.c b/camel/providers/local/camel-mh-summary.c
index 751af54..8596cba 100644
--- a/camel/providers/local/camel-mh-summary.c
+++ b/camel/providers/local/camel-mh-summary.c
@@ -353,8 +353,8 @@ mh_summary_sync (CamelLocalSummary *cls,
static gint
mh_summary_decode_x_evolution (CamelLocalSummary *cls,
- const gchar *xev,
- CamelLocalMessageInfo *info)
+ const gchar *xev,
+ CamelLocalMessageInfo *info)
{
CamelLocalSummaryClass *local_summary_class;
CamelMhSummary *mh_summary;
diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c
index bfd8de7..d3e88fd 100644
--- a/camel/providers/nntp/camel-nntp-summary.c
+++ b/camel/providers/nntp/camel-nntp-summary.c
@@ -489,7 +489,7 @@ camel_nntp_summary_check (CamelNNTPSummary *cns,
const gchar *uid;
const gchar *msgid;
- uid = g_ptr_array_index (known_uids, i);
+ uid = g_ptr_array_index (known_uids, i);
n = strtoul (uid, NULL, 10);
if (n < f || n > l) {
diff --git a/camel/providers/pop3/camel-pop3-engine.h b/camel/providers/pop3/camel-pop3-engine.h
index de09de5..1658361 100644
--- a/camel/providers/pop3/camel-pop3-engine.h
+++ b/camel/providers/pop3/camel-pop3-engine.h
@@ -81,7 +81,7 @@ enum {
CAMEL_POP3_CAP_APOP = 1 << 0,
CAMEL_POP3_CAP_UIDL = 1 << 1,
CAMEL_POP3_CAP_SASL = 1 << 2,
- CAMEL_POP3_CAP_TOP = 1 << 3,
+ CAMEL_POP3_CAP_TOP = 1 << 3,
CAMEL_POP3_CAP_PIPE = 1 << 4,
CAMEL_POP3_CAP_STLS = 1 << 5
};
diff --git a/camel/tests/message/test2.c b/camel/tests/message/test2.c
index 7360f64..41f2203 100644
--- a/camel/tests/message/test2.c
+++ b/camel/tests/message/test2.c
@@ -90,7 +90,7 @@ check_address_line_decode (gint i,
addr = camel_internet_address_new ();
check (camel_address_decode (CAMEL_ADDRESS (addr), line) == 1);
check (camel_internet_address_get (CAMEL_INTERNET_ADDRESS (addr), 0, &dname, &demail));
- check_msg (g_strcmp0 (dname, name) == 0 || (!name && dname && !*dname), "decoded name = '%s', but
should be '%s'", dname, name);
+ check_msg (g_strcmp0 (dname, name) == 0 || (!name && dname && !*dname), "decoded name = '%s', but
should be '%s'", dname, name);
check_msg (g_strcmp0 (demail, email) == 0, "decoded email = '%s', but should be '%s'", demail, email);
check_unref (addr, 1);
pull ();
diff --git a/examples/cursor/cursor-data.c b/examples/cursor/cursor-data.c
index e24805f..4faa58f 100644
--- a/examples/cursor/cursor-data.c
+++ b/examples/cursor/cursor-data.c
@@ -34,17 +34,17 @@ static ESource *address_book_source = NULL;
static void
cursor_data_source_added (ESourceRegistry *registry,
- ESource *source,
- gpointer data)
+ ESource *source,
+ gpointer data)
{
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)data;
+ GMainLoop *loop = (GMainLoop *) data;
if (g_strcmp0 (e_source_get_uid (source), CURSOR_DATA_SOURCE_ID) != 0)
return;
/* Open the address book */
- address_book = (EBookClient *)e_book_client_connect_sync (source, NULL, &error);
+ address_book = (EBookClient *) e_book_client_connect_sync (source, NULL, &error);
if (!address_book)
g_error ("Unable to create the test book: %s", error->message);
@@ -86,7 +86,7 @@ contact_from_file (const gchar *vcard_file)
*/
static void
load_contacts (EBookClient *client,
- const gchar *vcard_directory)
+ const gchar *vcard_directory)
{
GDir *dir;
GError *error = NULL;
@@ -158,8 +158,8 @@ get_cursor (EBookClient *book_client)
* getting an EBookClient, and creating our EBookClientCursor.
*/
EBookClient *
-cursor_load_data (const gchar *vcard_path,
- EBookClientCursor **ret_cursor)
+cursor_load_data (const gchar *vcard_path,
+ EBookClientCursor **ret_cursor)
{
ESourceRegistry *registry;
ESource *scratch;
@@ -180,8 +180,9 @@ cursor_load_data (const gchar *vcard_path,
g_error ("Unable to create the registry: %s", error->message);
/* Listen to the registry for our added source */
- g_signal_connect (registry, "source-added",
- G_CALLBACK (cursor_data_source_added), loop);
+ g_signal_connect (
+ registry, "source-added",
+ G_CALLBACK (cursor_data_source_added), loop);
/* Now create a scratch source for our addressbook */
scratch = e_source_new_with_uid (CURSOR_DATA_SOURCE_ID, NULL, &error);
diff --git a/examples/cursor/cursor-example.c b/examples/cursor/cursor-example.c
index ef167be..6151568 100644
--- a/examples/cursor/cursor-example.c
+++ b/examples/cursor/cursor-example.c
@@ -18,7 +18,7 @@
*
* Author: Tristan Van Berkom <tristanvb openismus com>
*/
-
+
#include <libebook/libebook.h>
#include "cursor-example.h"
@@ -165,7 +165,7 @@ cursor_example_init (CursorExample *example)
for (i = 0; i < N_SLOTS; i++) {
gchar *name = g_strdup_printf ("contact_slot_%d", i + 1);
- priv->slots[i] = (GtkWidget *)gtk_widget_get_template_child (GTK_WIDGET (example),
+ priv->slots[i] = (GtkWidget *) gtk_widget_get_template_child (GTK_WIDGET (example),
CURSOR_TYPE_EXAMPLE,
name);
g_free (name);
@@ -173,7 +173,7 @@ cursor_example_init (CursorExample *example)
}
static void
-cursor_example_dispose (GObject *object)
+cursor_example_dispose (GObject *object)
{
CursorExample *example = CURSOR_EXAMPLE (object);
CursorExamplePrivate *priv = example->priv;
@@ -198,8 +198,8 @@ cursor_example_dispose (GObject *object)
************************************************************************/
static gboolean
cursor_example_up_button_press (CursorExample *example,
- GdkEvent *event,
- GtkButton *button)
+ GdkEvent *event,
+ GtkButton *button)
{
d (g_print ("Browse up press\n"));
@@ -214,8 +214,8 @@ cursor_example_up_button_press (CursorExample *example,
static gboolean
cursor_example_up_button_release (CursorExample *example,
- GdkEvent *event,
- GtkButton *button)
+ GdkEvent *event,
+ GtkButton *button)
{
d (g_print ("Browse up release\n"));
@@ -226,8 +226,8 @@ cursor_example_up_button_release (CursorExample *example,
static gboolean
cursor_example_down_button_press (CursorExample *example,
- GdkEvent *event,
- GtkButton *button)
+ GdkEvent *event,
+ GtkButton *button)
{
d (g_print ("Browse down press\n"));
@@ -242,8 +242,8 @@ cursor_example_down_button_press (CursorExample *example,
static gboolean
cursor_example_down_button_release (CursorExample *example,
- GdkEvent *event,
- GtkButton *button)
+ GdkEvent *event,
+ GtkButton *button)
{
d (g_print ("Browse down released\n"));
@@ -253,8 +253,8 @@ cursor_example_down_button_release (CursorExample *example,
}
static void
-cursor_example_navigator_changed (CursorExample *example,
- CursorNavigator *navigator)
+cursor_example_navigator_changed (CursorExample *example,
+ CursorNavigator *navigator)
{
CursorExamplePrivate *priv = example->priv;
GError *error = NULL;
@@ -301,9 +301,9 @@ cursor_example_navigator_changed (CursorExample *example,
}
static void
-cursor_example_sexp_changed (CursorExample *example,
- GParamSpec *pspec,
- CursorSearch *search)
+cursor_example_sexp_changed (CursorExample *example,
+ GParamSpec *pspec,
+ CursorSearch *search)
{
CursorExamplePrivate *priv = example->priv;
gboolean full_results = FALSE;
@@ -337,8 +337,8 @@ cursor_example_sexp_changed (CursorExample *example,
* EDS Callbacks *
************************************************************************/
static void
-cursor_example_refresh (EBookClientCursor *cursor,
- CursorExample *example)
+cursor_example_refresh (EBookClientCursor *cursor,
+ CursorExample *example)
{
d (g_print ("Cursor refreshed\n"));
@@ -349,8 +349,8 @@ cursor_example_refresh (EBookClientCursor *cursor,
static void
cursor_example_alphabet_changed (EBookClientCursor *cursor,
- GParamSpec *spec,
- CursorExample *example)
+ GParamSpec *spec,
+ CursorExample *example)
{
d (g_print ("Alphabet Changed\n"));
@@ -363,8 +363,8 @@ cursor_example_alphabet_changed (EBookClientCursor *cursor,
static void
cursor_example_status_changed (EBookClientCursor *cursor,
- GParamSpec *spec,
- CursorExample *example)
+ GParamSpec *spec,
+ CursorExample *example)
{
d (g_print ("Status changed\n"));
@@ -391,21 +391,22 @@ cursor_example_load_alphabet (CursorExample *example)
}
static gboolean
-cursor_example_move_cursor (CursorExample *example,
- EBookCursorOrigin origin,
- gint count)
+cursor_example_move_cursor (CursorExample *example,
+ EBookCursorOrigin origin,
+ gint count)
{
CursorExamplePrivate *priv = example->priv;
GError *error = NULL;
gint n_results;
- n_results = e_book_client_cursor_step_sync (priv->cursor,
- E_BOOK_CURSOR_STEP_MOVE,
- origin,
- count,
- NULL, /* Result list */
- NULL, /* GCancellable */
- &error);
+ n_results = e_book_client_cursor_step_sync (
+ priv->cursor,
+ E_BOOK_CURSOR_STEP_MOVE,
+ origin,
+ count,
+ NULL, /* Result list */
+ NULL, /* GCancellable */
+ &error);
if (n_results < 0) {
@@ -428,8 +429,6 @@ cursor_example_move_cursor (CursorExample *example,
} else
g_warning ("Failed to move the cursor: %s", error->message);
-
-
g_clear_error (&error);
}
@@ -441,8 +440,8 @@ cursor_example_move_cursor (CursorExample *example,
* FALSE if there was an error.
*/
static gboolean
-cursor_example_load_page (CursorExample *example,
- gboolean *full_results)
+cursor_example_load_page (CursorExample *example,
+ gboolean *full_results)
{
CursorExamplePrivate *priv = example->priv;
GError *error = NULL;
@@ -452,13 +451,14 @@ cursor_example_load_page (CursorExample *example,
/* Fetch N_SLOTS contacts after the current cursor position,
* without modifying the current cursor position
*/
- n_results = e_book_client_cursor_step_sync (priv->cursor,
- E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- N_SLOTS,
- &results,
- NULL, /* GCancellable */
- &error);
+ n_results = e_book_client_cursor_step_sync (
+ priv->cursor,
+ E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ N_SLOTS,
+ &results,
+ NULL, /* GCancellable */
+ &error);
if (n_results < 0) {
if (g_error_matches (error,
@@ -505,7 +505,7 @@ cursor_example_load_page (CursorExample *example,
if (full_results)
*full_results = (n_results == N_SLOTS);
- g_slist_free_full (results, (GDestroyNotify)g_object_unref);
+ g_slist_free_full (results, (GDestroyNotify) g_object_unref);
return n_results >= 0;
}
@@ -560,7 +560,7 @@ cursor_example_update_status (CursorExample *example)
*/
static void
cursor_example_update_current_index (CursorExample *example,
- EContact *contact)
+ EContact *contact)
{
CursorExamplePrivate *priv = example->priv;
const gchar *const *labels;
@@ -612,7 +612,7 @@ cursor_example_timeout (CursorExample *example)
case TIMEOUT_DOWN_TICK:
/* Avoid scrolling past the end of the list - N_SLOTS */
- can_move = (e_book_client_cursor_get_position (priv->cursor) <
+ can_move = (e_book_client_cursor_get_position (priv->cursor) <
e_book_client_cursor_get_total (priv->cursor) - N_SLOTS);
/* Move the cursor forwards by 1 and then refresh the page */
@@ -630,8 +630,8 @@ cursor_example_timeout (CursorExample *example)
}
static void
-cursor_example_ensure_timeout (CursorExample *example,
- TimeoutActivity activity)
+cursor_example_ensure_timeout (CursorExample *example,
+ TimeoutActivity activity)
{
CursorExamplePrivate *priv = example->priv;
guint timeout = 0;
@@ -647,9 +647,10 @@ cursor_example_ensure_timeout (CursorExample *example,
priv->activity = activity;
priv->timeout_id =
- g_timeout_add (timeout,
- (GSourceFunc)cursor_example_timeout,
- example);
+ g_timeout_add (
+ timeout,
+ (GSourceFunc) cursor_example_timeout,
+ example);
}
static void
@@ -673,7 +674,7 @@ cursor_example_new (const gchar *vcard_path)
CursorExamplePrivate *priv;
example = g_object_new (CURSOR_TYPE_EXAMPLE, NULL);
- priv = example->priv;
+ priv = example->priv;
priv->client = cursor_load_data (vcard_path, &priv->cursor);
@@ -695,5 +696,5 @@ cursor_example_new (const gchar *vcard_path)
g_message ("Cursor example started in locale: %s",
e_book_client_get_locale (priv->client));
- return (GtkWidget *)example;
+ return (GtkWidget *) example;
}
diff --git a/examples/cursor/cursor-example.h b/examples/cursor/cursor-example.h
index a68d009..d27a587 100644
--- a/examples/cursor/cursor-example.h
+++ b/examples/cursor/cursor-example.h
@@ -18,7 +18,7 @@
*
* Author: Tristan Van Berkom <tristanvb openismus com>
*/
-
+
#ifndef CURSOR_EXAMPLE_H
#define CURSOR_EXAMPLE_H
diff --git a/examples/cursor/cursor-navigator.c b/examples/cursor/cursor-navigator.c
index a289d0f..cf21bbe 100644
--- a/examples/cursor/cursor-navigator.c
+++ b/examples/cursor/cursor-navigator.c
@@ -18,7 +18,7 @@
*
* Author: Tristan Van Berkom <tristanvb openismus com>
*/
-
+
#include "cursor-navigator.h"
/* GObjectClass */
@@ -33,14 +33,12 @@ static void cursor_navigator_changed (GtkAdjustment *a
GParamSpec *pspec,
CursorNavigator *navigator);
-
struct _CursorNavigatorPrivate {
gchar **alphabet;
gint letters;
gint index;
};
-
enum {
INDEX_CHANGED,
LAST_SIGNAL
@@ -71,11 +69,12 @@ cursor_navigator_class_init (CursorNavigatorClass *klass)
scale_class = GTK_SCALE_CLASS (klass);
scale_class->format_value = cursor_navigator_format_value;
- signals[INDEX_CHANGED] = g_signal_new ("index-changed",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_LAST,
- 0, NULL, NULL, NULL,
- G_TYPE_NONE, 0);
+ signals[INDEX_CHANGED] = g_signal_new (
+ "index-changed",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ 0, NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
g_type_class_add_private (object_class, sizeof (CursorNavigatorPrivate));
}
@@ -86,9 +85,10 @@ cursor_navigator_init (CursorNavigator *navigator)
CursorNavigatorPrivate *priv;
navigator->priv = priv =
- G_TYPE_INSTANCE_GET_PRIVATE (navigator,
- CURSOR_TYPE_NAVIGATOR,
- CursorNavigatorPrivate);
+ G_TYPE_INSTANCE_GET_PRIVATE (
+ navigator,
+ CURSOR_TYPE_NAVIGATOR,
+ CursorNavigatorPrivate);
priv->letters = -1;
}
@@ -104,12 +104,13 @@ cursor_navigator_constructed (GObject *object)
adj = gtk_adjustment_new (0.0F, 0.0F, 1.0F, 1.0F, 1.0F, 0.0F);
gtk_range_set_adjustment (GTK_RANGE (navigator), adj);
- g_signal_connect (adj, "notify::value",
- G_CALLBACK (cursor_navigator_changed), navigator);
+ g_signal_connect (
+ adj, "notify::value",
+ G_CALLBACK (cursor_navigator_changed), navigator);
}
static void
-cursor_navigator_finalize (GObject *object)
+cursor_navigator_finalize (GObject *object)
{
CursorNavigator *navigator = CURSOR_NAVIGATOR (object);
CursorNavigatorPrivate *priv = navigator->priv;
@@ -123,8 +124,8 @@ cursor_navigator_finalize (GObject *object)
* GtkScaleClass *
************************************************************************/
static gchar *
-cursor_navigator_format_value (GtkScale *scale,
- gdouble value)
+cursor_navigator_format_value (GtkScale *scale,
+ gdouble value)
{
CursorNavigator *navigator = CURSOR_NAVIGATOR (scale);
CursorNavigatorPrivate *priv = navigator->priv;
@@ -133,7 +134,7 @@ cursor_navigator_format_value (GtkScale *scale,
if (priv->letters < 0)
return NULL;
- index = CLAMP ((gint)value, 0, priv->letters - 1);
+ index = CLAMP ((gint) value, 0, priv->letters - 1);
/* Return the letter for the gvoidiven value
*/
@@ -141,9 +142,9 @@ cursor_navigator_format_value (GtkScale *scale,
}
static void
-cursor_navigator_changed (GtkAdjustment *adj,
- GParamSpec *pspec,
- CursorNavigator *navigator)
+cursor_navigator_changed (GtkAdjustment *adj,
+ GParamSpec *pspec,
+ CursorNavigator *navigator)
{
gint index = gtk_adjustment_get_value (adj);
@@ -160,7 +161,7 @@ cursor_navigator_new (void)
}
static void
-cursor_navigator_update_parameters (CursorNavigator *navigator)
+cursor_navigator_update_parameters (CursorNavigator *navigator)
{
CursorNavigatorPrivate *priv = navigator->priv;
GtkScale *scale = GTK_SCALE (navigator);
@@ -183,21 +184,21 @@ cursor_navigator_update_parameters (CursorNavigator *navigator)
}
void
-cursor_navigator_set_alphabet (CursorNavigator *navigator,
- const gchar * const *alphabet)
+cursor_navigator_set_alphabet (CursorNavigator *navigator,
+ const gchar * const *alphabet)
{
CursorNavigatorPrivate *priv;
g_return_if_fail (CURSOR_IS_NAVIGATOR (navigator));
g_return_if_fail (alphabet == NULL ||
- g_strv_length ((gchar **)alphabet) > 0);
+ g_strv_length ((gchar **) alphabet) > 0);
priv = navigator->priv;
g_free (priv->alphabet);
if (alphabet) {
- priv->alphabet = g_strdupv ((gchar **)alphabet);
- priv->letters = g_strv_length ((gchar **)alphabet);
+ priv->alphabet = g_strdupv ((gchar **) alphabet);
+ priv->letters = g_strv_length ((gchar **) alphabet);
} else {
priv->alphabet = NULL;
priv->letters = -1;
@@ -216,12 +217,12 @@ cursor_navigator_get_alphabet (CursorNavigator *navigator)
priv = navigator->priv;
- return (const gchar * const *)priv->alphabet;
+ return (const gchar * const *) priv->alphabet;
}
void
-cursor_navigator_set_index (CursorNavigator *navigator,
- gint index)
+cursor_navigator_set_index (CursorNavigator *navigator,
+ gint index)
{
CursorNavigatorPrivate *priv;
GtkAdjustment *adj;
@@ -229,7 +230,7 @@ cursor_navigator_set_index (CursorNavigator *navigator,
g_return_if_fail (CURSOR_IS_NAVIGATOR (navigator));
priv = navigator->priv;
- adj = gtk_range_get_adjustment (GTK_RANGE (navigator));
+ adj = gtk_range_get_adjustment (GTK_RANGE (navigator));
index = CLAMP (index, 0, priv->letters);
@@ -246,7 +247,7 @@ cursor_navigator_set_index (CursorNavigator *navigator,
}
gint
-cursor_navigator_get_index (CursorNavigator *navigator)
+cursor_navigator_get_index (CursorNavigator *navigator)
{
CursorNavigatorPrivate *priv;
diff --git a/examples/cursor/cursor-navigator.h b/examples/cursor/cursor-navigator.h
index a309816..799c6a6 100644
--- a/examples/cursor/cursor-navigator.h
+++ b/examples/cursor/cursor-navigator.h
@@ -18,7 +18,7 @@
*
* Author: Tristan Van Berkom <tristanvb openismus com>
*/
-
+
#ifndef CURSOR_NAVIGATOR_H
#define CURSOR_NAVIGATOR_H
diff --git a/examples/cursor/cursor-search.c b/examples/cursor/cursor-search.c
index d6a9d14..f214a35 100644
--- a/examples/cursor/cursor-search.c
+++ b/examples/cursor/cursor-search.c
@@ -18,7 +18,7 @@
*
* Author: Tristan Van Berkom <tristanvb openismus com>
*/
-
+
#include <libebook/libebook.h>
#include "cursor-search.h"
@@ -106,10 +106,11 @@ cursor_search_init (CursorSearch *search)
gtk_widget_init_template (GTK_WIDGET (search));
- g_object_set (search,
- "primary-icon-activatable", TRUE,
- "primary-icon-sensitive", TRUE,
- NULL);
+ g_object_set (
+ search,
+ "primary-icon-activatable", TRUE,
+ "primary-icon-sensitive", TRUE,
+ NULL);
}
static void
@@ -124,10 +125,10 @@ cursor_search_finalize (GObject *object)
}
static void
-cursor_search_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
+cursor_search_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
CursorSearch *search = CURSOR_SEARCH (object);
CursorSearchPrivate *priv = search->priv;
@@ -144,13 +145,12 @@ cursor_search_get_property (GObject *object,
}
}
-
/************************************************************************
* UI Callbacks *
************************************************************************/
static void
-cursor_search_option_toggled (CursorSearch *search,
- GtkWidget *item)
+cursor_search_option_toggled (CursorSearch *search,
+ GtkWidget *item)
{
CursorSearchPrivate *priv = search->priv;
@@ -162,15 +162,15 @@ cursor_search_option_toggled (CursorSearch *search,
priv->type = SEARCH_PHONE;
else if (item == priv->email_radio)
priv->type = SEARCH_EMAIL;
-
+
/* Refresh the search */
cursor_search_entry_changed (search, NULL);
}
}
static void
-cursor_search_entry_changed (CursorSearch *search,
- GtkEditable *entry)
+cursor_search_entry_changed (CursorSearch *search,
+ GtkEditable *entry)
{
CursorSearchPrivate *priv = search->priv;
EBookQuery *query = NULL;
@@ -183,22 +183,24 @@ cursor_search_entry_changed (CursorSearch *search,
case SEARCH_NAME:
query = e_book_query_orv (
e_book_query_field_test (E_CONTACT_FAMILY_NAME,
- E_BOOK_QUERY_CONTAINS,
- text),
+ E_BOOK_QUERY_CONTAINS,
+ text),
e_book_query_field_test (E_CONTACT_GIVEN_NAME,
- E_BOOK_QUERY_CONTAINS,
- text),
+ E_BOOK_QUERY_CONTAINS,
+ text),
NULL);
break;
case SEARCH_PHONE:
- query = e_book_query_field_test (E_CONTACT_TEL,
- E_BOOK_QUERY_CONTAINS,
- text);
+ query = e_book_query_field_test (
+ E_CONTACT_TEL,
+ E_BOOK_QUERY_CONTAINS,
+ text);
break;
case SEARCH_EMAIL:
- query = e_book_query_field_test (E_CONTACT_EMAIL,
- E_BOOK_QUERY_CONTAINS,
- text);
+ query = e_book_query_field_test (
+ E_CONTACT_EMAIL,
+ E_BOOK_QUERY_CONTAINS,
+ text);
break;
}
}
@@ -215,16 +217,17 @@ cursor_search_entry_changed (CursorSearch *search,
}
static void
-cursor_search_icon_press (CursorSearch *search,
- GtkEntryIconPosition icon_pos,
- GdkEvent *event,
- GtkEntry *entry)
+cursor_search_icon_press (CursorSearch *search,
+ GtkEntryIconPosition icon_pos,
+ GdkEvent *event,
+ GtkEntry *entry)
{
CursorSearchPrivate *priv = search->priv;
- GdkEventButton *button_event = (GdkEventButton *)event;
+ GdkEventButton *button_event = (GdkEventButton *) event;
if (icon_pos == GTK_ENTRY_ICON_PRIMARY)
- gtk_menu_popup (GTK_MENU (priv->popup),
+ gtk_menu_popup (
+ GTK_MENU (priv->popup),
NULL, NULL, NULL, NULL,
button_event->button,
button_event->time);
@@ -236,7 +239,7 @@ cursor_search_icon_press (CursorSearch *search,
GtkWidget *
cursor_search_new (void)
{
- return (GtkWidget *)g_object_new (CURSOR_TYPE_SEARCH, NULL);
+ return (GtkWidget *) g_object_new (CURSOR_TYPE_SEARCH, NULL);
}
const gchar *
diff --git a/examples/cursor/cursor-search.h b/examples/cursor/cursor-search.h
index ca1527d..186f917 100644
--- a/examples/cursor/cursor-search.h
+++ b/examples/cursor/cursor-search.h
@@ -18,7 +18,7 @@
*
* Author: Tristan Van Berkom <tristanvb openismus com>
*/
-
+
#ifndef CURSOR_SEARCH_H
#define CURSOR_SEARCH_H
diff --git a/examples/cursor/cursor-slot.c b/examples/cursor/cursor-slot.c
index d2c6118..bd15380 100644
--- a/examples/cursor/cursor-slot.c
+++ b/examples/cursor/cursor-slot.c
@@ -18,7 +18,7 @@
*
* Author: Tristan Van Berkom <tristanvb openismus com>
*/
-
+
#include <libebook/libebook.h>
#include "cursor-slot.h"
@@ -62,7 +62,7 @@ cursor_slot_init (CursorSlot *slot)
* API *
************************************************************************/
GtkWidget *
-cursor_slot_new (EContact *contact)
+cursor_slot_new (EContact *contact)
{
CursorSlot *slot;
@@ -70,12 +70,12 @@ cursor_slot_new (EContact *contact)
cursor_slot_set_from_contact (slot, contact);
- return (GtkWidget *)slot;
+ return (GtkWidget *) slot;
}
static gchar *
-make_string_from_list (EContact *contact,
- EContactField field)
+make_string_from_list (EContact *contact,
+ EContactField field)
{
GList *values, *l;
GString *string;
@@ -103,7 +103,7 @@ make_string_from_list (EContact *contact,
void
cursor_slot_set_from_contact (CursorSlot *slot,
- EContact *contact)
+ EContact *contact)
{
CursorSlotPrivate *priv;
const gchar *family_name, *given_name;
@@ -119,8 +119,8 @@ cursor_slot_set_from_contact (CursorSlot *slot,
return;
}
- family_name = (const gchar *)e_contact_get_const (contact, E_CONTACT_FAMILY_NAME);
- given_name = (const gchar *)e_contact_get_const (contact, E_CONTACT_GIVEN_NAME);
+ family_name = (const gchar *) e_contact_get_const (contact, E_CONTACT_FAMILY_NAME);
+ given_name = (const gchar *) e_contact_get_const (contact, E_CONTACT_GIVEN_NAME);
str = g_strdup_printf ("%s, %s", family_name, given_name);
gtk_label_set_text (priv->name_label, str);
diff --git a/examples/cursor/cursor-slot.h b/examples/cursor/cursor-slot.h
index d83eef9..7ed5c49 100644
--- a/examples/cursor/cursor-slot.h
+++ b/examples/cursor/cursor-slot.h
@@ -18,7 +18,7 @@
*
* Author: Tristan Van Berkom <tristanvb openismus com>
*/
-
+
#ifndef CURSOR_SLOT_H
#define CURSOR_SLOT_H
diff --git a/examples/cursor/main.c b/examples/cursor/main.c
index 87968fa..a81290e 100644
--- a/examples/cursor/main.c
+++ b/examples/cursor/main.c
@@ -21,8 +21,9 @@
#include "cursor-example.h"
-int
-main (int argc, char *argv[])
+gint
+main (gint argc,
+ gchar *argv[])
{
GtkWidget *example;
diff --git a/libebackend/e-authentication-mediator.c b/libebackend/e-authentication-mediator.c
index 385c8f0..0a1abcf 100644
--- a/libebackend/e-authentication-mediator.c
+++ b/libebackend/e-authentication-mediator.c
@@ -1276,7 +1276,7 @@ e_authentication_mediator_dismiss (EAuthenticationMediator *mediator)
**/
void
e_authentication_mediator_server_error (EAuthenticationMediator *mediator,
- const GError *error)
+ const GError *error)
{
gchar *name;
diff --git a/libebackend/e-backend-enums.h b/libebackend/e-backend-enums.h
index 5685baf..7d244fc 100644
--- a/libebackend/e-backend-enums.h
+++ b/libebackend/e-backend-enums.h
@@ -78,8 +78,8 @@ typedef enum {
* Since: 3.6
**/
typedef enum { /*< flags >*/
- E_SOURCE_PERMISSION_NONE = 0,
- E_SOURCE_PERMISSION_WRITABLE = 1 << 0,
+ E_SOURCE_PERMISSION_NONE = 0,
+ E_SOURCE_PERMISSION_WRITABLE = 1 << 0,
E_SOURCE_PERMISSION_REMOVABLE = 1 << 1
} ESourcePermissionFlags;
diff --git a/libebackend/e-sqlite3-vfs.c b/libebackend/e-sqlite3-vfs.c
index c2e8fe4..c95f634 100644
--- a/libebackend/e-sqlite3-vfs.c
+++ b/libebackend/e-sqlite3-vfs.c
@@ -141,18 +141,18 @@ sync_push_request_timeout (gpointer user_data)
return FALSE;
}
-#define def_subclassed(_nm, _params, _call) \
-static gint \
-e_sqlite3_file_ ## _nm _params \
-{ \
- ESqlite3File *cFile; \
- \
- g_return_val_if_fail (old_vfs != NULL, SQLITE_ERROR); \
- g_return_val_if_fail (pFile != NULL, SQLITE_ERROR); \
- \
- cFile = (ESqlite3File *) pFile; \
- g_return_val_if_fail (cFile->old_vfs_file->pMethods != NULL, SQLITE_ERROR); \
- return cFile->old_vfs_file->pMethods->_nm _call; \
+#define def_subclassed(_nm, _params, _call) \
+static gint \
+e_sqlite3_file_ ## _nm _params \
+{ \
+ ESqlite3File *cFile; \
+ \
+ g_return_val_if_fail (old_vfs != NULL, SQLITE_ERROR); \
+ g_return_val_if_fail (pFile != NULL, SQLITE_ERROR); \
+ \
+ cFile = (ESqlite3File *) pFile; \
+ g_return_val_if_fail (cFile->old_vfs_file->pMethods != NULL, SQLITE_ERROR); \
+ return cFile->old_vfs_file->pMethods->_nm _call; \
}
def_subclassed (xRead, (sqlite3_file *pFile, gpointer pBuf, gint iAmt, sqlite3_int64 iOfst),
(cFile->old_vfs_file, pBuf, iAmt, iOfst))
diff --git a/libedataserver/e-client.c b/libedataserver/e-client.c
index 1bf8788..108ae84 100644
--- a/libedataserver/e-client.c
+++ b/libedataserver/e-client.c
@@ -27,7 +27,6 @@
* and kill e-client-private.h. Would simplify things. --mbarnes
*/
-
/**
* SECTION: e-client
* @include: libedataserver/libedataserver.h
diff --git a/libedataserver/e-collator.c b/libedataserver/e-collator.c
index 38db7db..1744fe7 100644
--- a/libedataserver/e-collator.c
+++ b/libedataserver/e-collator.c
@@ -57,7 +57,7 @@ G_DEFINE_QUARK (e-collator-error-quark, e_collator_error)
G_DEFINE_BOXED_TYPE (ECollator,
e_collator,
- e_collator_ref,
+ e_collator_ref,
e_collator_unref)
struct _ECollator
@@ -89,21 +89,21 @@ print_available_locales (void)
u_init (&status);
- g_printerr ("List of available locales (default locale is: %s)\n", uloc_getDefault());
+ g_printerr ("List of available locales (default locale is: %s)\n", uloc_getDefault ());
- count = uloc_countAvailable();
+ count = uloc_countAvailable ();
for (i = 0; i < count; i++) {
UEnumeration *keywords;
const gchar *keyword;
- uloc_getDisplayName(uloc_getAvailable(i), NULL, result, 100, &status);
+ uloc_getDisplayName (uloc_getAvailable (i), NULL, result, 100, &status);
u_austrncpy (printable, result, sizeof (printable));
/* print result */
- g_printerr ("\t%s - %s", uloc_getAvailable(i), printable);
+ g_printerr ("\t%s - %s", uloc_getAvailable (i), printable);
- keywords = uloc_openKeywords (uloc_getAvailable(i), &status);
+ keywords = uloc_openKeywords (uloc_getAvailable (i), &status);
if (keywords) {
UErrorCode kstatus = U_ZERO_ERROR;
@@ -122,10 +122,10 @@ print_available_locales (void)
#endif
static gchar *
-canonicalize_locale (const gchar *posix_locale,
- gchar **language_code,
- gchar **country_code,
- GError **error)
+canonicalize_locale (const gchar *posix_locale,
+ gchar **language_code,
+ gchar **country_code,
+ GError **error)
{
UErrorCode status = U_ZERO_ERROR;
gchar locale_buffer[LOCALE_BUFFER_LEN];
@@ -139,11 +139,12 @@ canonicalize_locale (const gchar *posix_locale,
len = uloc_canonicalize (posix_locale, locale_buffer, LOCALE_BUFFER_LEN, &status);
if (U_FAILURE (status)) {
- g_set_error (error, E_COLLATOR_ERROR,
- E_COLLATOR_ERROR_INVALID_LOCALE,
- "Failed to interpret locale '%s' (%s)",
- posix_locale,
- u_errorName (status));
+ g_set_error (
+ error, E_COLLATOR_ERROR,
+ E_COLLATOR_ERROR_INVALID_LOCALE,
+ "Failed to interpret locale '%s' (%s)",
+ posix_locale,
+ u_errorName (status));
return NULL;
}
@@ -158,11 +159,12 @@ canonicalize_locale (const gchar *posix_locale,
status = U_ZERO_ERROR;
len = uloc_getLanguage (icu_locale, language_buffer, 8, &status);
if (U_FAILURE (status)) {
- g_set_error (error, E_COLLATOR_ERROR,
- E_COLLATOR_ERROR_INVALID_LOCALE,
- "Failed to interpret language for locale '%s': %s",
- icu_locale,
- u_errorName (status));
+ g_set_error (
+ error, E_COLLATOR_ERROR,
+ E_COLLATOR_ERROR_INVALID_LOCALE,
+ "Failed to interpret language for locale '%s': %s",
+ icu_locale,
+ u_errorName (status));
g_free (icu_locale);
return NULL;
}
@@ -170,11 +172,12 @@ canonicalize_locale (const gchar *posix_locale,
status = U_ZERO_ERROR;
len = uloc_getCountry (icu_locale, country_buffer, 8, &status);
if (U_FAILURE (status)) {
- g_set_error (error, E_COLLATOR_ERROR,
- E_COLLATOR_ERROR_INVALID_LOCALE,
- "Failed to interpret country for locale '%s': %s",
- icu_locale,
- u_errorName (status));
+ g_set_error (
+ error, E_COLLATOR_ERROR,
+ E_COLLATOR_ERROR_INVALID_LOCALE,
+ "Failed to interpret country for locale '%s': %s",
+ icu_locale,
+ u_errorName (status));
g_free (icu_locale);
return NULL;
}
@@ -210,12 +213,12 @@ canonicalize_locale (const gchar *posix_locale,
* is valid UTF-8
*/
static const UChar *
-convert_to_ustring (const gchar *string,
- UChar *buffer,
- gint buffer_len,
- gint *result_len,
- UChar **free_me,
- GError **error)
+convert_to_ustring (const gchar *string,
+ UChar *buffer,
+ gint buffer_len,
+ gint *result_len,
+ UChar **free_me,
+ GError **error)
{
UErrorCode status = U_ZERO_ERROR;
const gchar *source_utf8;
@@ -232,12 +235,13 @@ convert_to_ustring (const gchar *string,
}
/* First pass, try converting to UChar in the given buffer */
- converted_buffer = u_strFromUTF8Lenient (buffer,
- buffer_len,
- &converted_len,
- source_utf8,
- -1,
- &status);
+ converted_buffer = u_strFromUTF8Lenient (
+ buffer,
+ buffer_len,
+ &converted_len,
+ source_utf8,
+ -1,
+ &status);
/* Set the result length right away... */
*result_len = converted_len;
@@ -251,12 +255,13 @@ convert_to_ustring (const gchar *string,
if (converted_len > buffer_len) {
*free_me = g_new (UChar, converted_len);
- converted_buffer = u_strFromUTF8Lenient (*free_me,
- converted_len,
- NULL,
- source_utf8,
- -1,
- &status);
+ converted_buffer = u_strFromUTF8Lenient (
+ *free_me,
+ converted_len,
+ NULL,
+ source_utf8,
+ -1,
+ &status);
if (U_FAILURE (status)) {
g_free (*free_me);
@@ -270,10 +275,11 @@ convert_to_ustring (const gchar *string,
g_free (alloc_utf8);
if (U_FAILURE (status))
- g_set_error (error, E_COLLATOR_ERROR,
- E_COLLATOR_ERROR_CONVERSION,
- "Error occured while converting character encoding (%s)",
- u_errorName (status));
+ g_set_error (
+ error, E_COLLATOR_ERROR,
+ E_COLLATOR_ERROR_CONVERSION,
+ "Error occured while converting character encoding (%s)",
+ u_errorName (status));
return converted_buffer;
}
@@ -295,8 +301,8 @@ convert_to_ustring (const gchar *string,
* Since: 3.12
*/
ECollator *
-e_collator_new (const gchar *locale,
- GError **error)
+e_collator_new (const gchar *locale,
+ GError **error)
{
return e_collator_new_interpret_country (locale, NULL, error);
}
@@ -318,9 +324,9 @@ e_collator_new (const gchar *locale,
* Since: 3.12
*/
ECollator *
-e_collator_new_interpret_country (const gchar *locale,
- gchar **country_code,
- GError **error)
+e_collator_new_interpret_country (const gchar *locale,
+ gchar **country_code,
+ GError **error)
{
ECollator *collator;
UCollator *coll;
@@ -335,21 +341,23 @@ e_collator_new_interpret_country (const gchar *locale,
print_available_locales ();
#endif
- icu_locale = canonicalize_locale (locale,
- &language_code,
- &local_country_code,
- error);
+ icu_locale = canonicalize_locale (
+ locale,
+ &language_code,
+ &local_country_code,
+ error);
if (!icu_locale)
return NULL;
coll = ucol_open (icu_locale, &status);
if (U_FAILURE (status)) {
- g_set_error (error, E_COLLATOR_ERROR,
- E_COLLATOR_ERROR_OPEN,
- "Unable to open collator for locale '%s' (%s)",
- icu_locale,
- u_errorName (status));
+ g_set_error (
+ error, E_COLLATOR_ERROR,
+ E_COLLATOR_ERROR_OPEN,
+ "Unable to open collator for locale '%s' (%s)",
+ icu_locale,
+ u_errorName (status));
g_free (language_code);
g_free (local_country_code);
@@ -373,18 +381,19 @@ e_collator_new_interpret_country (const gchar *locale,
collator->transliterator = _e_transliterator_cxx_new ("Han-Latin");
collator->alpha_index = _e_alphabet_index_cxx_new_for_language (language_code);
- collator->labels = _e_alphabet_index_cxx_get_labels (collator->alpha_index,
- &collator->n_labels,
- &collator->underflow,
- &collator->inflow,
- &collator->overflow);
+ collator->labels = _e_alphabet_index_cxx_get_labels (
+ collator->alpha_index,
+ &collator->n_labels,
+ &collator->underflow,
+ &collator->inflow,
+ &collator->overflow);
g_free (language_code);
if (country_code)
*country_code = local_country_code;
else
- g_free (local_country_code);
+ g_free (local_country_code);
return collator;
}
@@ -458,9 +467,9 @@ e_collator_unref (ECollator *collator)
* Since: 3.12
*/
gchar *
-e_collator_generate_key (ECollator *collator,
- const gchar *str,
- GError **error)
+e_collator_generate_key (ECollator *collator,
+ const gchar *str,
+ GError **error)
{
UChar source_buffer[CONVERT_BUFFER_LEN];
UChar *free_me = NULL;
@@ -483,12 +492,13 @@ e_collator_generate_key (ECollator *collator,
input_str = str;
}
- source = convert_to_ustring (input_str,
- source_buffer,
- CONVERT_BUFFER_LEN,
- &source_len,
- &free_me,
- error);
+ source = convert_to_ustring (
+ input_str,
+ source_buffer,
+ CONVERT_BUFFER_LEN,
+ &source_len,
+ &free_me,
+ error);
if (!source) {
g_free (translit_str);
@@ -499,8 +509,9 @@ e_collator_generate_key (ECollator *collator,
alphabet_index = _e_alphabet_index_cxx_get_index (collator->alpha_index, input_str);
/* First try to generate a key in a predefined buffer size */
- key_len = ucol_getSortKey (collator->coll, source, source_len,
- (guchar *)stack_buffer, COLLATION_KEY_BUFFER_LEN);
+ key_len = ucol_getSortKey (
+ collator->coll, source, source_len,
+ (guchar *) stack_buffer, COLLATION_KEY_BUFFER_LEN);
if (key_len > COLLATION_KEY_BUFFER_LEN) {
@@ -517,8 +528,9 @@ e_collator_generate_key (ECollator *collator,
snprintf (collation_key, 4, "%03d-", alphabet_index);
/* Get the sort key and put it in &collation_key[4] */
- ucol_getSortKey (collator->coll, source, source_len,
- (guchar *)(collation_key + 4), key_len);
+ ucol_getSortKey (
+ collator->coll, source, source_len,
+ (guchar *)(collation_key + 4), key_len);
/* Just being paranoid, make sure we're null terminated since the API
* doesn't specify if the result length is null character inclusive
@@ -539,7 +551,7 @@ e_collator_generate_key (ECollator *collator,
g_free (free_me);
g_free (translit_str);
- return (gchar *)collation_key;
+ return (gchar *) collation_key;
}
/**
@@ -565,8 +577,8 @@ e_collator_generate_key (ECollator *collator,
* Since: 3.12
*/
gchar *
-e_collator_generate_key_for_index (ECollator *collator,
- gint index)
+e_collator_generate_key_for_index (ECollator *collator,
+ gint index)
{
g_return_val_if_fail (collator != NULL, NULL);
g_return_val_if_fail (index >= 0 && index < collator->n_labels, NULL);
@@ -596,11 +608,11 @@ e_collator_generate_key_for_index (ECollator *collator,
* Since: 3.12
*/
gboolean
-e_collator_collate (ECollator *collator,
- const gchar *str_a,
- const gchar *str_b,
- gint *result,
- GError **error)
+e_collator_collate (ECollator *collator,
+ const gchar *str_a,
+ const gchar *str_b,
+ gint *result,
+ GError **error)
{
gchar *sort_key_a, *sort_key_b;
@@ -646,11 +658,11 @@ e_collator_collate (ECollator *collator,
* Since: 3.12
*/
const gchar *const *
-e_collator_get_index_labels (ECollator *collator,
- gint *n_labels,
- gint *underflow,
- gint *inflow,
- gint *overflow)
+e_collator_get_index_labels (ECollator *collator,
+ gint *n_labels,
+ gint *underflow,
+ gint *inflow,
+ gint *overflow)
{
g_return_val_if_fail (collator != NULL, NULL);
@@ -663,7 +675,7 @@ e_collator_get_index_labels (ECollator *collator,
if (overflow)
*overflow = collator->overflow;
- return (const gchar *const *)collator->labels;
+ return (const gchar *const *) collator->labels;
}
/**
@@ -679,8 +691,8 @@ e_collator_get_index_labels (ECollator *collator,
* Since: 3.12
*/
gint
-e_collator_get_index (ECollator *collator,
- const gchar *str)
+e_collator_get_index (ECollator *collator,
+ const gchar *str)
{
gint index;
gchar *translit_str = NULL;
diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c
index ba792d2..6483ada 100644
--- a/libedataserver/e-data-server-util.c
+++ b/libedataserver/e-data-server-util.c
@@ -1730,20 +1730,20 @@ setup (void)
#include "libedataserver-private.h" /* For prototypes */
-#define GETTER_IMPL(varbl) \
-{ \
- setup (); \
- return varbl; \
+#define GETTER_IMPL(varbl) \
+{ \
+ setup (); \
+ return varbl; \
}
-#define PRIVATE_GETTER(varbl) \
-const gchar * \
-_libedataserver_get_##varbl (void) \
+#define PRIVATE_GETTER(varbl) \
+const gchar * \
+_libedataserver_get_##varbl (void) \
GETTER_IMPL (varbl)
-#define PUBLIC_GETTER(varbl) \
-const gchar * \
-e_util_get_##varbl (void) \
+#define PUBLIC_GETTER(varbl) \
+const gchar * \
+e_util_get_##varbl (void) \
GETTER_IMPL (varbl)
PRIVATE_GETTER (extensiondir)
diff --git a/libedataserver/e-gdbus-templates.h b/libedataserver/e-gdbus-templates.h
index 23e5321..e727447 100644
--- a/libedataserver/e-gdbus-templates.h
+++ b/libedataserver/e-gdbus-templates.h
@@ -61,11 +61,11 @@ gboolean e_gdbus_async_op_keeper_cancel_op_sync (EGdbusAsyncOpKeeper *object,
g
enum {
E_GDBUS_TYPE_IS_ASYNC = 1 << 0, /* if set, then OPID and GError precedes to actual parameter */
- E_GDBUS_TYPE_VOID = 1 << 1,
- E_GDBUS_TYPE_BOOLEAN = 1 << 2,
- E_GDBUS_TYPE_STRING = 1 << 3,
- E_GDBUS_TYPE_STRV = 1 << 4,
- E_GDBUS_TYPE_UINT = 1 << 5
+ E_GDBUS_TYPE_VOID = 1 << 1,
+ E_GDBUS_TYPE_BOOLEAN = 1 << 2,
+ E_GDBUS_TYPE_STRING = 1 << 3,
+ E_GDBUS_TYPE_STRV = 1 << 4,
+ E_GDBUS_TYPE_UINT = 1 << 5
};
/* _where is a target component name, like ' ## _where ## ' or 'cal'
@@ -75,263 +75,263 @@ enum {
* _param_type is parameter type, as string, like "s"
* all except _param_type are identificators, not strings
*/
-#define E_DECLARE_GDBUS_ARG(_where, _mname, _mtype, _param_name, _param_type) \
- static const GDBusArgInfo e_gdbus_ ## _where ## _ ## _mtype ## _mname ## _param_name = \
- { \
- -1, \
- (gchar *) # _param_name, \
- (gchar *) _param_type, \
- (GDBusAnnotationInfo **) NULL, \
+#define E_DECLARE_GDBUS_ARG(_where, _mname, _mtype, _param_name, _param_type) \
+ static const GDBusArgInfo e_gdbus_ ## _where ## _ ## _mtype ## _mname ## _param_name = \
+ { \
+ -1, \
+ (gchar *) # _param_name, \
+ (gchar *) _param_type, \
+ (GDBusAnnotationInfo **) NULL, \
};
-#define E_DECLARE_GDBUS_NOTIFY_SIGNAL_0(_where, _sname)
\
- static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname = \
- { \
- -1, \
- (gchar *) # _sname, \
- (GDBusArgInfo **) NULL, \
- (GDBusAnnotationInfo **) NULL, \
+#define E_DECLARE_GDBUS_NOTIFY_SIGNAL_0(_where, _sname) \
+ static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname = \
+ { \
+ -1, \
+ (gchar *) # _sname, \
+ (GDBusArgInfo **) NULL, \
+ (GDBusAnnotationInfo **) NULL, \
};
-#define E_DECLARE_GDBUS_NOTIFY_SIGNAL_1(_where, _sname, _p1_name, _p1_type) \
- E_DECLARE_GDBUS_ARG (_where, _sname, signal, _p1_name, _p1_type) \
- \
- static const GDBusArgInfo * const e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname[] = \
- { \
- &e_gdbus_ ## _where ## _signal ## _sname ## _p1_name, \
- NULL \
- }; \
- \
- static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname = \
- { \
- -1, \
- (gchar *) # _sname, \
- (GDBusArgInfo **) &e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname, \
- (GDBusAnnotationInfo **) NULL, \
+#define E_DECLARE_GDBUS_NOTIFY_SIGNAL_1(_where, _sname, _p1_name, _p1_type) \
+ E_DECLARE_GDBUS_ARG (_where, _sname, signal, _p1_name, _p1_type) \
+ \
+ static const GDBusArgInfo * const e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname[] = \
+ { \
+ &e_gdbus_ ## _where ## _signal ## _sname ## _p1_name, \
+ NULL \
+ }; \
+ \
+ static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname = \
+ { \
+ -1, \
+ (gchar *) # _sname, \
+ (GDBusArgInfo **) &e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname, \
+ (GDBusAnnotationInfo **) NULL, \
};
-#define E_DECLARE_GDBUS_NOTIFY_SIGNAL_2(_where, _sname, _p1_name, _p1_type, _p2_name, _p2_type)
\
- E_DECLARE_GDBUS_ARG (_where, _sname, signal, _p1_name, _p1_type) \
- E_DECLARE_GDBUS_ARG (_where, _sname, signal, _p2_name, _p2_type) \
- \
- static const GDBusArgInfo * const e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname[] = \
- { \
- &e_gdbus_ ## _where ## _signal ## _sname ## _p1_name, \
- &e_gdbus_ ## _where ## _signal ## _sname ## _p2_name, \
- NULL \
- }; \
- \
- static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname = \
- { \
- -1, \
- (gchar *) # _sname, \
- (GDBusArgInfo **) &e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname, \
- (GDBusAnnotationInfo **) NULL, \
+#define E_DECLARE_GDBUS_NOTIFY_SIGNAL_2(_where, _sname, _p1_name, _p1_type, _p2_name, _p2_type) \
+ E_DECLARE_GDBUS_ARG (_where, _sname, signal, _p1_name, _p1_type) \
+ E_DECLARE_GDBUS_ARG (_where, _sname, signal, _p2_name, _p2_type) \
+ \
+ static const GDBusArgInfo * const e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname[] = \
+ { \
+ &e_gdbus_ ## _where ## _signal ## _sname ## _p1_name, \
+ &e_gdbus_ ## _where ## _signal ## _sname ## _p2_name, \
+ NULL \
+ }; \
+ \
+ static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname = \
+ { \
+ -1, \
+ (gchar *) # _sname, \
+ (GDBusArgInfo **) &e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname, \
+ (GDBusAnnotationInfo **) NULL, \
};
-#define E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_0(_where, _sname) \
- E_DECLARE_GDBUS_ARG (_where, _sname, signal, opid, "u") \
- E_DECLARE_GDBUS_ARG (_where, _sname, signal, dbus_error_name, "s") \
- E_DECLARE_GDBUS_ARG (_where, _sname, signal, dbus_error_message, "s") \
- \
- static const GDBusArgInfo * const e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname[] = \
- { \
- &e_gdbus_ ## _where ## _signal ## _sname ## opid, \
- &e_gdbus_ ## _where ## _signal ## _sname ## dbus_error_name, \
- &e_gdbus_ ## _where ## _signal ## _sname ## dbus_error_message, \
- NULL \
- }; \
- \
- static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname = \
- { \
- -1, \
- (gchar *) # _sname, \
- (GDBusArgInfo **) &e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname, \
- (GDBusAnnotationInfo **) NULL, \
+#define E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_0(_where, _sname) \
+ E_DECLARE_GDBUS_ARG (_where, _sname, signal, opid, "u") \
+ E_DECLARE_GDBUS_ARG (_where, _sname, signal, dbus_error_name, "s") \
+ E_DECLARE_GDBUS_ARG (_where, _sname, signal, dbus_error_message, "s") \
+ \
+ static const GDBusArgInfo * const e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname[] = \
+ { \
+ &e_gdbus_ ## _where ## _signal ## _sname ## opid, \
+ &e_gdbus_ ## _where ## _signal ## _sname ## dbus_error_name, \
+ &e_gdbus_ ## _where ## _signal ## _sname ## dbus_error_message, \
+ NULL \
+ }; \
+ \
+ static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname = \
+ { \
+ -1, \
+ (gchar *) # _sname, \
+ (GDBusArgInfo **) &e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname, \
+ (GDBusAnnotationInfo **) NULL, \
};
-#define E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_1(_where, _sname, _p1_name, _p1_type)
\
- E_DECLARE_GDBUS_ARG (_where, _sname, signal, opid, "u") \
- E_DECLARE_GDBUS_ARG (_where, _sname, signal, dbus_error_name, "s") \
- E_DECLARE_GDBUS_ARG (_where, _sname, signal, dbus_error_message, "s") \
- E_DECLARE_GDBUS_ARG (_where, _sname, signal, _p1_name, _p1_type) \
- \
- static const GDBusArgInfo * const e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname[] = \
- { \
- &e_gdbus_ ## _where ## _signal ## _sname ## opid, \
- &e_gdbus_ ## _where ## _signal ## _sname ## dbus_error_name, \
- &e_gdbus_ ## _where ## _signal ## _sname ## dbus_error_message, \
- &e_gdbus_ ## _where ## _signal ## _sname ## _p1_name, \
- NULL \
- }; \
- \
- static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname = \
- { \
- -1, \
- (gchar *) # _sname, \
- (GDBusArgInfo **) &e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname, \
- (GDBusAnnotationInfo **) NULL, \
+#define E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_1(_where, _sname, _p1_name, _p1_type) \
+ E_DECLARE_GDBUS_ARG (_where, _sname, signal, opid, "u") \
+ E_DECLARE_GDBUS_ARG (_where, _sname, signal, dbus_error_name, "s") \
+ E_DECLARE_GDBUS_ARG (_where, _sname, signal, dbus_error_message, "s") \
+ E_DECLARE_GDBUS_ARG (_where, _sname, signal, _p1_name, _p1_type) \
+ \
+ static const GDBusArgInfo * const e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname[] = \
+ { \
+ &e_gdbus_ ## _where ## _signal ## _sname ## opid, \
+ &e_gdbus_ ## _where ## _signal ## _sname ## dbus_error_name, \
+ &e_gdbus_ ## _where ## _signal ## _sname ## dbus_error_message, \
+ &e_gdbus_ ## _where ## _signal ## _sname ## _p1_name, \
+ NULL \
+ }; \
+ \
+ static const GDBusSignalInfo e_gdbus_ ## _where ## _signal_ ## _sname = \
+ { \
+ -1, \
+ (gchar *) # _sname, \
+ (GDBusArgInfo **) &e_gdbus_ ## _where ## _signal_arg_pointers_ ## _sname, \
+ (GDBusAnnotationInfo **) NULL, \
};
-#define E_DECLARE_GDBUS_SYNC_METHOD_0(_where, _mname) \
- static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
- { \
- -1, \
- (gchar *) # _mname, \
- (GDBusArgInfo **) NULL, \
- (GDBusArgInfo **) NULL, \
- (GDBusAnnotationInfo **) NULL, \
+#define E_DECLARE_GDBUS_SYNC_METHOD_0(_where, _mname) \
+ static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
+ { \
+ -1, \
+ (gchar *) # _mname, \
+ (GDBusArgInfo **) NULL, \
+ (GDBusArgInfo **) NULL, \
+ (GDBusAnnotationInfo **) NULL, \
};
-#define E_DECLARE_GDBUS_SYNC_METHOD_1(_where, _mname, _p1_name, _p1_type) \
- E_DECLARE_GDBUS_ARG (_where, _mname, method_in, _p1_name, _p1_type) \
- \
- static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname[] = \
- { \
- &e_gdbus_ ## _where ## _method_in ## _mname ## _p1_name, \
- NULL \
- }; \
- \
- static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
- { \
- -1, \
- (gchar *) # _mname, \
- (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname, \
- (GDBusArgInfo **) NULL, \
- (GDBusAnnotationInfo **) NULL, \
+#define E_DECLARE_GDBUS_SYNC_METHOD_1(_where, _mname, _p1_name, _p1_type) \
+ E_DECLARE_GDBUS_ARG (_where, _mname, method_in, _p1_name, _p1_type) \
+ \
+ static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname[] = \
+ { \
+ &e_gdbus_ ## _where ## _method_in ## _mname ## _p1_name, \
+ NULL \
+ }; \
+ \
+ static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
+ { \
+ -1, \
+ (gchar *) # _mname, \
+ (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname, \
+ (GDBusArgInfo **) NULL, \
+ (GDBusAnnotationInfo **) NULL, \
};
-#define E_DECLARE_GDBUS_SYNC_METHOD_0_WITH_RETURN(_where, _mname, _r1_name, _r1_type) \
- E_DECLARE_GDBUS_ARG (_where, _mname, method_out, _r1_name, _r1_type) \
- \
- static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
- { \
- &e_gdbus_ ## _where ## _method_out ## _mname ## _r1_name, \
- NULL \
- }; \
- \
- static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
- { \
- -1, \
- (gchar *) # _mname, \
- (GDBusArgInfo **) NULL, \
- (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
- (GDBusAnnotationInfo **) NULL, \
+#define E_DECLARE_GDBUS_SYNC_METHOD_0_WITH_RETURN(_where, _mname, _r1_name, _r1_type) \
+ E_DECLARE_GDBUS_ARG (_where, _mname, method_out, _r1_name, _r1_type) \
+ \
+ static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
+ { \
+ &e_gdbus_ ## _where ## _method_out ## _mname ## _r1_name, \
+ NULL \
+ }; \
+ \
+ static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
+ { \
+ -1, \
+ (gchar *) # _mname, \
+ (GDBusArgInfo **) NULL, \
+ (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
+ (GDBusAnnotationInfo **) NULL, \
};
#define E_DECLARE_GDBUS_SYNC_METHOD_1_WITH_RETURN(_where, _mname, _p1_name, _p1_type, _r1_name, _r1_type)\
- E_DECLARE_GDBUS_ARG (_where, _mname, method_in, _p1_name, _p1_type) \
- E_DECLARE_GDBUS_ARG (_where, _mname, method_out, _r1_name, _r1_type) \
- \
- static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname[] = \
- { \
- &e_gdbus_ ## _where ## _method_in ## _mname ## _p1_name, \
- NULL \
- }; \
- \
- static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
- { \
- &e_gdbus_ ## _where ## _method_out ## _mname ## _r1_name, \
- NULL \
- }; \
- \
- static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
- { \
- -1, \
- (gchar *) # _mname, \
- (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname, \
- (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
- (GDBusAnnotationInfo **) NULL, \
+ E_DECLARE_GDBUS_ARG (_where, _mname, method_in, _p1_name, _p1_type) \
+ E_DECLARE_GDBUS_ARG (_where, _mname, method_out, _r1_name, _r1_type) \
+ \
+ static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname[] = \
+ { \
+ &e_gdbus_ ## _where ## _method_in ## _mname ## _p1_name, \
+ NULL \
+ }; \
+ \
+ static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
+ { \
+ &e_gdbus_ ## _where ## _method_out ## _mname ## _r1_name, \
+ NULL \
+ }; \
+ \
+ static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
+ { \
+ -1, \
+ (gchar *) # _mname, \
+ (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname, \
+ (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
+ (GDBusAnnotationInfo **) NULL, \
};
-#define E_DECLARE_GDBUS_ASYNC_METHOD_0(_where, _mname) \
- E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_0 (_where, _mname ## _done) \
- E_DECLARE_GDBUS_ARG (_where, _mname, method_out, opid, "u") \
- \
- static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
- { \
- &e_gdbus_ ## _where ## _method_out ## _mname ## opid, \
- NULL \
- }; \
- \
- static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
- { \
- -1, \
- (gchar *) # _mname, \
- (GDBusArgInfo **) NULL, \
- (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
- (GDBusAnnotationInfo **) NULL, \
+#define E_DECLARE_GDBUS_ASYNC_METHOD_0(_where, _mname) \
+ E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_0 (_where, _mname ## _done) \
+ E_DECLARE_GDBUS_ARG (_where, _mname, method_out, opid, "u") \
+ \
+ static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
+ { \
+ &e_gdbus_ ## _where ## _method_out ## _mname ## opid, \
+ NULL \
+ }; \
+ \
+ static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
+ { \
+ -1, \
+ (gchar *) # _mname, \
+ (GDBusArgInfo **) NULL, \
+ (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
+ (GDBusAnnotationInfo **) NULL, \
};
-#define E_DECLARE_GDBUS_ASYNC_METHOD_1(_where, _mname, _p1_name, _p1_type) \
- E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_0 (_where, _mname ## _done) \
- E_DECLARE_GDBUS_ARG (_where, _mname, method_in, _p1_name, _p1_type) \
- E_DECLARE_GDBUS_ARG (_where, _mname, method_out, opid, "u") \
- \
- static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname[] = \
- { \
- &e_gdbus_ ## _where ## _method_in ## _mname ## _p1_name, \
- NULL \
- }; \
- \
- static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
- { \
- &e_gdbus_ ## _where ## _method_out ## _mname ## opid, \
- NULL \
- }; \
- \
- static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
- { \
- -1, \
- (gchar *) # _mname, \
- (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname, \
- (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
- (GDBusAnnotationInfo **) NULL, \
+#define E_DECLARE_GDBUS_ASYNC_METHOD_1(_where, _mname, _p1_name, _p1_type) \
+ E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_0 (_where, _mname ## _done) \
+ E_DECLARE_GDBUS_ARG (_where, _mname, method_in, _p1_name, _p1_type) \
+ E_DECLARE_GDBUS_ARG (_where, _mname, method_out, opid, "u") \
+ \
+ static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname[] = \
+ { \
+ &e_gdbus_ ## _where ## _method_in ## _mname ## _p1_name, \
+ NULL \
+ }; \
+ \
+ static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
+ { \
+ &e_gdbus_ ## _where ## _method_out ## _mname ## opid, \
+ NULL \
+ }; \
+ \
+ static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
+ { \
+ -1, \
+ (gchar *) # _mname, \
+ (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname, \
+ (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
+ (GDBusAnnotationInfo **) NULL, \
};
-#define E_DECLARE_GDBUS_ASYNC_METHOD_0_WITH_RETURN(_where, _mname, _r1_name, _r1_type) \
- E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_1 (_where, _mname ## _done, _r1_name, _r1_type) \
- E_DECLARE_GDBUS_ARG (_where, _mname, method_out, opid, "u") \
- \
- static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
- { \
- &e_gdbus_ ## _where ## _method_out ## _mname ## opid, \
- NULL \
- }; \
- \
- static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
- { \
- -1, \
- (gchar *) # _mname, \
- (GDBusArgInfo **) NULL, \
- (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
- (GDBusAnnotationInfo **) NULL, \
+#define E_DECLARE_GDBUS_ASYNC_METHOD_0_WITH_RETURN(_where, _mname, _r1_name, _r1_type) \
+ E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_1 (_where, _mname ## _done, _r1_name, _r1_type) \
+ E_DECLARE_GDBUS_ARG (_where, _mname, method_out, opid, "u") \
+ \
+ static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
+ { \
+ &e_gdbus_ ## _where ## _method_out ## _mname ## opid, \
+ NULL \
+ }; \
+ \
+ static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
+ { \
+ -1, \
+ (gchar *) # _mname, \
+ (GDBusArgInfo **) NULL, \
+ (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
+ (GDBusAnnotationInfo **) NULL, \
};
#define E_DECLARE_GDBUS_ASYNC_METHOD_1_WITH_RETURN(_where, _mname, _p1_name, _p1_type, _r1_name, _r1_type)\
- E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_1 (_where, _mname ## _done, _r1_name, _r1_type) \
- E_DECLARE_GDBUS_ARG (_where, _mname, method_in, _p1_name, _p1_type) \
- E_DECLARE_GDBUS_ARG (_where, _mname, method_out, opid, "u") \
- \
- static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname[] = \
- { \
- &e_gdbus_ ## _where ## _method_in ## _mname ## _p1_name, \
- NULL \
- }; \
- \
- static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
- { \
- &e_gdbus_ ## _where ## _method_out ## _mname ## opid, \
- NULL \
- }; \
- \
- static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
- { \
- -1, \
- (gchar *) # _mname, \
- (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname, \
- (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
- (GDBusAnnotationInfo **) NULL, \
+ E_DECLARE_GDBUS_ASYNC_DONE_SIGNAL_1 (_where, _mname ## _done, _r1_name, _r1_type) \
+ E_DECLARE_GDBUS_ARG (_where, _mname, method_in, _p1_name, _p1_type) \
+ E_DECLARE_GDBUS_ARG (_where, _mname, method_out, opid, "u") \
+ \
+ static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname[] = \
+ { \
+ &e_gdbus_ ## _where ## _method_in ## _mname ## _p1_name, \
+ NULL \
+ }; \
+ \
+ static const GDBusArgInfo * const e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname[] = \
+ { \
+ &e_gdbus_ ## _where ## _method_out ## _mname ## opid, \
+ NULL \
+ }; \
+ \
+ static const GDBusMethodInfo e_gdbus_ ## _where ## _method_ ## _mname = \
+ { \
+ -1, \
+ (gchar *) # _mname, \
+ (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_in_arg_pointers_ ## _mname, \
+ (GDBusArgInfo **) &e_gdbus_ ## _where ## _method_out_arg_pointers_ ## _mname, \
+ (GDBusAnnotationInfo **) NULL, \
};
#define E_DECLARED_GDBUS_SIGNAL_INFO_NAME(_where, _sname) e_gdbus_ ## _where ## _signal_ ## _sname
@@ -339,323 +339,323 @@ enum {
/* this requires signal_emission_hook_cb_ ## _sig_name hook defined,
* which can be created with one of E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_... macros */
-#define E_INIT_GDBUS_SIGNAL_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)
\
- signals[_sig_id] = g_signal_new (# _sig_name_var,
\
- G_TYPE_FROM_INTERFACE (iface),
\
- G_SIGNAL_RUN_LAST,
\
- G_STRUCT_OFFSET (_iface_struct, _sig_name_var),
\
- NULL,
\
- NULL,
\
- NULL,
\
- G_TYPE_NONE,
\
- 0);
\
-
\
+#define E_INIT_GDBUS_SIGNAL_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id) \
+ signals[_sig_id] = g_signal_new (# _sig_name_var, \
+ G_TYPE_FROM_INTERFACE (iface), \
+ G_SIGNAL_RUN_LAST, \
+ G_STRUCT_OFFSET (_iface_struct, _sig_name_var), \
+ NULL, \
+ NULL, \
+ NULL, \
+ G_TYPE_NONE, \
+ 0); \
+ \
g_signal_add_emission_hook (signals[_sig_id], 0, signal_emission_hook_cb_ ## _sig_name_var,
(gpointer) _dbus_sig_name_str, NULL);\
- g_hash_table_insert (_signal_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (_sig_id));
\
+ g_hash_table_insert (_signal_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (_sig_id)); \
g_hash_table_insert (_signal_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER
(E_GDBUS_TYPE_VOID));
-#define E_INIT_GDBUS_SIGNAL_TMPL_TYPED(_mtype, _gtype, _iface_struct, _dbus_sig_name_str, _sig_name_var,
_sig_id) \
- signals[_sig_id] = g_signal_new (# _sig_name_var,
\
- G_TYPE_FROM_INTERFACE (iface),
\
- G_SIGNAL_RUN_LAST,
\
- G_STRUCT_OFFSET (_iface_struct, _sig_name_var),
\
- NULL,
\
- NULL,
\
- NULL,
\
- G_TYPE_NONE,
\
- 1,
\
- G_TYPE_ ## _gtype);
\
-
\
+#define E_INIT_GDBUS_SIGNAL_TMPL_TYPED(_mtype, _gtype, _iface_struct, _dbus_sig_name_str, _sig_name_var,
_sig_id) \
+ signals[_sig_id] = g_signal_new (# _sig_name_var, \
+ G_TYPE_FROM_INTERFACE (iface), \
+ G_SIGNAL_RUN_LAST, \
+ G_STRUCT_OFFSET (_iface_struct, _sig_name_var), \
+ NULL, \
+ NULL, \
+ NULL, \
+ G_TYPE_NONE, \
+ 1, \
+ G_TYPE_ ## _gtype); \
+ \
g_signal_add_emission_hook (signals[_sig_id], 0, signal_emission_hook_cb_ ## _sig_name_var,
(gpointer) _dbus_sig_name_str, NULL);\
- g_hash_table_insert (_signal_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (_sig_id));
\
+ g_hash_table_insert (_signal_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (_sig_id)); \
g_hash_table_insert (_signal_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER
(E_GDBUS_TYPE_ ## _gtype));
-#define E_INIT_GDBUS_SIGNAL_BOOLEAN(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)
\
+#define E_INIT_GDBUS_SIGNAL_BOOLEAN(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id) \
E_INIT_GDBUS_SIGNAL_TMPL_TYPED (BOOLEAN, BOOLEAN, _iface_struct, _dbus_sig_name_str, _sig_name_var,
_sig_id)
-#define E_INIT_GDBUS_SIGNAL_STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)
\
+#define E_INIT_GDBUS_SIGNAL_STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id) \
E_INIT_GDBUS_SIGNAL_TMPL_TYPED (STRING, STRING, _iface_struct, _dbus_sig_name_str, _sig_name_var,
_sig_id)
-#define E_INIT_GDBUS_SIGNAL_STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)
\
+#define E_INIT_GDBUS_SIGNAL_STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id) \
E_INIT_GDBUS_SIGNAL_TMPL_TYPED (BOXED, STRV, _iface_struct, _dbus_sig_name_str, _sig_name_var,
_sig_id)
-#define E_INIT_GDBUS_SIGNAL_UINT(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)
\
+#define E_INIT_GDBUS_SIGNAL_UINT(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id) \
E_INIT_GDBUS_SIGNAL_TMPL_TYPED (UINT, UINT, _iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)
-#define E_INIT_GDBUS_SIGNAL_UINT_STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id)
\
- signals[_sig_id] = g_signal_new (# _sig_name_var,
\
- G_TYPE_FROM_INTERFACE (iface),
\
- G_SIGNAL_RUN_LAST,
\
- G_STRUCT_OFFSET (_iface_struct, _sig_name_var),
\
- NULL,
\
- NULL,
\
- NULL,
\
- G_TYPE_NONE,
\
- 2,
\
- G_TYPE_UINT, G_TYPE_STRING);
\
-
\
+#define E_INIT_GDBUS_SIGNAL_UINT_STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _sig_id) \
+ signals[_sig_id] = g_signal_new (# _sig_name_var, \
+ G_TYPE_FROM_INTERFACE (iface), \
+ G_SIGNAL_RUN_LAST, \
+ G_STRUCT_OFFSET (_iface_struct, _sig_name_var), \
+ NULL, \
+ NULL, \
+ NULL, \
+ G_TYPE_NONE, \
+ 2, \
+ G_TYPE_UINT, G_TYPE_STRING); \
+ \
g_signal_add_emission_hook (signals[_sig_id], 0, signal_emission_hook_cb_ ## _sig_name_var,
(gpointer) _dbus_sig_name_str, NULL);\
- g_hash_table_insert (_signal_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (_sig_id));
\
+ g_hash_table_insert (_signal_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER (_sig_id)); \
g_hash_table_insert (_signal_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER
(E_GDBUS_TYPE_UINT | E_GDBUS_TYPE_STRING));
-#define E_INIT_GDBUS_METHOD_DONE_VOID(_iface_struct, _sig_name_var, _done_sig_id)
\
- signals[_done_sig_id] = g_signal_new (# _sig_name_var "_done",
\
- G_TYPE_FROM_INTERFACE (iface),
\
- G_SIGNAL_RUN_LAST,
\
- G_STRUCT_OFFSET (_iface_struct, _sig_name_var ## _done),
\
- NULL,
\
- NULL,
\
- NULL,
\
- G_TYPE_NONE,
\
- 2,
\
- G_TYPE_UINT, G_TYPE_ERROR);
\
- g_signal_add_emission_hook (signals[_done_sig_id], 0,
\
- signal_emission_hook_cb_ ## _sig_name_var ## _done, (gpointer) # _sig_name_var
"_done", NULL); \
- g_hash_table_insert (_signal_name_to_id, (gpointer) # _sig_name_var "_done", GUINT_TO_POINTER
(_done_sig_id)); \
+#define E_INIT_GDBUS_METHOD_DONE_VOID(_iface_struct, _sig_name_var, _done_sig_id) \
+ signals[_done_sig_id] = g_signal_new (# _sig_name_var "_done", \
+ G_TYPE_FROM_INTERFACE (iface), \
+ G_SIGNAL_RUN_LAST, \
+ G_STRUCT_OFFSET (_iface_struct, _sig_name_var ## _done), \
+ NULL, \
+ NULL, \
+ NULL, \
+ G_TYPE_NONE, \
+ 2, \
+ G_TYPE_UINT, G_TYPE_ERROR); \
+ g_signal_add_emission_hook (signals[_done_sig_id], 0, \
+ signal_emission_hook_cb_ ## _sig_name_var ## _done, (gpointer) # _sig_name_var
"_done", NULL); \
+ g_hash_table_insert (_signal_name_to_id, (gpointer) # _sig_name_var "_done", GUINT_TO_POINTER
(_done_sig_id)); \
g_hash_table_insert (_signal_name_to_type, (gpointer) # _sig_name_var "_done", GUINT_TO_POINTER
(E_GDBUS_TYPE_IS_ASYNC | E_GDBUS_TYPE_VOID));
-#define E_INIT_GDBUS_METHOD_DONE_ASYNC_TMPL_TYPED(_mtype, _gtype, _iface_struct, _sig_name_var,
_done_sig_id) \
- signals[_done_sig_id] = g_signal_new (# _sig_name_var "_done",
\
- G_TYPE_FROM_INTERFACE (iface),
\
- G_SIGNAL_RUN_LAST,
\
- G_STRUCT_OFFSET (_iface_struct, _sig_name_var ## _done),
\
- NULL,
\
- NULL,
\
- NULL,
\
- G_TYPE_NONE,
\
- 3,
\
- G_TYPE_UINT, G_TYPE_ERROR, G_TYPE_ ## _gtype);
\
- g_signal_add_emission_hook (signals[_done_sig_id], 0,
\
- signal_emission_hook_cb_ ## _sig_name_var ## _done, (gpointer) # _sig_name_var
"_done", NULL); \
- g_hash_table_insert (_signal_name_to_id, (gpointer) # _sig_name_var "_done", GUINT_TO_POINTER
(_done_sig_id)); \
+#define E_INIT_GDBUS_METHOD_DONE_ASYNC_TMPL_TYPED(_mtype, _gtype, _iface_struct, _sig_name_var,
_done_sig_id) \
+ signals[_done_sig_id] = g_signal_new (# _sig_name_var "_done", \
+ G_TYPE_FROM_INTERFACE (iface), \
+ G_SIGNAL_RUN_LAST, \
+ G_STRUCT_OFFSET (_iface_struct, _sig_name_var ## _done), \
+ NULL, \
+ NULL, \
+ NULL, \
+ G_TYPE_NONE, \
+ 3, \
+ G_TYPE_UINT, G_TYPE_ERROR, G_TYPE_ ## _gtype); \
+ g_signal_add_emission_hook (signals[_done_sig_id], 0, \
+ signal_emission_hook_cb_ ## _sig_name_var ## _done, (gpointer) # _sig_name_var
"_done", NULL); \
+ g_hash_table_insert (_signal_name_to_id, (gpointer) # _sig_name_var "_done", GUINT_TO_POINTER
(_done_sig_id)); \
g_hash_table_insert (_signal_name_to_type, (gpointer) # _sig_name_var "_done", GUINT_TO_POINTER
(E_GDBUS_TYPE_IS_ASYNC | E_GDBUS_TYPE_ ## _gtype));
-#define E_INIT_GDBUS_METHOD_DONE_BOOLEAN(_iface_struct, _sig_name_var, _done_sig_id)
\
+#define E_INIT_GDBUS_METHOD_DONE_BOOLEAN(_iface_struct, _sig_name_var, _done_sig_id) \
E_INIT_GDBUS_METHOD_DONE_ASYNC_TMPL_TYPED (BOOLEAN, BOOLEAN, _iface_struct, _sig_name_var,
_done_sig_id)
-#define E_INIT_GDBUS_METHOD_DONE_STRING(_iface_struct, _sig_name_var, _done_sig_id)
\
+#define E_INIT_GDBUS_METHOD_DONE_STRING(_iface_struct, _sig_name_var, _done_sig_id) \
E_INIT_GDBUS_METHOD_DONE_ASYNC_TMPL_TYPED (STRING, STRING, _iface_struct, _sig_name_var, _done_sig_id)
-#define E_INIT_GDBUS_METHOD_DONE_STRV(_iface_struct, _sig_name_var, _done_sig_id)
\
+#define E_INIT_GDBUS_METHOD_DONE_STRV(_iface_struct, _sig_name_var, _done_sig_id) \
E_INIT_GDBUS_METHOD_DONE_ASYNC_TMPL_TYPED (BOXED, STRV, _iface_struct, _sig_name_var, _done_sig_id)
-#define E_INIT_GDBUS_METHOD_DONE_UINT(_iface_struct, _sig_name_var, _done_sig_id)
\
+#define E_INIT_GDBUS_METHOD_DONE_UINT(_iface_struct, _sig_name_var, _done_sig_id) \
E_INIT_GDBUS_METHOD_DONE_ASYNC_TMPL_TYPED (UINT, UINT, _iface_struct, _sig_name_var, _done_sig_id)
/* do not use this directly, there is missing _method_name_to_type insertion */
-#define E_INIT_GDBUS_METHOD_CALL_TMPL_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
- signals[_method_sig_id] = g_signal_new ("handle-" # _sig_name_var,
\
- G_TYPE_FROM_INTERFACE (iface),
\
- G_SIGNAL_RUN_LAST,
\
- G_STRUCT_OFFSET (_iface_struct, handle_ ## _sig_name_var),
\
- NULL, NULL, NULL,
\
- G_TYPE_BOOLEAN,
\
- 1,
\
- G_TYPE_DBUS_METHOD_INVOCATION);
\
+#define E_INIT_GDBUS_METHOD_CALL_TMPL_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+ signals[_method_sig_id] = g_signal_new ("handle-" # _sig_name_var, \
+ G_TYPE_FROM_INTERFACE (iface), \
+ G_SIGNAL_RUN_LAST, \
+ G_STRUCT_OFFSET (_iface_struct, handle_ ## _sig_name_var), \
+ NULL, NULL, NULL, \
+ G_TYPE_BOOLEAN, \
+ 1, \
+ G_TYPE_DBUS_METHOD_INVOCATION); \
g_hash_table_insert (_method_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER
(_method_sig_id));
/* do not use this directly, there is missing _method_name_to_type insertion */
-#define E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED(_mtype, _gtype, _iface_struct, _dbus_sig_name_str,
_sig_name_var, _method_sig_id) \
- signals[_method_sig_id] = g_signal_new ("handle-" # _sig_name_var,
\
- G_TYPE_FROM_INTERFACE (iface),
\
- G_SIGNAL_RUN_LAST,
\
- G_STRUCT_OFFSET (_iface_struct, handle_ ## _sig_name_var),
\
- NULL, NULL, NULL,
\
- G_TYPE_BOOLEAN,
\
- 2,
\
- G_TYPE_DBUS_METHOD_INVOCATION,
\
- G_TYPE_ ## _gtype);
\
- g_hash_table_insert (_method_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER
(_method_sig_id)); \
-
-#define E_INIT_GDBUS_METHOD_CALL_ASYNC_TMPL_TYPED(_mtype, _gtype, _iface_struct, _dbus_sig_name_str,
_sig_name_var, _method_sig_id) \
- E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (_mtype, _gtype, _iface_struct, _dbus_sig_name_str,
_sig_name_var, _method_sig_id) \
+#define E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED(_mtype, _gtype, _iface_struct, _dbus_sig_name_str,
_sig_name_var, _method_sig_id) \
+ signals[_method_sig_id] = g_signal_new ("handle-" # _sig_name_var, \
+ G_TYPE_FROM_INTERFACE (iface), \
+ G_SIGNAL_RUN_LAST, \
+ G_STRUCT_OFFSET (_iface_struct, handle_ ## _sig_name_var), \
+ NULL, NULL, NULL, \
+ G_TYPE_BOOLEAN, \
+ 2, \
+ G_TYPE_DBUS_METHOD_INVOCATION, \
+ G_TYPE_ ## _gtype); \
+ g_hash_table_insert (_method_name_to_id, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER
(_method_sig_id)); \
+
+#define E_INIT_GDBUS_METHOD_CALL_ASYNC_TMPL_TYPED(_mtype, _gtype, _iface_struct, _dbus_sig_name_str,
_sig_name_var, _method_sig_id) \
+ E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (_mtype, _gtype, _iface_struct, _dbus_sig_name_str,
_sig_name_var, _method_sig_id) \
g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER
(E_GDBUS_TYPE_ ## _gtype | E_GDBUS_TYPE_IS_ASYNC));
-#define E_INIT_GDBUS_METHOD_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
- E_INIT_GDBUS_METHOD_CALL_TMPL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
+ E_INIT_GDBUS_METHOD_CALL_TMPL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER
(E_GDBUS_TYPE_VOID));
-#define E_INIT_GDBUS_METHOD_BOOLEAN(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_BOOLEAN(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (BOOLEAN, BOOLEAN, _iface_struct, _dbus_sig_name_str,
_sig_name_var, _method_sig_id)\
g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER
(E_GDBUS_TYPE_BOOLEAN));
-#define E_INIT_GDBUS_METHOD_STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
- E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (STRING, STRING, _iface_struct, _dbus_sig_name_str,
_sig_name_var, _method_sig_id) \
+#define E_INIT_GDBUS_METHOD_STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
+ E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (STRING, STRING, _iface_struct, _dbus_sig_name_str,
_sig_name_var, _method_sig_id) \
g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER
(E_GDBUS_TYPE_STRING));
-#define E_INIT_GDBUS_METHOD_STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
- E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (BOXED, STRV, _iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id) \
+#define E_INIT_GDBUS_METHOD_STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
+ E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (BOXED, STRV, _iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id) \
g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER
(E_GDBUS_TYPE_STRV));
-#define E_INIT_GDBUS_METHOD_UINT(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
- E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (UINT, UINT, _iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id) \
+#define E_INIT_GDBUS_METHOD_UINT(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
+ E_INIT_GDBUS_METHOD_CALL_TMPL_TYPED (UINT, UINT, _iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id) \
g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER
(E_GDBUS_TYPE_UINT));
-#define E_INIT_GDBUS_METHOD_CALL_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
- E_INIT_GDBUS_METHOD_CALL_TMPL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_CALL_VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
+ E_INIT_GDBUS_METHOD_CALL_TMPL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
g_hash_table_insert (_method_name_to_type, (gpointer) _dbus_sig_name_str, GUINT_TO_POINTER
(E_GDBUS_TYPE_VOID | E_GDBUS_TYPE_IS_ASYNC));
-#define E_INIT_GDBUS_METHOD_CALL_BOOLEAN(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_CALL_BOOLEAN(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
E_INIT_GDBUS_METHOD_CALL_ASYNC_TMPL_TYPED (BOOLEAN, BOOLEAN, _iface_struct, _dbus_sig_name_str,
_sig_name_var, _method_sig_id)
-#define E_INIT_GDBUS_METHOD_CALL_STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_CALL_STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
E_INIT_GDBUS_METHOD_CALL_ASYNC_TMPL_TYPED (STRING, STRING, _iface_struct, _dbus_sig_name_str,
_sig_name_var, _method_sig_id)
-#define E_INIT_GDBUS_METHOD_CALL_STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_CALL_STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
E_INIT_GDBUS_METHOD_CALL_ASYNC_TMPL_TYPED (BOXED, STRV, _iface_struct, _dbus_sig_name_str,
_sig_name_var, _method_sig_id)
-#define E_INIT_GDBUS_METHOD_CALL_UINT(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_CALL_UINT(_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
E_INIT_GDBUS_METHOD_CALL_ASYNC_TMPL_TYPED (UINT, UINT, _iface_struct, _dbus_sig_name_str,
_sig_name_var, _method_sig_id)
-#define E_INIT_GDBUS_METHOD_ASYNC_VOID__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
- E_INIT_GDBUS_METHOD_CALL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_ASYNC_VOID__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
+ E_INIT_GDBUS_METHOD_CALL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
E_INIT_GDBUS_METHOD_DONE_VOID (_iface_struct, _sig_name_var, _done_sig_id)
-#define E_INIT_GDBUS_METHOD_ASYNC_VOID__STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
- E_INIT_GDBUS_METHOD_CALL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_ASYNC_VOID__STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
+ E_INIT_GDBUS_METHOD_CALL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
E_INIT_GDBUS_METHOD_DONE_STRING (_iface_struct, _sig_name_var, _done_sig_id)
-#define E_INIT_GDBUS_METHOD_ASYNC_VOID__STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
- E_INIT_GDBUS_METHOD_CALL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_ASYNC_VOID__STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
+ E_INIT_GDBUS_METHOD_CALL_VOID (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
E_INIT_GDBUS_METHOD_DONE_STRV (_iface_struct, _sig_name_var, _done_sig_id)
-#define E_INIT_GDBUS_METHOD_ASYNC_BOOLEAN__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
- E_INIT_GDBUS_METHOD_CALL_BOOLEAN (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_ASYNC_BOOLEAN__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
+ E_INIT_GDBUS_METHOD_CALL_BOOLEAN (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
E_INIT_GDBUS_METHOD_DONE_VOID (_iface_struct, _sig_name_var, _done_sig_id)
-#define E_INIT_GDBUS_METHOD_ASYNC_UINT__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
- E_INIT_GDBUS_METHOD_CALL_UINT (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_ASYNC_UINT__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
+ E_INIT_GDBUS_METHOD_CALL_UINT (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
E_INIT_GDBUS_METHOD_DONE_VOID (_iface_struct, _sig_name_var, _done_sig_id)
-#define E_INIT_GDBUS_METHOD_ASYNC_STRING__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
- E_INIT_GDBUS_METHOD_CALL_STRING (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_ASYNC_STRING__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
+ E_INIT_GDBUS_METHOD_CALL_STRING (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
E_INIT_GDBUS_METHOD_DONE_VOID (_iface_struct, _sig_name_var, _done_sig_id)
-#define E_INIT_GDBUS_METHOD_ASYNC_STRV__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
- E_INIT_GDBUS_METHOD_CALL_STRV (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_ASYNC_STRV__VOID(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
+ E_INIT_GDBUS_METHOD_CALL_STRV (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
E_INIT_GDBUS_METHOD_DONE_VOID (_iface_struct, _sig_name_var, _done_sig_id)
#define E_INIT_GDBUS_METHOD_ASYNC_STRING__STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id)\
- E_INIT_GDBUS_METHOD_CALL_STRING (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+ E_INIT_GDBUS_METHOD_CALL_STRING (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
E_INIT_GDBUS_METHOD_DONE_STRING (_iface_struct, _sig_name_var, _done_sig_id)
-#define E_INIT_GDBUS_METHOD_ASYNC_STRING__STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
- E_INIT_GDBUS_METHOD_CALL_STRING (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_ASYNC_STRING__STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
+ E_INIT_GDBUS_METHOD_CALL_STRING (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
E_INIT_GDBUS_METHOD_DONE_STRV (_iface_struct, _sig_name_var, _done_sig_id)
-#define E_INIT_GDBUS_METHOD_ASYNC_STRV__STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
- E_INIT_GDBUS_METHOD_CALL_STRV (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_ASYNC_STRV__STRING(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
+ E_INIT_GDBUS_METHOD_CALL_STRV (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
E_INIT_GDBUS_METHOD_DONE_STRING (_iface_struct, _sig_name_var, _done_sig_id)
-#define E_INIT_GDBUS_METHOD_ASYNC_STRV__STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
- E_INIT_GDBUS_METHOD_CALL_STRV (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id)
\
+#define E_INIT_GDBUS_METHOD_ASYNC_STRV__STRV(_iface_struct, _dbus_sig_name_str, _sig_name_var,
_method_sig_id, _done_sig_id) \
+ E_INIT_GDBUS_METHOD_CALL_STRV (_iface_struct, _dbus_sig_name_str, _sig_name_var, _method_sig_id) \
E_INIT_GDBUS_METHOD_DONE_STRV (_iface_struct, _sig_name_var, _done_sig_id)
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_VOID(_iface_name, _sig_name)
\
- static gboolean
\
- signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
- {
\
- return e_gdbus_signal_emission_hook_void (ihint, n_param_values, param_values, user_data,
_iface_name); \
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_VOID(_iface_name, _sig_name) \
+ static gboolean \
+ signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
+ { \
+ return e_gdbus_signal_emission_hook_void (ihint, n_param_values, param_values, user_data,
_iface_name); \
}
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_BOOLEAN(_iface_name, _sig_name)
\
- static gboolean
\
- signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
- {
\
- return e_gdbus_signal_emission_hook_boolean (ihint, n_param_values, param_values, user_data,
_iface_name); \
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_BOOLEAN(_iface_name, _sig_name) \
+ static gboolean \
+ signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
+ { \
+ return e_gdbus_signal_emission_hook_boolean (ihint, n_param_values, param_values, user_data,
_iface_name); \
}
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_STRING(_iface_name, _sig_name)
\
- static gboolean
\
- signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
- {
\
- return e_gdbus_signal_emission_hook_string (ihint, n_param_values, param_values, user_data,
_iface_name); \
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_STRING(_iface_name, _sig_name) \
+ static gboolean \
+ signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
+ { \
+ return e_gdbus_signal_emission_hook_string (ihint, n_param_values, param_values, user_data,
_iface_name); \
}
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_STRV(_iface_name, _sig_name)
\
- static gboolean
\
- signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
- {
\
- return e_gdbus_signal_emission_hook_strv (ihint, n_param_values, param_values, user_data,
_iface_name); \
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_STRV(_iface_name, _sig_name) \
+ static gboolean \
+ signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
+ { \
+ return e_gdbus_signal_emission_hook_strv (ihint, n_param_values, param_values, user_data,
_iface_name); \
}
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_UINT(_iface_name, _sig_name)
\
- static gboolean
\
- signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
- {
\
- return e_gdbus_signal_emission_hook_uint (ihint, n_param_values, param_values, user_data,
_iface_name); \
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_UINT(_iface_name, _sig_name) \
+ static gboolean \
+ signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
+ { \
+ return e_gdbus_signal_emission_hook_uint (ihint, n_param_values, param_values, user_data,
_iface_name); \
}
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_UINT_STRING(_iface_name, _sig_name)
\
- static gboolean
\
- signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
- {
\
- return e_gdbus_signal_emission_hook_uint_string (ihint, n_param_values, param_values,
user_data, _iface_name); \
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_UINT_STRING(_iface_name, _sig_name) \
+ static gboolean \
+ signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
+ { \
+ return e_gdbus_signal_emission_hook_uint_string (ihint, n_param_values, param_values,
user_data, _iface_name); \
}
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_VOID(_iface_name, _sig_name)
\
- static gboolean
\
- signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
- {
\
- return e_gdbus_signal_emission_hook_async_void (ihint, n_param_values, param_values,
user_data, _iface_name); \
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_VOID(_iface_name, _sig_name) \
+ static gboolean \
+ signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
+ { \
+ return e_gdbus_signal_emission_hook_async_void (ihint, n_param_values, param_values,
user_data, _iface_name); \
}
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_BOOLEAN(_iface_name, _sig_name)
\
- static gboolean
\
- signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
- {
\
- return e_gdbus_signal_emission_hook_async_boolean (ihint, n_param_values, param_values,
user_data, _iface_name); \
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_BOOLEAN(_iface_name, _sig_name) \
+ static gboolean \
+ signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
+ { \
+ return e_gdbus_signal_emission_hook_async_boolean (ihint, n_param_values, param_values,
user_data, _iface_name); \
}
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_STRING(_iface_name, _sig_name)
\
- static gboolean
\
- signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
- {
\
- return e_gdbus_signal_emission_hook_async_string (ihint, n_param_values, param_values,
user_data, _iface_name); \
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_STRING(_iface_name, _sig_name) \
+ static gboolean \
+ signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
+ { \
+ return e_gdbus_signal_emission_hook_async_string (ihint, n_param_values, param_values,
user_data, _iface_name); \
}
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_STRV(_iface_name, _sig_name)
\
- static gboolean
\
- signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
- {
\
- return e_gdbus_signal_emission_hook_async_strv (ihint, n_param_values, param_values,
user_data, _iface_name); \
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_STRV(_iface_name, _sig_name) \
+ static gboolean \
+ signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
+ { \
+ return e_gdbus_signal_emission_hook_async_strv (ihint, n_param_values, param_values,
user_data, _iface_name); \
}
-#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_UINT(_iface_name, _sig_name)
\
- static gboolean
\
- signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
- {
\
- return e_gdbus_signal_emission_hook_async_uint (ihint, n_param_values, param_values,
user_data, _iface_name); \
+#define E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_UINT(_iface_name, _sig_name) \
+ static gboolean \
+ signal_emission_hook_cb_ ## _sig_name (GSignalInvocationHint *ihint, guint n_param_values, const
GValue *param_values, gpointer user_data) \
+ { \
+ return e_gdbus_signal_emission_hook_async_uint (ihint, n_param_values, param_values,
user_data, _iface_name); \
}
-#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_VOID(_iface_name, _sig_name)
\
+#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_VOID(_iface_name, _sig_name) \
E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_VOID (_iface_name, _sig_name ## _done)
-#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_BOOLEAN(_iface_name, _sig_name)
\
+#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_BOOLEAN(_iface_name, _sig_name) \
E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_BOOLEAN (_iface_name, _sig_name ## _done)
-#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_STRING(_iface_name, _sig_name)
\
+#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_STRING(_iface_name, _sig_name) \
E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_STRING (_iface_name, _sig_name ## _done)
-#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_STRV(_iface_name, _sig_name)
\
+#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_STRV(_iface_name, _sig_name) \
E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_STRV (_iface_name, _sig_name ## _done)
-#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_UINT(_iface_name, _sig_name)
\
+#define E_DECLARE_GDBUS_METHOD_DONE_EMISSION_HOOK_ASYNC_UINT(_iface_name, _sig_name) \
E_DECLARE_GDBUS_SIGNAL_EMISSION_HOOK_ASYNC_UINT (_iface_name, _sig_name ## _done)
-#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_VOID(_sig_name)
\
+#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_VOID(_sig_name) \
g_signal_connect (proxy, # _sig_name "_done", G_CALLBACK (e_gdbus_proxy_async_method_done_void),
NULL);
-#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_BOOLEAN(_sig_name)
\
+#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_BOOLEAN(_sig_name) \
g_signal_connect (proxy, # _sig_name "_done", G_CALLBACK (e_gdbus_proxy_async_method_done_boolean),
NULL);
-#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_STRING(_sig_name)
\
+#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_STRING(_sig_name) \
g_signal_connect (proxy, # _sig_name "_done", G_CALLBACK (e_gdbus_proxy_async_method_done_string),
NULL);
-#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_STRV(_sig_name)
\
+#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_STRV(_sig_name) \
g_signal_connect (proxy, # _sig_name "_done", G_CALLBACK (e_gdbus_proxy_async_method_done_strv),
NULL);
-#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_UINT(_sig_name)
\
+#define E_GDBUS_CONNECT_METHOD_DONE_SIGNAL_UINT(_sig_name) \
g_signal_connect (proxy, # _sig_name "_done", G_CALLBACK (e_gdbus_proxy_async_method_done_uint),
NULL);
void e_gdbus_proxy_emit_signal (GDBusProxy *proxy, GVariant *parameters, guint signal_id, guint signal_type);
diff --git a/libedataserver/e-list-iterator.c b/libedataserver/e-list-iterator.c
index 4e30a90..c2cd42e 100644
--- a/libedataserver/e-list-iterator.c
+++ b/libedataserver/e-list-iterator.c
@@ -39,15 +39,15 @@ e_list_iterator_class_init (EListIteratorClass *class)
iterator_class = E_ITERATOR_CLASS (class);
iterator_class->invalidate = e_list_iterator_invalidate;
- iterator_class->get = e_list_iterator_get;
- iterator_class->reset = e_list_iterator_reset;
- iterator_class->last = e_list_iterator_last;
- iterator_class->next = e_list_iterator_next;
- iterator_class->prev = e_list_iterator_prev;
- iterator_class->remove = e_list_iterator_remove;
- iterator_class->insert = e_list_iterator_insert;
- iterator_class->set = e_list_iterator_set;
- iterator_class->is_valid = e_list_iterator_is_valid;
+ iterator_class->get = e_list_iterator_get;
+ iterator_class->reset = e_list_iterator_reset;
+ iterator_class->last = e_list_iterator_last;
+ iterator_class->next = e_list_iterator_next;
+ iterator_class->prev = e_list_iterator_prev;
+ iterator_class->remove = e_list_iterator_remove;
+ iterator_class->insert = e_list_iterator_insert;
+ iterator_class->set = e_list_iterator_set;
+ iterator_class->is_valid = e_list_iterator_is_valid;
}
/**
diff --git a/libedataserver/e-list.c b/libedataserver/e-list.c
index 18ce584..8812670 100644
--- a/libedataserver/e-list.c
+++ b/libedataserver/e-list.c
@@ -76,8 +76,8 @@ e_list_construct (EList *list,
EListFreeFunc free,
gpointer closure)
{
- list->copy = copy;
- list->free = free;
+ list->copy = copy;
+ list->free = free;
list->closure = closure;
}
@@ -92,10 +92,10 @@ e_list_duplicate (EList *list)
{
EList *dupe = g_object_new (E_TYPE_LIST, NULL);
- dupe->copy = list->copy;
- dupe->free = list->free;
+ dupe->copy = list->copy;
+ dupe->free = list->free;
dupe->closure = list->closure;
- dupe->list = g_list_copy (list->list);
+ dupe->list = g_list_copy (list->list);
if (dupe->copy) {
GList *listlist;
for (listlist = dupe->list; listlist; listlist = listlist->next) {
diff --git a/libedataserver/e-proxy.c b/libedataserver/e-proxy.c
index 48b8ce1..b72f0b6 100644
--- a/libedataserver/e-proxy.c
+++ b/libedataserver/e-proxy.c
@@ -31,7 +31,7 @@
#ifdef _WIN32
#include <winsock2.h>
#ifndef IN6_ARE_ADDR_EQUAL
-#define IN6_ARE_ADDR_EQUAL(a, b) \
+#define IN6_ARE_ADDR_EQUAL(a, b) \
(memcmp ((gpointer)(a), (gpointer)(b), sizeof (struct in6_addr)) == 0)
#endif
#else
@@ -362,7 +362,7 @@ ep_need_proxy_http (EProxy *proxy,
for (l = priv->ign_addrs; l; l = l->next) {
p_addr = (ProxyHostAddr *) l->data;
if (p_addr->type == PROXY_IPV4) {
- addr_in = ((struct in_addr *) p_addr->addr);
+ addr_in = ((struct in_addr *) p_addr->addr);
mask = ((struct in_addr *) p_addr->mask);
if ((in.s_addr & mask->s_addr) == addr_in->s_addr) {
d (g_print ("Host [%s] doesn't require proxy\n", host));
@@ -389,7 +389,7 @@ ep_need_proxy_http (EProxy *proxy,
IN6_IS_ADDR_V4MAPPED (&net6)) {
guint32 v4addr;
- addr_in = ((struct in_addr *) p_addr->addr);
+ addr_in = ((struct in_addr *) p_addr->addr);
mask = ((struct in_addr *) p_addr->mask);
v4addr = net6.s6_addr[12] << 24
diff --git a/libedataserver/e-source-enums.h b/libedataserver/e-source-enums.h
index cfde228..569cee5 100644
--- a/libedataserver/e-source-enums.h
+++ b/libedataserver/e-source-enums.h
@@ -93,11 +93,11 @@ typedef enum {
* Since: 3.8
**/
typedef enum {
- E_TRUST_PROMPT_RESPONSE_UNKNOWN = -1,
- E_TRUST_PROMPT_RESPONSE_REJECT = 0,
- E_TRUST_PROMPT_RESPONSE_ACCEPT = 1,
- E_TRUST_PROMPT_RESPONSE_ACCEPT_TEMPORARILY = 2,
- E_TRUST_PROMPT_RESPONSE_REJECT_TEMPORARILY = 3
+ E_TRUST_PROMPT_RESPONSE_UNKNOWN = -1,
+ E_TRUST_PROMPT_RESPONSE_REJECT = 0,
+ E_TRUST_PROMPT_RESPONSE_ACCEPT = 1,
+ E_TRUST_PROMPT_RESPONSE_ACCEPT_TEMPORARILY = 2,
+ E_TRUST_PROMPT_RESPONSE_REJECT_TEMPORARILY = 3
} ETrustPromptResponse;
#endif /* E_SOURCE_ENUMS_H */
diff --git a/libedataserver/e-source-registry.c b/libedataserver/e-source-registry.c
index 5ba6005..23789d3 100644
--- a/libedataserver/e-source-registry.c
+++ b/libedataserver/e-source-registry.c
@@ -1886,9 +1886,9 @@ source_registry_authenticate_dismissed_cb (EDBusAuthenticator *dbus_auth,
/* Helper for e_source_registry_authenticate_sync() */
static void
source_registry_authenticate_server_error_cb (EDBusAuthenticator *dbus_auth,
- const gchar *name,
- const gchar *message,
- AuthContext *auth_context)
+ const gchar *name,
+ const gchar *message,
+ AuthContext *auth_context)
{
/* Be careful not to overwrite an existing error */
if (auth_context->auth_result != E_SOURCE_AUTHENTICATION_ERROR) {
diff --git a/libedataserver/e-time-utils.c b/libedataserver/e-time-utils.c
index c56e22a..83d4635 100644
--- a/libedataserver/e-time-utils.c
+++ b/libedataserver/e-time-utils.c
@@ -234,9 +234,9 @@ localtime_r (t,
#define match_char(ch1, ch2) if (ch1 != ch2) return NULL
#if defined _LIBC && defined __GNUC__ && __GNUC__ >= 2
# define match_string(cs1, s2) \
- ({ gsize len = strlen (cs1); \
- gint result = __strncasecmp_l ((cs1), (s2), len, locale) == 0; \
- if (result) (s2) += len; \
+ ({ gsize len = strlen (cs1); \
+ gint result = __strncasecmp_l ((cs1), (s2), len, locale) == 0; \
+ if (result) (s2) += len; \
result; })
#else
/* Oh come on. Get a reasonable compiler. */
@@ -246,51 +246,51 @@ localtime_r (t,
/* We intentionally do not use isdigit() for testing because this will
* lead to problems with the wide character version. */
#define get_number(from, to, n) \
- do { \
- gint __n = n; \
- val = 0; \
- while (*rp == ' ') \
- ++rp; \
- if (*rp < '0' || *rp > '9') \
- return NULL; \
- do { \
- val *= 10; \
- val += *rp++ - '0'; \
- } while (--__n > 0 && val * 10 <= to && *rp >= '0' && *rp <= '9'); \
- if (val < from || val > to) \
- return NULL; \
+ do { \
+ gint __n = n; \
+ val = 0; \
+ while (*rp == ' ') \
+ ++rp; \
+ if (*rp < '0' || *rp > '9') \
+ return NULL; \
+ do { \
+ val *= 10; \
+ val += *rp++ - '0'; \
+ } while (--__n > 0 && val * 10 <= to && *rp >= '0' && *rp <= '9'); \
+ if (val < from || val > to) \
+ return NULL; \
} while (0)
#ifdef _NL_CURRENT
# define get_alt_number(from, to, n) \
- ({ \
- __label__ do_normal; \
- \
- if (*decided != raw) \
- { \
- val = _nl_parse_alt_digit (&rp HELPER_LOCALE_ARG); \
- if (val == -1 && *decided != loc) \
- { \
- *decided = loc; \
- goto do_normal; \
- } \
- if (val < from || val > to) \
- return NULL; \
- } \
- else \
- { \
- do_normal: \
- get_number (from, to, n); \
- } \
- 0; \
+ ({ \
+ __label__ do_normal; \
+ \
+ if (*decided != raw) \
+ { \
+ val = _nl_parse_alt_digit (&rp HELPER_LOCALE_ARG); \
+ if (val == -1 && *decided != loc) \
+ { \
+ *decided = loc; \
+ goto do_normal; \
+ } \
+ if (val < from || val > to) \
+ return NULL; \
+ } \
+ else \
+ { \
+ do_normal: \
+ get_number (from, to, n); \
+ } \
+ 0; \
})
#else
# define get_alt_number(from, to, n) \
- /* We don't have the alternate representation. */ \
+ /* We don't have the alternate representation. */ \
get_number (from, to, n)
#endif
#define recursive(new_fmt) \
- (*(new_fmt) != '\0' \
- && (rp = __strptime_internal (rp, (new_fmt), tm, \
+ (*(new_fmt) != '\0' \
+ && (rp = __strptime_internal (rp, (new_fmt), tm, \
decided, era_cnt LOCALE_ARG)) != NULL)
#ifdef _LIBC
@@ -377,7 +377,7 @@ static const gushort __mon_yday[2][13] =
#ifndef __isleap
/* Nonzero if YEAR is a leap year (every 4 years,
* except every 100th isn't, and every 400th is). */
-# define __isleap(year) \
+# define __isleap(year) \
((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))
#endif
@@ -1506,7 +1506,7 @@ parse_with_strptime (const gchar *value,
return E_TIME_PARSE_NONE;
}
- parse_ret = E_TIME_PARSE_INVALID;
+ parse_ret = E_TIME_PARSE_INVALID;
locale_str = g_locale_from_utf8 (value, -1, NULL, NULL, NULL);
pos = (const gchar *) locale_str;
@@ -1593,7 +1593,7 @@ has_correct_date (const struct tm *value)
g_return_val_if_fail (value != NULL, FALSE);
g_return_val_if_fail (value->tm_mon >= 0 && value->tm_mon < 12, FALSE);
- year = value->tm_year + 1900;
+ year = value->tm_year + 1900;
days = days_in_month[value->tm_mon];
if (value->tm_mon == 1 &&
((year <= 1752) ? (!(year % 4)) :
@@ -1744,7 +1744,7 @@ e_time_parse_date_and_time_ex (const gchar *value,
t = time (NULL);
today_tm = localtime (&t);
result->tm_mday = today_tm->tm_mday;
- result->tm_mon = today_tm->tm_mon;
+ result->tm_mon = today_tm->tm_mon;
result->tm_year = today_tm->tm_year;
}
}
diff --git a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
index d0d9d72..155232b 100644
--- a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
+++ b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
@@ -404,7 +404,7 @@ migrate_parse_commit_changes (ParseType parse_type,
g_print (
" Checking for old cache dir '%s'... %s\n",
old_directory,
- old_directory_exists ? "found" : "not found");
+ old_directory_exists ? "found" : "not found");
if (old_directory_exists) {
g_print (
@@ -448,7 +448,7 @@ migrate_parse_commit_changes (ParseType parse_type,
g_print (
" Checking for old data dir '%s'... %s\n",
old_directory,
- old_directory_exists ? "found" : "not found");
+ old_directory_exists ? "found" : "not found");
if (old_directory_exists) {
g_print (
diff --git a/tests/book-migration/test-migration.c b/tests/book-migration/test-migration.c
index dfbfe90..3b2f284 100644
--- a/tests/book-migration/test-migration.c
+++ b/tests/book-migration/test-migration.c
@@ -59,12 +59,12 @@ setup_migration_sandbox (const gchar *version)
GFile *src_file, *dest_file;
GError *error = NULL;
- dest_dir = g_build_filename (EDS_TEST_WORK_DIR, "evolution", "addressbook", version, NULL);
- dest_bdb = g_build_filename (dest_dir, "addressbook.db", NULL);
- dest = g_build_filename (dest_dir, "contacts.db", NULL);
+ dest_dir = g_build_filename (EDS_TEST_WORK_DIR, "evolution", "addressbook", version, NULL);
+ dest_bdb = g_build_filename (dest_dir, "addressbook.db", NULL);
+ dest = g_build_filename (dest_dir, "contacts.db", NULL);
- src_bdb = g_build_filename (EDS_TEST_BUILT_BOOKS, version, "addressbook.db", NULL);
- src = g_build_filename (EDS_TEST_SQLITE_BOOKS, version, "contacts.db", NULL);
+ src_bdb = g_build_filename (EDS_TEST_BUILT_BOOKS, version, "addressbook.db", NULL);
+ src = g_build_filename (EDS_TEST_SQLITE_BOOKS, version, "contacts.db", NULL);
/* Create the directory for the database files */
g_assert (g_mkdir_with_parents (dest_dir, 0755) == 0);
@@ -294,24 +294,26 @@ test_cursor_step (MigrationFixture *fixture,
NULL, &error))
g_error ("Failed to create a cursor from a migrated book: %s", error->message);
- n_reported_results = e_book_client_cursor_step_sync (cursor,
- E_BOOK_CURSOR_STEP_MOVE |
- E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10,
- &contacts,
- NULL, &error);
+ n_reported_results = e_book_client_cursor_step_sync (
+ cursor,
+ E_BOOK_CURSOR_STEP_MOVE |
+ E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10,
+ &contacts,
+ NULL, &error);
g_assert_cmpint (n_reported_results, ==, g_slist_length (contacts));
g_assert_cmpint (e_book_client_cursor_get_position (cursor), ==, 10);
g_slist_free_full (contacts, g_object_unref);
- n_reported_results = e_book_client_cursor_step_sync (cursor,
- E_BOOK_CURSOR_STEP_MOVE |
- E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- 10,
- &contacts,
- NULL, &error);
+ n_reported_results = e_book_client_cursor_step_sync (
+ cursor,
+ E_BOOK_CURSOR_STEP_MOVE |
+ E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ 10,
+ &contacts,
+ NULL, &error);
g_assert_cmpint (n_reported_results, ==, g_slist_length (contacts));
g_assert_cmpint (e_book_client_cursor_get_position (cursor), ==, 20);
g_slist_free_full (contacts, g_object_unref);
diff --git a/tests/libebook-contacts/test-untyped-phones.c b/tests/libebook-contacts/test-untyped-phones.c
index 50987ff..a4f6404 100644
--- a/tests/libebook-contacts/test-untyped-phones.c
+++ b/tests/libebook-contacts/test-untyped-phones.c
@@ -5,13 +5,13 @@
/* TEL;WORK,VOICE:... should map to PHONE_BUSINESS
* TEL;VOICE:... should map to PHONE_OTHER
* TEL;FAX:... should map to OTHER_FAX. */
-#define VCARD \
- "BEGIN:VCARD\n" \
- "FN:Janet Jackson\n" \
- "N:Janet\n" \
- "TEL;WORK,VOICE:123-123-1234\n" \
- "TEL;VOICE:456-456-4567\n" \
- "TEL;FAX:321-321-4321\n" \
+#define VCARD \
+ "BEGIN:VCARD\n" \
+ "FN:Janet Jackson\n" \
+ "N:Janet\n" \
+ "TEL;WORK,VOICE:123-123-1234\n" \
+ "TEL;VOICE:456-456-4567\n" \
+ "TEL;FAX:321-321-4321\n" \
"END:VCARD\n"
static void
diff --git a/tests/libebook/client/test-book-client-add-contact.c
b/tests/libebook/client/test-book-client-add-contact.c
index 3ff28d5..f9d0359 100644
--- a/tests/libebook/client/test-book-client-add-contact.c
+++ b/tests/libebook/client/test-book-client-add-contact.c
@@ -6,7 +6,7 @@
#include "client-test-utils.h"
#include "e-test-server-utils.h"
-static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
static void
diff --git a/tests/libebook/client/test-book-client-cursor-create.c
b/tests/libebook/client/test-book-client-cursor-create.c
index ea4a266..38c478d 100644
--- a/tests/libebook/client/test-book-client-cursor-create.c
+++ b/tests/libebook/client/test-book-client-cursor-create.c
@@ -24,9 +24,9 @@
#include "e-test-server-utils.h"
#include "client-test-utils.h"
-static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
-static ETestServerClosure book_closure_direct_sync = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, FALSE };
+static ETestServerClosure book_closure_direct_sync = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, FALSE };
static ETestServerClosure book_closure_direct_async = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, TRUE };
#define N_VALID_SORT_FIELDS 2
@@ -39,7 +39,7 @@ static EBookCursorSortType invalid_sort_types[] = { E_BOOK_CURSOR_SORT_ASCENDING
static void
test_cursor_create_empty_query_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookClientCursor *cursor = NULL;
@@ -61,7 +61,7 @@ test_cursor_create_empty_query_sync (ETestServerFixture *fixture,
static void
test_cursor_create_with_query_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookClientCursor *cursor = NULL;
@@ -70,7 +70,7 @@ test_cursor_create_with_query_sync (ETestServerFixture *fixture,
gchar *sexp;
query = e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_IS, "James Brown");
- sexp = e_book_query_to_string (query);
+ sexp = e_book_query_to_string (query);
book_client = E_TEST_SERVER_UTILS_SERVICE (fixture, EBookClient);
@@ -90,7 +90,7 @@ test_cursor_create_with_query_sync (ETestServerFixture *fixture,
static void
test_cursor_create_invalid_sort_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookClientCursor *cursor = NULL;
@@ -106,12 +106,13 @@ test_cursor_create_invalid_sort_sync (ETestServerFixture *fixture,
&cursor,
NULL, &error))
g_error ("Expected invalid query but successfully created cursor");
- else if (!g_error_matches (error,
+ else if (!g_error_matches (error,
E_CLIENT_ERROR,
E_CLIENT_ERROR_INVALID_QUERY)) {
- g_error ("Unexpected error: Domain '%s' Code '%d' Message: %s\n",
- g_quark_to_string (error->domain), error->code,
- error->message);
+ g_error (
+ "Unexpected error: Domain '%s' Code '%d' Message: %s\n",
+ g_quark_to_string (error->domain), error->code,
+ error->message);
}
g_error_free (error);
@@ -119,8 +120,8 @@ test_cursor_create_invalid_sort_sync (ETestServerFixture *fixture,
static void
cursor_create_success_ready_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
GMainLoop *loop = (GMainLoop *) user_data;
EBookClientCursor *cursor = NULL;
@@ -136,8 +137,8 @@ cursor_create_success_ready_cb (GObject *source_object,
static void
cursor_create_invalid_query_ready_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
GMainLoop *loop = (GMainLoop *) user_data;
EBookClientCursor *cursor = NULL;
@@ -146,12 +147,13 @@ cursor_create_invalid_query_ready_cb (GObject *source_object,
if (e_book_client_get_cursor_finish (E_BOOK_CLIENT (source_object),
result, &cursor, &error))
g_error ("Expected invalid query but successfully created cursor");
- else if (!g_error_matches (error,
+ else if (!g_error_matches (error,
E_CLIENT_ERROR,
E_CLIENT_ERROR_INVALID_QUERY)) {
- g_error ("Unexpected error: Domain '%s' Code '%d' Message: %s\n",
- g_quark_to_string (error->domain), error->code,
- error->message);
+ g_error (
+ "Unexpected error: Domain '%s' Code '%d' Message: %s\n",
+ g_quark_to_string (error->domain), error->code,
+ error->message);
}
g_error_free (error);
@@ -160,42 +162,44 @@ cursor_create_invalid_query_ready_cb (GObject *source_object,
static void
test_cursor_create_empty_query_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
-
+
book_client = E_TEST_SERVER_UTILS_SERVICE (fixture, EBookClient);
- e_book_client_get_cursor (book_client,
- NULL,
- valid_sort_fields,
- valid_sort_types,
- N_VALID_SORT_FIELDS,
- NULL,
- cursor_create_success_ready_cb,
- fixture->loop);
+ e_book_client_get_cursor (
+ book_client,
+ NULL,
+ valid_sort_fields,
+ valid_sort_types,
+ N_VALID_SORT_FIELDS,
+ NULL,
+ cursor_create_success_ready_cb,
+ fixture->loop);
g_main_loop_run (fixture->loop);
}
static void
test_cursor_create_with_query_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookQuery *query;
gchar *sexp;
query = e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_IS, "James Brown");
- sexp = e_book_query_to_string (query);
-
+ sexp = e_book_query_to_string (query);
+
book_client = E_TEST_SERVER_UTILS_SERVICE (fixture, EBookClient);
- e_book_client_get_cursor (book_client,
- sexp,
- valid_sort_fields,
- valid_sort_types,
- N_VALID_SORT_FIELDS,
- NULL,
- cursor_create_success_ready_cb,
- fixture->loop);
+ e_book_client_get_cursor (
+ book_client,
+ sexp,
+ valid_sort_fields,
+ valid_sort_types,
+ N_VALID_SORT_FIELDS,
+ NULL,
+ cursor_create_success_ready_cb,
+ fixture->loop);
g_free (sexp);
e_book_query_unref (query);
@@ -205,24 +209,24 @@ test_cursor_create_with_query_async (ETestServerFixture *fixture,
static void
test_cursor_create_invalid_sort_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
-
+
book_client = E_TEST_SERVER_UTILS_SERVICE (fixture, EBookClient);
- e_book_client_get_cursor (book_client,
- NULL,
- invalid_sort_fields,
- invalid_sort_types,
- N_INVALID_SORT_FIELDS,
- NULL,
- cursor_create_invalid_query_ready_cb,
- fixture->loop);
+ e_book_client_get_cursor (
+ book_client,
+ NULL,
+ invalid_sort_fields,
+ invalid_sort_types,
+ N_INVALID_SORT_FIELDS,
+ NULL,
+ cursor_create_invalid_query_ready_cb,
+ fixture->loop);
g_main_loop_run (fixture->loop);
}
-
typedef void (*TestFunc) (ETestServerFixture *fixture, gconstpointer user_data);
typedef struct {
@@ -252,7 +256,6 @@ static const TestClosure test_closures[] = {
}
};
-
gint
main (gint argc,
gchar **argv)
@@ -282,12 +285,13 @@ main (gint argc,
test_path = g_strdup_printf ("/DRA/%s", test_closures[j].test_path);
}
- g_test_add (test_path,
- ETestServerFixture,
- closure,
- e_test_server_utils_setup,
- test_closures[j].func,
- e_test_server_utils_teardown);
+ g_test_add (
+ test_path,
+ ETestServerFixture,
+ closure,
+ e_test_server_utils_setup,
+ test_closures[j].func,
+ e_test_server_utils_teardown);
g_free (test_path);
}
diff --git a/tests/libebook/client/test-book-client-cursor-operations.c
b/tests/libebook/client/test-book-client-cursor-operations.c
index 37694d1..3004a4e 100644
--- a/tests/libebook/client/test-book-client-cursor-operations.c
+++ b/tests/libebook/client/test-book-client-cursor-operations.c
@@ -143,7 +143,6 @@ static void cursor_test_change_locale (CursorFixture *fixtu
CursorTest *test);
static void cursor_test_change_locale_free (CursorTest *test);
-
/* Alphabet Tests */
static void cursor_closure_alphabet (CursorClosure *closure,
gboolean immediate,
@@ -179,7 +178,6 @@ static void cursor_test_thread_join (CursorFixture *fixtu
CursorTest *test);
static void cursor_test_thread_join_free (CursorTest *test);
-
/* Spinning the main loop */
static void cursor_closure_spin_loop (CursorClosure *closure,
guint ms);
@@ -188,7 +186,6 @@ static void cursor_test_spin_loop (CursorFixture *fixtu
CursorTest *test);
static void cursor_test_spin_loop_free (CursorTest *test);
-
struct _CursorFixture {
ETestServerFixture parent_fixture;
@@ -248,9 +245,9 @@ cursor_timeout (const gchar *error_message)
}
static void
-timeout_start (GMainContext *context,
- GSource **source,
- const gchar *error_message)
+timeout_start (GMainContext *context,
+ GSource **source,
+ const gchar *error_message)
{
g_assert (source && *source == NULL);
@@ -258,9 +255,10 @@ timeout_start (GMainContext *context,
context = g_main_context_default ();
*source = g_timeout_source_new (TIMEOUT);
- g_source_set_callback (*source, (GSourceFunc)cursor_timeout,
- g_strdup (error_message),
- (GDestroyNotify)g_free);
+ g_source_set_callback (
+ *source, (GSourceFunc) cursor_timeout,
+ g_strdup (error_message),
+ (GDestroyNotify) g_free);
g_source_attach (*source, context);
}
@@ -275,8 +273,8 @@ timeout_cancel (GSource **source)
}
static void
-cursor_fixture_timeout_start (CursorFixture *fixture,
- const gchar *error_message)
+cursor_fixture_timeout_start (CursorFixture *fixture,
+ const gchar *error_message)
{
timeout_start (NULL, &fixture->timeout_source, error_message);
}
@@ -288,8 +286,8 @@ cursor_fixture_timeout_cancel (CursorFixture *fixture)
}
static void
-cursor_fixture_add_contacts (CursorFixture *fixture,
- ETestServerClosure *closure)
+cursor_fixture_add_contacts (CursorFixture *fixture,
+ ETestServerClosure *closure)
{
EBookClient *book_client;
GError *error = NULL;
@@ -303,8 +301,8 @@ cursor_fixture_add_contacts (CursorFixture *fixture,
gchar *vcard;
EContact *contact;
- vcard = new_vcard_from_test_case (case_name);
- contact = e_contact_new_from_vcard (vcard);
+ vcard = new_vcard_from_test_case (case_name);
+ contact = e_contact_new_from_vcard (vcard);
contacts = g_slist_prepend (contacts, contact);
g_free (vcard);
g_free (case_name);
@@ -312,7 +310,7 @@ cursor_fixture_add_contacts (CursorFixture *fixture,
fixture->contacts[i] = contact;
}
- if (!e_book_client_add_contacts_sync (book_client, contacts, NULL, NULL, &error)) {
+ if (!e_book_client_add_contacts_sync (book_client, contacts, NULL, NULL, &error)) {
/* Dont complain here, we re-use the same addressbook for multiple tests
* and we can't add the same contacts twice
@@ -329,11 +327,11 @@ cursor_fixture_add_contacts (CursorFixture *fixture,
static void
cursor_ready_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
- CursorFixture *fixture = (CursorFixture *)user_data;
- ETestServerFixture *server_fixture = (ETestServerFixture *)fixture;
+ CursorFixture *fixture = (CursorFixture *) user_data;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) fixture;
GError *error = NULL;
if (!e_book_client_get_cursor_finish (E_BOOK_CLIENT (source_object),
@@ -345,11 +343,11 @@ cursor_ready_cb (GObject *source_object,
static void
cursor_fixture_setup (CursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
- CursorClosure *closure = (CursorClosure *)user_data;
- ETestServerClosure *server_closure = (ETestServerClosure *)user_data;
- ETestServerFixture *server_fixture = (ETestServerFixture *)fixture;
+ CursorClosure *closure = (CursorClosure *) user_data;
+ ETestServerClosure *server_closure = (ETestServerClosure *) user_data;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) fixture;
EBookClient *book_client;
GError *error = NULL;
gchar *sexp = NULL;
@@ -377,14 +375,15 @@ cursor_fixture_setup (CursorFixture *fixture,
if (server_closure->use_async_connect) {
- e_book_client_get_cursor (book_client,
- sexp,
- sort_fields,
- sort_types,
- N_SORT_FIELDS,
- NULL,
- cursor_ready_cb,
- fixture);
+ e_book_client_get_cursor (
+ book_client,
+ sexp,
+ sort_fields,
+ sort_types,
+ N_SORT_FIELDS,
+ NULL,
+ cursor_ready_cb,
+ fixture);
cursor_fixture_timeout_start (fixture, "Timeout reached while trying to create a cursor");
g_main_loop_run (server_fixture->loop);
@@ -407,9 +406,9 @@ cursor_fixture_setup (CursorFixture *fixture,
static void
cursor_fixture_teardown (CursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
- ETestServerFixture *server_fixture = (ETestServerFixture *)fixture;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) fixture;
gint i;
g_object_unref (fixture->cursor);
@@ -434,10 +433,10 @@ typedef struct {
static void
book_client_locale_change (EBookClient *book,
- GParamSpec *pspec,
- ChangeLocaleData *data)
+ GParamSpec *pspec,
+ ChangeLocaleData *data)
{
- ETestServerFixture *base_fixture = (ETestServerFixture *)data->fixture;
+ ETestServerFixture *base_fixture = (ETestServerFixture *) data->fixture;
if (!g_strcmp0 (e_book_client_get_locale (book), data->locale))
g_main_loop_quit (base_fixture->loop);
@@ -445,9 +444,9 @@ book_client_locale_change (EBookClient *book,
static void
cursor_fixture_set_locale (CursorFixture *fixture,
- const gchar *locale)
+ const gchar *locale)
{
- ETestServerFixture *server_fixture = (ETestServerFixture *)fixture;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) fixture;
EBookClient *book_client;
ChangeLocaleData data = { fixture, locale };
gulong handler_id;
@@ -475,7 +474,7 @@ cursor_fixture_set_locale (CursorFixture *fixture,
/* Set initial locale before exporting on the bus */
strv[0] = g_strdup_printf ("LANG=%s", locale);
- e_dbus_locale1_set_locale (fixture->locale1, (const gchar * const *)strv);
+ e_dbus_locale1_set_locale (fixture->locale1, (const gchar * const *) strv);
g_free (strv[0]);
if (!g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (fixture->locale1),
@@ -483,22 +482,23 @@ cursor_fixture_set_locale (CursorFixture *fixture,
g_error ("Failed to export org.freedesktop.locale1: %s", error->message);
fixture->own_id =
- g_bus_own_name_on_connection (bus,
- "org.freedesktop.locale1",
- G_BUS_NAME_OWNER_FLAGS_REPLACE,
- NULL, NULL, NULL, NULL);
+ g_bus_own_name_on_connection (
+ bus,
+ "org.freedesktop.locale1",
+ G_BUS_NAME_OWNER_FLAGS_REPLACE,
+ NULL, NULL, NULL, NULL);
g_object_unref (bus);
} else {
/* Send locale change message */
strv[0] = g_strdup_printf ("LANG=%s", locale);
- e_dbus_locale1_set_locale (fixture->locale1, (const gchar * const *)strv);
+ e_dbus_locale1_set_locale (fixture->locale1, (const gchar * const *) strv);
g_free (strv[0]);
}
- handler_id = g_signal_connect (book_client, "notify::locale",
- G_CALLBACK (book_client_locale_change), &data);
-
+ handler_id = g_signal_connect (
+ book_client, "notify::locale",
+ G_CALLBACK (book_client_locale_change), &data);
cursor_fixture_timeout_start (fixture, "Timeout reached while waiting for locale change");
g_main_loop_run (server_fixture->loop);
@@ -509,9 +509,9 @@ cursor_fixture_set_locale (CursorFixture *fixture,
static void
cursor_fixture_test (CursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
- CursorClosure *closure = (CursorClosure *)user_data;
+ CursorClosure *closure = (CursorClosure *) user_data;
GList *l;
/* Run all the tests */
@@ -557,7 +557,7 @@ cursor_fixture_test (CursorFixture *fixture,
* Main Cursor Test Closure *
******************************************************/
static void
-cursor_test_free (CursorTest *test)
+cursor_test_free (CursorTest *test)
{
switch (test->type) {
case CURSOR_TEST_STEP:
@@ -597,15 +597,15 @@ static void
cursor_closure_free (CursorClosure *closure)
{
if (closure) {
- g_list_free_full (closure->tests, (GDestroyNotify)cursor_test_free);
+ g_list_free_full (closure->tests, (GDestroyNotify) cursor_test_free);
g_free (closure->locale);
g_slice_free (CursorClosure, closure);
}
}
static void
-cursor_closure_setup_empty_summary (ESource *scratch,
- ETestServerClosure *closure)
+cursor_closure_setup_empty_summary (ESource *scratch,
+ ETestServerClosure *closure)
{
ESourceBackendSummarySetup *setup;
@@ -622,11 +622,11 @@ cursor_closure_setup_empty_summary (ESource *scratch,
}
static CursorClosure *
-cursor_closure_new (CursorParams *params,
- const gchar *locale)
+cursor_closure_new (CursorParams *params,
+ const gchar *locale)
{
CursorClosure *closure = g_slice_new0 (CursorClosure);
- ETestServerClosure *server_closure = (ETestServerClosure *)closure;
+ ETestServerClosure *server_closure = (ETestServerClosure *) closure;
if (params->dra)
server_closure->type = E_TEST_SERVER_DIRECT_ADDRESS_BOOK;
@@ -637,18 +637,18 @@ cursor_closure_new (CursorParams *params,
server_closure->customize = cursor_closure_setup_empty_summary;
server_closure->use_async_connect = params->async;
- server_closure->destroy_closure_func = (GDestroyNotify)cursor_closure_free;
+ server_closure->destroy_closure_func = (GDestroyNotify) cursor_closure_free;
closure->locale = g_strdup (locale);
- closure->async = params->async;
+ closure->async = params->async;
return closure;
}
static void
cursor_closure_add (CursorClosure *closure,
- const gchar *format,
- ...)
+ const gchar *format,
+ ...)
{
gchar *test_path;
va_list args;
@@ -660,10 +660,11 @@ cursor_closure_add (CursorClosure *closure,
/* Filter out anything that was not specified in the test filter */
if (test_regex == NULL ||
g_regex_match (test_regex, test_path, 0, NULL))
- g_test_add (test_path, CursorFixture, closure,
- cursor_fixture_setup,
- cursor_fixture_test,
- cursor_fixture_teardown);
+ g_test_add (
+ test_path, CursorFixture, closure,
+ cursor_fixture_setup,
+ cursor_fixture_test,
+ cursor_fixture_teardown);
g_free (test_path);
}
@@ -688,18 +689,18 @@ typedef struct {
} StepReadyData;
static gint
-find_contact_link (EContact *contact,
- const gchar *uid)
+find_contact_link (EContact *contact,
+ const gchar *uid)
{
- const gchar *contact_uid =
- (const gchar *)e_contact_get_const (contact, E_CONTACT_UID);
+ const gchar *contact_uid =
+ (const gchar *) e_contact_get_const (contact, E_CONTACT_UID);
return g_strcmp0 (contact_uid, uid);
}
static void
-assert_contacts_order_slist (GSList *results,
- GSList *uids)
+assert_contacts_order_slist (GSList *results,
+ GSList *uids)
{
gint position = -1;
GSList *link, *l;
@@ -712,7 +713,7 @@ assert_contacts_order_slist (GSList *results,
const gchar *uid = l->data;
gint new_position;
- link = g_slist_find_custom (results, uid, (GCompareFunc)find_contact_link);
+ link = g_slist_find_custom (results, uid, (GCompareFunc) find_contact_link);
if (!link)
g_error ("Specified uid '%s' was not found in results", uid);
@@ -723,8 +724,8 @@ assert_contacts_order_slist (GSList *results,
}
static void
-step_print_results (GSList *results,
- GSList *uids)
+step_print_results (GSList *results,
+ GSList *uids)
{
GSList *l;
@@ -751,10 +752,10 @@ step_print_results (GSList *results,
}
static void
-cursor_test_assert_results (CursorFixture *fixture,
- CursorTestStep *test,
- GSList *results,
- gint n_reported_results)
+cursor_test_assert_results (CursorFixture *fixture,
+ CursorTestStep *test,
+ GSList *results,
+ gint n_reported_results)
{
GSList *uids = NULL;
gint i;
@@ -763,7 +764,7 @@ cursor_test_assert_results (CursorFixture *fixture,
gchar *uid;
gint index = test->expected_order[i];
- uid = (gchar *)e_contact_get_const (fixture->contacts[index], E_CONTACT_UID);
+ uid = (gchar *) e_contact_get_const (fixture->contacts[index], E_CONTACT_UID);
uids = g_slist_append (uids, uid);
}
@@ -779,26 +780,27 @@ cursor_test_assert_results (CursorFixture *fixture,
static void
cursor_test_step_free (CursorTest *test)
{
- CursorTestStep *step = (CursorTestStep *)test;
+ CursorTestStep *step = (CursorTestStep *) test;
g_slice_free (CursorTestStep, step);
}
static void
-cursor_test_step_ready_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+cursor_test_step_ready_cb (GObject *source_object,
+ GAsyncResult *result,
+ gpointer user_data)
{
- StepReadyData *data = (StepReadyData *)user_data;
- ETestServerFixture *server_fixture = (ETestServerFixture *)data->fixture;
+ StepReadyData *data = (StepReadyData *) user_data;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) data->fixture;
GSList *results = NULL;
gint n_reported_results;
gboolean end_of_list = FALSE;
GError *error = NULL;
n_reported_results =
- e_book_client_cursor_step_finish (E_BOOK_CLIENT_CURSOR (source_object),
- result, &results, &error);
+ e_book_client_cursor_step_finish (
+ E_BOOK_CLIENT_CURSOR (source_object),
+ result, &results, &error);
if (n_reported_results < 0) {
if (g_error_matches (error,
@@ -812,8 +814,9 @@ cursor_test_step_ready_cb (GObject *source_object,
end_of_list = TRUE;
g_clear_error (&error);
} else {
- g_error ("Error calling e_book_client_cursor_step_finish(): %s",
- error->message);
+ g_error (
+ "Error calling e_book_client_cursor_step_finish(): %s",
+ error->message);
}
}
@@ -826,30 +829,31 @@ cursor_test_step_ready_cb (GObject *source_object,
cursor_test_assert_results (data->fixture, data->test, results, n_reported_results);
}
- g_slist_free_full (results, (GDestroyNotify)g_object_unref);
+ g_slist_free_full (results, (GDestroyNotify) g_object_unref);
g_main_loop_quit (server_fixture->loop);
}
static gboolean
cursor_test_try_step (CursorFixture *fixture,
- CursorClosure *closure,
- CursorTest *test)
+ CursorClosure *closure,
+ CursorTest *test)
{
- ETestServerFixture *server_fixture = (ETestServerFixture *)fixture;
- CursorTestStep *step = (CursorTestStep *)test;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) fixture;
+ CursorTestStep *step = (CursorTestStep *) test;
gboolean out_of_sync = FALSE;
gboolean end_of_list = FALSE;
if (closure->async) {
StepReadyData data = { fixture, step, FALSE };
- e_book_client_cursor_step (fixture->cursor,
- step->flags,
- step->origin,
- step->count,
- NULL,
- cursor_test_step_ready_cb,
- &data);
+ e_book_client_cursor_step (
+ fixture->cursor,
+ step->flags,
+ step->origin,
+ step->count,
+ NULL,
+ cursor_test_step_ready_cb,
+ &data);
/* Wait for result with an error timeout */
cursor_fixture_timeout_start (fixture, "Timeout reached while moving the cursor");
@@ -862,7 +866,8 @@ cursor_test_try_step (CursorFixture *fixture,
gint n_reported_results;
n_reported_results =
- e_book_client_cursor_step_sync (fixture->cursor,
+ e_book_client_cursor_step_sync (
+ fixture->cursor,
step->flags,
step->origin,
step->count,
@@ -881,8 +886,9 @@ cursor_test_try_step (CursorFixture *fixture,
end_of_list = TRUE;
g_clear_error (&error);
} else {
- g_error ("Error calling e_book_client_cursor_step_sync(): %s",
- error->message);
+ g_error (
+ "Error calling e_book_client_cursor_step_sync(): %s",
+ error->message);
}
}
@@ -892,7 +898,6 @@ cursor_test_try_step (CursorFixture *fixture,
} else
cursor_test_assert_results (fixture, step, results, n_reported_results);
-
g_slist_free_full (results, g_object_unref);
}
@@ -901,17 +906,17 @@ cursor_test_try_step (CursorFixture *fixture,
static void
step_refreshed (EBookClientCursor *cursor,
- GMainLoop *loop)
+ GMainLoop *loop)
{
g_main_loop_quit (loop);
}
static void
cursor_test_step (CursorFixture *fixture,
- CursorClosure *closure,
- CursorTest *test)
+ CursorClosure *closure,
+ CursorTest *test)
{
- ETestServerFixture *server_fixture = (ETestServerFixture *)fixture;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) fixture;
gint i;
gboolean success = FALSE;
@@ -922,9 +927,10 @@ cursor_test_step (CursorFixture *fixture,
gulong refresh_id;
/* Wait for a refresh which follows an out-of-sync move by */
- refresh_id = g_signal_connect (fixture->cursor, "refresh",
- G_CALLBACK (step_refreshed),
- server_fixture->loop);
+ refresh_id = g_signal_connect (
+ fixture->cursor, "refresh",
+ G_CALLBACK (step_refreshed),
+ server_fixture->loop);
/* Stop trying after the first step() is not out-of-sync */
success = cursor_test_try_step (fixture, closure, test);
@@ -947,24 +953,24 @@ cursor_test_step (CursorFixture *fixture,
* is expected to be triggered by this step.
*/
static void
-cursor_closure_step (CursorClosure *closure,
- EBookCursorStepFlags flags,
- EBookCursorOrigin origin,
- gint count,
- gint expected,
- ...)
+cursor_closure_step (CursorClosure *closure,
+ EBookCursorStepFlags flags,
+ EBookCursorOrigin origin,
+ gint count,
+ gint expected,
+ ...)
{
CursorTestStep *test = g_slice_new0 (CursorTestStep);
va_list args;
gint i;
- g_assert (expected <= N_SORTED_CONTACTS);
- g_assert (ABS (count) <= N_SORTED_CONTACTS);
+ g_assert (expected <= N_SORTED_CONTACTS);
+ g_assert (ABS (count) <= N_SORTED_CONTACTS);
- test->type = CURSOR_TEST_STEP;
- test->flags = flags;
- test->origin = origin;
- test->count = count;
+ test->type = CURSOR_TEST_STEP;
+ test->flags = flags;
+ test->origin = origin;
+ test->count = count;
test->expected = expected;
va_start (args, expected);
@@ -996,41 +1002,43 @@ typedef struct {
} SetSexpReadyData;
static void
-cursor_closure_set_sexp (CursorClosure *closure,
- EBookQuery *query)
+cursor_closure_set_sexp (CursorClosure *closure,
+ EBookQuery *query)
{
CursorTestSetSexp *test = g_slice_new0 (CursorTestSetSexp);
g_assert (query != NULL);
- test->type = CURSOR_TEST_SET_SEXP;
- test->sexp = e_book_query_to_string (query);
+ test->type = CURSOR_TEST_SET_SEXP;
+ test->sexp = e_book_query_to_string (query);
e_book_query_unref (query);
closure->tests = g_list_append (closure->tests, test);
}
static void
-cursor_test_set_sexp_assert (CursorTestSetSexp *test,
- gboolean success,
- GError *error)
+cursor_test_set_sexp_assert (CursorTestSetSexp *test,
+ gboolean success,
+ GError *error)
{
if (!success)
- g_error ("Failed to set sexp '%s': %s",
- test->sexp, error->message);
+ g_error (
+ "Failed to set sexp '%s': %s",
+ test->sexp, error->message);
}
static void
-cursor_test_set_sexp_ready_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+cursor_test_set_sexp_ready_cb (GObject *source_object,
+ GAsyncResult *result,
+ gpointer user_data)
{
- SetSexpReadyData *data = (SetSexpReadyData *)user_data;
- ETestServerFixture *server_fixture = (ETestServerFixture *)data->fixture;
+ SetSexpReadyData *data = (SetSexpReadyData *) user_data;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) data->fixture;
gboolean success;
GError *error = NULL;
- success = e_book_client_cursor_set_sexp_finish (E_BOOK_CLIENT_CURSOR (source_object),
+ success = e_book_client_cursor_set_sexp_finish (
+ E_BOOK_CLIENT_CURSOR (source_object),
result, &error);
cursor_test_set_sexp_assert (data->test, success, error);
g_clear_error (&error);
@@ -1039,21 +1047,22 @@ cursor_test_set_sexp_ready_cb (GObject *source_object,
}
static void
-cursor_test_set_sexp (CursorFixture *fixture,
- CursorClosure *closure,
- CursorTest *test)
+cursor_test_set_sexp (CursorFixture *fixture,
+ CursorClosure *closure,
+ CursorTest *test)
{
- ETestServerFixture *server_fixture = (ETestServerFixture *)fixture;
- CursorTestSetSexp *set_sexp = (CursorTestSetSexp *)test;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) fixture;
+ CursorTestSetSexp *set_sexp = (CursorTestSetSexp *) test;
if (closure->async) {
SetSexpReadyData data = { fixture, set_sexp };
- e_book_client_cursor_set_sexp (fixture->cursor,
- set_sexp->sexp,
- NULL,
- cursor_test_set_sexp_ready_cb,
- &data);
+ e_book_client_cursor_set_sexp (
+ fixture->cursor,
+ set_sexp->sexp,
+ NULL,
+ cursor_test_set_sexp_ready_cb,
+ &data);
/* Wait for result with an error timeout */
cursor_fixture_timeout_start (fixture, "Timeout reached while setting search expression");
@@ -1062,11 +1071,12 @@ cursor_test_set_sexp (CursorFixture *fixture,
} else {
gboolean success;
GError *error = NULL;
-
- success = e_book_client_cursor_set_sexp_sync (fixture->cursor,
- set_sexp->sexp,
- NULL,
- &error);
+
+ success = e_book_client_cursor_set_sexp_sync (
+ fixture->cursor,
+ set_sexp->sexp,
+ NULL,
+ &error);
cursor_test_set_sexp_assert (set_sexp, success, error);
g_clear_error (&error);
}
@@ -1075,13 +1085,12 @@ cursor_test_set_sexp (CursorFixture *fixture,
static void
cursor_test_set_sexp_free (CursorTest *test)
{
- CursorTestSetSexp *set_sexp = (CursorTestSetSexp *)test;
+ CursorTestSetSexp *set_sexp = (CursorTestSetSexp *) test;
g_free (set_sexp->sexp);
g_slice_free (CursorTestSetSexp, set_sexp);
}
-
/******************************************************
* Position Tests *
******************************************************/
@@ -1103,15 +1112,15 @@ typedef struct {
static void
cursor_closure_position (CursorClosure *closure,
- gint total,
- gint position,
- gboolean immediate)
+ gint total,
+ gint position,
+ gboolean immediate)
{
CursorTestPosition *test = g_slice_new0 (CursorTestPosition);
- test->type = CURSOR_TEST_POSITION;
- test->total = total;
- test->position = position;
+ test->type = CURSOR_TEST_POSITION;
+ test->total = total;
+ test->position = position;
test->immediate = immediate;
closure->tests = g_list_append (closure->tests, test);
@@ -1119,40 +1128,42 @@ cursor_closure_position (CursorClosure *closure,
static void
position_or_total_changed (EBookClientCursor *cursor,
- GParamSpec *pspec,
- PositionData *data)
+ GParamSpec *pspec,
+ PositionData *data)
{
- ETestServerFixture *server_fixture = (ETestServerFixture *)data->fixture;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) data->fixture;
if (g_getenv ("TEST_DEBUG") != NULL) {
- g_print ("Position changed, total: %d position: %d (expecting total: %d position: %d)\n",
- e_book_client_cursor_get_total (cursor),
- e_book_client_cursor_get_position (cursor),
- data->test->total,
- data->test->position);
+ g_print (
+ "Position changed, total: %d position: %d (expecting total: %d position: %d)\n",
+ e_book_client_cursor_get_total (cursor),
+ e_book_client_cursor_get_position (cursor),
+ data->test->total,
+ data->test->position);
}
- if (data->test->total == e_book_client_cursor_get_total (cursor) &&
+ if (data->test->total == e_book_client_cursor_get_total (cursor) &&
data->test->position == e_book_client_cursor_get_position (cursor))
g_main_loop_quit (server_fixture->loop);
}
static void
cursor_test_position (CursorFixture *fixture,
- CursorClosure *closure,
- CursorTest *test)
+ CursorClosure *closure,
+ CursorTest *test)
{
- ETestServerFixture *server_fixture = (ETestServerFixture *)fixture;
- CursorTestPosition *position = (CursorTestPosition *)test;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) fixture;
+ CursorTestPosition *position = (CursorTestPosition *) test;
PositionData data = { fixture, position };
if (g_getenv ("TEST_DEBUG") != NULL) {
- g_print ("Actual total: %d position: %d, %s for total: %d position: %d\n",
- e_book_client_cursor_get_total (fixture->cursor),
- e_book_client_cursor_get_position (fixture->cursor),
- position->immediate ? "Checking" : "Waiting",
- position->total,
- position->position);
+ g_print (
+ "Actual total: %d position: %d, %s for total: %d position: %d\n",
+ e_book_client_cursor_get_total (fixture->cursor),
+ e_book_client_cursor_get_position (fixture->cursor),
+ position->immediate ? "Checking" : "Waiting",
+ position->total,
+ position->position);
}
/* If testing immediate mode, just assert the immediate position and don't wait for asynchronous
updates*/
@@ -1162,19 +1173,21 @@ cursor_test_position (CursorFixture *fixture,
}
/* Position is already correct */
- if (position->total == e_book_client_cursor_get_total (fixture->cursor) &&
+ if (position->total == e_book_client_cursor_get_total (fixture->cursor) &&
position->position == e_book_client_cursor_get_position (fixture->cursor))
return;
/* Position & Total is notified asynchronously, connect to signals and
* timeout error if the correct position / total is never reached.
*/
- position->total_id = g_signal_connect (fixture->cursor, "notify::total",
- G_CALLBACK (position_or_total_changed),
- &data);
- position->position_id = g_signal_connect (fixture->cursor, "notify::position",
- G_CALLBACK (position_or_total_changed),
- &data);
+ position->total_id = g_signal_connect (
+ fixture->cursor, "notify::total",
+ G_CALLBACK (position_or_total_changed),
+ &data);
+ position->position_id = g_signal_connect (
+ fixture->cursor, "notify::position",
+ G_CALLBACK (position_or_total_changed),
+ &data);
cursor_fixture_timeout_start (fixture, "Timeout waiting for expected position and total");
g_main_loop_run (server_fixture->loop);
@@ -1187,7 +1200,7 @@ cursor_test_position (CursorFixture *fixture,
static void
cursor_test_position_free (CursorTest *test)
{
- CursorTestPosition *position = (CursorTestPosition *)test;
+ CursorTestPosition *position = (CursorTestPosition *) test;
g_slice_free (CursorTestPosition, position);
}
@@ -1210,55 +1223,56 @@ typedef struct {
static void
cursor_closure_add_remove_contact (CursorClosure *closure,
- const gchar *case_name,
- gboolean add)
+ const gchar *case_name,
+ gboolean add)
{
CursorTestAddRemove *test = g_slice_new0 (CursorTestAddRemove);
- test->type = CURSOR_TEST_ADD_REMOVE;
+ test->type = CURSOR_TEST_ADD_REMOVE;
test->case_name = g_strdup (case_name);
- test->add = add;
+ test->add = add;
closure->tests = g_list_append (closure->tests, test);
}
static void
cursor_closure_add_contact (CursorClosure *closure,
- const gchar *case_name)
+ const gchar *case_name)
{
cursor_closure_add_remove_contact (closure, case_name, TRUE);
}
static void
cursor_closure_remove_contact (CursorClosure *closure,
- const gchar *case_name)
+ const gchar *case_name)
{
cursor_closure_add_remove_contact (closure, case_name, FALSE);
}
static void
-cursor_test_add_remove_ready_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+cursor_test_add_remove_ready_cb (GObject *source_object,
+ GAsyncResult *result,
+ gpointer user_data)
{
- AddRemoveReadyData *data = (AddRemoveReadyData *)user_data;
- ETestServerFixture *server_fixture = (ETestServerFixture *)data->fixture;
+ AddRemoveReadyData *data = (AddRemoveReadyData *) user_data;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) data->fixture;
gchar *new_uid = NULL;
const gchar *contact_uid;
gboolean success;
GError *error = NULL;
-
if (data->test->add) {
- success = e_book_client_add_contact_finish (E_BOOK_CLIENT (source_object),
- result, &new_uid, &error);
+ success = e_book_client_add_contact_finish (
+ E_BOOK_CLIENT (source_object),
+ result, &new_uid, &error);
if (!success)
g_error ("Error adding contact: %s", error->message);
} else {
- success = e_book_client_remove_contact_finish (E_BOOK_CLIENT (source_object),
- result, &error);
+ success = e_book_client_remove_contact_finish (
+ E_BOOK_CLIENT (source_object),
+ result, &error);
if (!success)
g_error ("Error adding contact: %s", error->message);
@@ -1279,11 +1293,11 @@ cursor_test_add_remove_ready_cb (GObject *source_object,
static void
cursor_test_add_remove (CursorFixture *fixture,
- CursorClosure *closure,
- CursorTest *test)
+ CursorClosure *closure,
+ CursorTest *test)
{
- ETestServerFixture *server_fixture = (ETestServerFixture *)fixture;
- CursorTestAddRemove *modify = (CursorTestAddRemove *)test;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) fixture;
+ CursorTestAddRemove *modify = (CursorTestAddRemove *) test;
EBookClient *book_client;
EContact *contact;
gchar *vcard;
@@ -1298,11 +1312,13 @@ cursor_test_add_remove (CursorFixture *fixture,
AddRemoveReadyData data = { fixture, modify, contact };
if (modify->add)
- e_book_client_add_contact (book_client, contact,
- NULL, cursor_test_add_remove_ready_cb, &data);
+ e_book_client_add_contact (
+ book_client, contact,
+ NULL, cursor_test_add_remove_ready_cb, &data);
else
- e_book_client_remove_contact (book_client, contact,
- NULL, cursor_test_add_remove_ready_cb, &data);
+ e_book_client_remove_contact (
+ book_client, contact,
+ NULL, cursor_test_add_remove_ready_cb, &data);
/* Wait for result with an error timeout */
cursor_fixture_timeout_start (fixture, "Timeout reached while adding a contact");
@@ -1315,14 +1331,16 @@ cursor_test_add_remove (CursorFixture *fixture,
const gchar *contact_uid;
if (modify->add)
- success = e_book_client_add_contact_sync (book_client,
- contact,
- &new_uid,
- NULL, &error);
+ success = e_book_client_add_contact_sync (
+ book_client,
+ contact,
+ &new_uid,
+ NULL, &error);
else
- success = e_book_client_remove_contact_sync (book_client,
- contact,
- NULL, &error);
+ success = e_book_client_remove_contact_sync (
+ book_client,
+ contact,
+ NULL, &error);
if (!success)
g_error ("Error adding contact: %s", error->message);
@@ -1343,13 +1361,12 @@ cursor_test_add_remove (CursorFixture *fixture,
static void
cursor_test_add_remove_free (CursorTest *test)
{
- CursorTestAddRemove *modify = (CursorTestAddRemove *)test;
+ CursorTestAddRemove *modify = (CursorTestAddRemove *) test;
g_free (modify->case_name);
g_slice_free (CursorTestAddRemove, modify);
}
-
/******************************************************
* Alphabet Index Tests *
******************************************************/
@@ -1366,24 +1383,24 @@ typedef struct {
static void
cursor_closure_alphabet_index (CursorClosure *closure,
- gint index)
+ gint index)
{
CursorTestAlphabetIndex *test = g_slice_new0 (CursorTestAlphabetIndex);
- test->type = CURSOR_TEST_ALPHABET_INDEX;
- test->index = index;
+ test->type = CURSOR_TEST_ALPHABET_INDEX;
+ test->index = index;
closure->tests = g_list_append (closure->tests, test);
}
static void
-cursor_test_alphabet_index_ready_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+cursor_test_alphabet_index_ready_cb (GObject *source_object,
+ GAsyncResult *result,
+ gpointer user_data)
{
- AlphabetIndexReadyData *data = (AlphabetIndexReadyData *)user_data;
- ETestServerFixture *server_fixture = (ETestServerFixture *)data->fixture;
+ AlphabetIndexReadyData *data = (AlphabetIndexReadyData *) user_data;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) data->fixture;
GError *error = NULL;
if (!e_book_client_cursor_set_alphabetic_index_finish (E_BOOK_CLIENT_CURSOR (source_object),
@@ -1395,18 +1412,19 @@ cursor_test_alphabet_index_ready_cb (GObject *source_object,
static void
cursor_test_alphabet_index (CursorFixture *fixture,
- CursorClosure *closure,
- CursorTest *test)
+ CursorClosure *closure,
+ CursorTest *test)
{
- ETestServerFixture *server_fixture = (ETestServerFixture *)fixture;
- CursorTestAlphabetIndex *alphabet_index = (CursorTestAlphabetIndex *)test;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) fixture;
+ CursorTestAlphabetIndex *alphabet_index = (CursorTestAlphabetIndex *) test;
if (closure->async) {
AlphabetIndexReadyData data = { fixture, alphabet_index };
- e_book_client_cursor_set_alphabetic_index (fixture->cursor, alphabet_index->index,
- NULL, cursor_test_alphabet_index_ready_cb, &data);
+ e_book_client_cursor_set_alphabetic_index (
+ fixture->cursor, alphabet_index->index,
+ NULL, cursor_test_alphabet_index_ready_cb, &data);
/* Wait for result with an error timeout */
cursor_fixture_timeout_start (fixture, "Timeout reached while setting alphabet index");
@@ -1425,7 +1443,7 @@ cursor_test_alphabet_index (CursorFixture *fixture,
static void
cursor_test_alphabet_index_free (CursorTest *test)
{
- CursorTestAlphabetIndex *alphabet_index = (CursorTestAlphabetIndex *)test;
+ CursorTestAlphabetIndex *alphabet_index = (CursorTestAlphabetIndex *) test;
g_slice_free (CursorTestAlphabetIndex, alphabet_index);
}
@@ -1441,22 +1459,22 @@ typedef struct {
static void
cursor_closure_change_locale (CursorClosure *closure,
- const gchar *locale)
+ const gchar *locale)
{
CursorTestChangeLocale *test = g_slice_new0 (CursorTestChangeLocale);
- test->type = CURSOR_TEST_CHANGE_LOCALE;
- test->locale = g_strdup (locale);
+ test->type = CURSOR_TEST_CHANGE_LOCALE;
+ test->locale = g_strdup (locale);
closure->tests = g_list_append (closure->tests, test);
}
static void
cursor_test_change_locale (CursorFixture *fixture,
- CursorClosure *closure,
- CursorTest *test)
+ CursorClosure *closure,
+ CursorTest *test)
{
- CursorTestChangeLocale *change_locale = (CursorTestChangeLocale *)test;
+ CursorTestChangeLocale *change_locale = (CursorTestChangeLocale *) test;
/* There is no sync/async for this */
cursor_fixture_set_locale (fixture, change_locale->locale);
@@ -1465,7 +1483,7 @@ cursor_test_change_locale (CursorFixture *fixture,
static void
cursor_test_change_locale_free (CursorTest *test)
{
- CursorTestChangeLocale *change_locale = (CursorTestChangeLocale *)test;
+ CursorTestChangeLocale *change_locale = (CursorTestChangeLocale *) test;
g_free (change_locale->locale);
g_slice_free (CursorTestChangeLocale, change_locale);
@@ -1492,17 +1510,17 @@ typedef struct {
static void
cursor_closure_alphabet (CursorClosure *closure,
- gboolean immediate,
- const gchar *letter0,
- const gchar *letter1,
- const gchar *letter2,
- const gchar *letter3,
- const gchar *letter4)
+ gboolean immediate,
+ const gchar *letter0,
+ const gchar *letter1,
+ const gchar *letter2,
+ const gchar *letter3,
+ const gchar *letter4)
{
CursorTestAlphabet *test = g_slice_new0 (CursorTestAlphabet);
- test->type = CURSOR_TEST_ALPHABET;
- test->immediate = immediate;
+ test->type = CURSOR_TEST_ALPHABET;
+ test->immediate = immediate;
test->letters[0] = g_strdup (letter0);
test->letters[1] = g_strdup (letter1);
test->letters[2] = g_strdup (letter2);
@@ -1513,9 +1531,9 @@ cursor_closure_alphabet (CursorClosure *closure,
}
static gboolean
-expected_alpabet_check (EBookClientCursor *cursor,
- CursorTestAlphabet *test,
- gboolean assert_letters)
+expected_alpabet_check (EBookClientCursor *cursor,
+ CursorTestAlphabet *test,
+ gboolean assert_letters)
{
const gchar * const * alphabet;
gint i, n_labels = 0;
@@ -1548,10 +1566,10 @@ expected_alpabet_check (EBookClientCursor *cursor,
static void
alphabet_changed (EBookClientCursor *cursor,
- GParamSpec *pspec,
- AlphabetData *data)
+ GParamSpec *pspec,
+ AlphabetData *data)
{
- ETestServerFixture *server_fixture = (ETestServerFixture *)data->fixture;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) data->fixture;
if (expected_alpabet_check (cursor, data->test, FALSE))
g_main_loop_quit (server_fixture->loop);
@@ -1559,14 +1577,13 @@ alphabet_changed (EBookClientCursor *cursor,
static void
cursor_test_alphabet (CursorFixture *fixture,
- CursorClosure *closure,
- CursorTest *test)
+ CursorClosure *closure,
+ CursorTest *test)
{
- ETestServerFixture *server_fixture = (ETestServerFixture *)fixture;
- CursorTestAlphabet *alphabet = (CursorTestAlphabet *)test;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) fixture;
+ CursorTestAlphabet *alphabet = (CursorTestAlphabet *) test;
AlphabetData data = { fixture, alphabet };
-
/* Alphabet is already correct */
if (expected_alpabet_check (fixture->cursor, alphabet, alphabet->immediate))
return;
@@ -1574,9 +1591,10 @@ cursor_test_alphabet (CursorFixture *fixture,
/* Alphabet is notified asynchronously, connect to signal and
* timeout error if the correct alphabet is never reached.
*/
- alphabet->alphabet_id = g_signal_connect (fixture->cursor, "notify::alphabet",
- G_CALLBACK (alphabet_changed),
- &data);
+ alphabet->alphabet_id = g_signal_connect (
+ fixture->cursor, "notify::alphabet",
+ G_CALLBACK (alphabet_changed),
+ &data);
cursor_fixture_timeout_start (fixture, "Timeout waiting for expected alphabet");
g_main_loop_run (server_fixture->loop);
@@ -1588,7 +1606,7 @@ cursor_test_alphabet (CursorFixture *fixture,
static void
cursor_test_alphabet_free (CursorTest *test)
{
- CursorTestAlphabet *alphabet = (CursorTestAlphabet *)test;
+ CursorTestAlphabet *alphabet = (CursorTestAlphabet *) test;
gint i;
for (i = 0; i < ALPHABET_TEST_LETTERS; i++)
@@ -1597,8 +1615,6 @@ cursor_test_alphabet_free (CursorTest *test)
g_slice_free (CursorTestAlphabet, alphabet);
}
-
-
/******************************************************
* Thread Tests *
******************************************************/
@@ -1632,10 +1648,10 @@ struct _CursorThread {
};
static CursorThread *
-cursor_closure_thread (CursorClosure *closure,
- gboolean create_cursor,
- const gchar *format,
- ...)
+cursor_closure_thread (CursorClosure *closure,
+ gboolean create_cursor,
+ const gchar *format,
+ ...)
{
CursorThread *test = g_slice_new0 (CursorThread);
va_list args;
@@ -1658,7 +1674,7 @@ cursor_closure_thread (CursorClosure *closure,
static gpointer
cursor_thread_func (gpointer data)
{
- CursorThread *thread = (CursorThread *)data;
+ CursorThread *thread = (CursorThread *) data;
GList *l;
/* Allocate thread local resources */
@@ -1668,7 +1684,7 @@ cursor_thread_func (gpointer data)
if (thread->create_cursor) {
/* Use a separate cursor from a different thread */
- ETestServerFixture *server_fixture = (ETestServerFixture *)thread->fixture;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) thread->fixture;
EBookClient *book_client;
GError *error;
@@ -1718,20 +1734,20 @@ cursor_thread_func (gpointer data)
g_mutex_unlock (&thread->mutex);
-
return NULL;
}
static void
-cursor_test_thread (CursorFixture *fixture,
- CursorClosure *closure,
- CursorTest *test)
+cursor_test_thread (CursorFixture *fixture,
+ CursorClosure *closure,
+ CursorTest *test)
{
- CursorThread *thread = (CursorThread *)test;
+ CursorThread *thread = (CursorThread *) test;
thread->fixture = fixture;
thread->closure = closure;
- thread->thread = g_thread_new (thread->thread_name,
+ thread->thread = g_thread_new (
+ thread->thread_name,
cursor_thread_func,
thread);
@@ -1754,7 +1770,7 @@ cursor_thread_test_free (CursorThreadTest *thread_test)
static void
cursor_test_thread_free (CursorTest *test)
{
- CursorThread *thread = (CursorThread *)test;
+ CursorThread *thread = (CursorThread *) test;
if (thread->thread)
g_error ("Freeing thread test before the thread has been joined");
@@ -1764,16 +1780,16 @@ cursor_test_thread_free (CursorTest *test)
g_mutex_clear (&thread->mutex);
g_cond_clear (&thread->cond);
- g_list_free_full (thread->tests, (GDestroyNotify)cursor_thread_test_free);
+ g_list_free_full (thread->tests, (GDestroyNotify) cursor_thread_test_free);
g_slice_free (CursorThread, thread);
}
static void
-cursor_thread_add_test (CursorThread *thread,
- CursorThreadFunc test_func,
- gpointer data,
- GDestroyNotify destroy_data)
+cursor_thread_add_test (CursorThread *thread,
+ CursorThreadFunc test_func,
+ gpointer data,
+ GDestroyNotify destroy_data)
{
CursorThreadTest *thread_test = g_slice_new0 (CursorThreadTest);
@@ -1785,8 +1801,8 @@ cursor_thread_add_test (CursorThread *thread,
}
static void
-cursor_thread_timeout_start (CursorThread *thread,
- const gchar *error_message)
+cursor_thread_timeout_start (CursorThread *thread,
+ const gchar *error_message)
{
timeout_start (thread->context, &thread->timeout_source, error_message);
}
@@ -1808,11 +1824,11 @@ typedef struct {
static void
cursor_closure_thread_join (CursorClosure *closure,
- CursorThread *thread)
+ CursorThread *thread)
{
CursorThreadJoin *test = g_slice_new0 (CursorThreadJoin);
- test->type = CURSOR_TEST_THREAD_JOIN;
+ test->type = CURSOR_TEST_THREAD_JOIN;
test->thread = thread;
closure->tests = g_list_append (closure->tests, test);
@@ -1821,7 +1837,7 @@ cursor_closure_thread_join (CursorClosure *closure,
static gboolean
quit_thread_cb (gpointer data)
{
- CursorThread *thread = (CursorThread *)data;
+ CursorThread *thread = (CursorThread *) data;
g_main_loop_quit (thread->loop);
@@ -1829,11 +1845,11 @@ quit_thread_cb (gpointer data)
}
static void
-cursor_test_thread_join (CursorFixture *fixture,
- CursorClosure *closure,
- CursorTest *test)
+cursor_test_thread_join (CursorFixture *fixture,
+ CursorClosure *closure,
+ CursorTest *test)
{
- CursorThreadJoin *join = (CursorThreadJoin *)test;
+ CursorThreadJoin *join = (CursorThreadJoin *) test;
GSource *source;
g_mutex_lock (&(join->thread->mutex));
@@ -1852,7 +1868,7 @@ cursor_test_thread_join (CursorFixture *fixture,
static void
cursor_test_thread_join_free (CursorTest *test)
{
- CursorThreadJoin *join = (CursorThreadJoin *)test;
+ CursorThreadJoin *join = (CursorThreadJoin *) test;
g_slice_free (CursorThreadJoin, join);
}
@@ -1868,12 +1884,12 @@ typedef struct {
static void
cursor_closure_spin_loop (CursorClosure *closure,
- guint ms)
+ guint ms)
{
CursorTestSpinLoop *test = g_slice_new0 (CursorTestSpinLoop);
test->type = CURSOR_TEST_SPIN_LOOP;
- test->ms = ms;
+ test->ms = ms;
closure->tests = g_list_append (closure->tests, test);
}
@@ -1881,19 +1897,19 @@ cursor_closure_spin_loop (CursorClosure *closure,
static gboolean
quit_loop_cb (gpointer data)
{
- GMainLoop *loop = (GMainLoop *)data;
+ GMainLoop *loop = (GMainLoop *) data;
g_main_loop_quit (loop);
return FALSE;
}
static void
-cursor_test_spin_loop (CursorFixture *fixture,
- CursorClosure *closure,
- CursorTest *test)
+cursor_test_spin_loop (CursorFixture *fixture,
+ CursorClosure *closure,
+ CursorTest *test)
{
- ETestServerFixture *server_fixture = (ETestServerFixture *)fixture;
- CursorTestSpinLoop *spin = (CursorTestSpinLoop *)test;
+ ETestServerFixture *server_fixture = (ETestServerFixture *) fixture;
+ CursorTestSpinLoop *spin = (CursorTestSpinLoop *) test;
if (spin->ms > 0)
g_timeout_add (spin->ms, quit_loop_cb, server_fixture->loop);
@@ -1906,7 +1922,7 @@ cursor_test_spin_loop (CursorFixture *fixture,
static void
cursor_test_spin_loop_free (CursorTest *test)
{
- CursorTestSpinLoop *spin = (CursorTestSpinLoop *)test;
+ CursorTestSpinLoop *spin = (CursorTestSpinLoop *) test;
g_slice_free (CursorTestSpinLoop, spin);
}
@@ -1925,11 +1941,11 @@ typedef struct {
} StepLoopData;
static void
-step_loop_ready_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+step_loop_ready_cb (GObject *source_object,
+ GAsyncResult *result,
+ gpointer user_data)
{
- StepLoopData *data = (StepLoopData *)user_data;
+ StepLoopData *data = (StepLoopData *) user_data;
GSList *results = NULL;
GError *error = NULL;
@@ -1947,18 +1963,19 @@ step_loop_ready_cb (GObject *source_object,
data->end_of_list = TRUE;
g_clear_error (&error);
} else {
- g_error ("Error calling e_book_client_cursor_step_finish(): %s",
- error->message);
+ g_error (
+ "Error calling e_book_client_cursor_step_finish(): %s",
+ error->message);
}
}
- g_slist_free_full (results, (GDestroyNotify)g_object_unref);
+ g_slist_free_full (results, (GDestroyNotify) g_object_unref);
g_main_loop_quit (data->thread->loop);
}
static void
step_loop_refreshed (EBookClientCursor *cursor,
- StepLoopData *data)
+ StepLoopData *data)
{
g_main_loop_quit (data->thread->loop);
}
@@ -1977,13 +1994,14 @@ step_loop_iteration (StepLoopData *data)
if (data->async) {
- e_book_client_cursor_step (data->thread->cursor,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- origin,
- 3,
- NULL,
- step_loop_ready_cb,
- data);
+ e_book_client_cursor_step (
+ data->thread->cursor,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ origin,
+ 3,
+ NULL,
+ step_loop_ready_cb,
+ data);
cursor_thread_timeout_start (data->thread, "Timeout reached waiting for step() reply in a
thread");
g_main_loop_run (data->thread->loop);
@@ -2008,25 +2026,27 @@ step_loop_iteration (StepLoopData *data)
data->end_of_list = TRUE;
g_clear_error (&error);
} else {
- g_error ("Error calling e_book_client_cursor_step_sync(): %s",
- error->message);
+ g_error (
+ "Error calling e_book_client_cursor_step_sync(): %s",
+ error->message);
}
}
- g_slist_free_full (results, (GDestroyNotify)g_object_unref);
+ g_slist_free_full (results, (GDestroyNotify) g_object_unref);
}
/* Pause here and wait for a refresh if we're out of sync */
if (data->out_of_sync) {
- gulong refresh_id = g_signal_connect (data->thread->cursor, "refresh",
- G_CALLBACK (step_loop_refreshed),
- data);
+ gulong refresh_id = g_signal_connect (
+ data->thread->cursor, "refresh",
+ G_CALLBACK (step_loop_refreshed),
+ data);
-
- cursor_thread_timeout_start (data->thread,
- "Timeout reached waiting for a refresh "
- "event after an out-of-sync return by step()");
+ cursor_thread_timeout_start (
+ data->thread,
+ "Timeout reached waiting for a refresh "
+ "event after an out-of-sync return by step()");
g_main_loop_run (data->thread->loop);
cursor_thread_timeout_cancel (data->thread);
@@ -2037,10 +2057,10 @@ step_loop_iteration (StepLoopData *data)
}
static void
-step_loop (CursorFixture *fixture,
- CursorClosure *closure,
- CursorThread *thread,
- gpointer user_data)
+step_loop (CursorFixture *fixture,
+ CursorClosure *closure,
+ CursorThread *thread,
+ gpointer user_data)
{
gboolean async = GPOINTER_TO_INT (user_data);
StepLoopData data = { fixture, closure, thread, async, FALSE, FALSE };
@@ -2051,7 +2071,6 @@ step_loop (CursorFixture *fixture,
}
}
-
/******************************************************
* Main, tests defined here *
******************************************************/
@@ -2115,19 +2134,21 @@ main (gint argc,
closure = cursor_closure_new (&base_params[i], "POSIX");
cursor_closure_alphabet (closure, TRUE, "A", "B", "C", "D", "E");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10, /* Count */
- 10, /* Expected results */
- 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10, /* Count */
+ 10, /* Expected results */
+ 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
cursor_closure_position (closure, 20, 10, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- 10, /* Count */
- 10, /* Expected results */
- 17, 16, 18, 10, 14, 12, 13, 9, 19, 20);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ 10, /* Count */
+ 10, /* Expected results */
+ 17, 16, 18, 10, 14, 12, 13, 9, 19, 20);
cursor_closure_position (closure, 20, 20, TRUE);
cursor_closure_add (closure, "/EBookClientCursor/Order/POSIX%s", base_params[i].base_path);
@@ -2135,19 +2156,21 @@ main (gint argc,
closure = cursor_closure_new (&base_params[i], "en_US.utf8");
cursor_closure_alphabet (closure, TRUE, "A", "B", "C", "D", "E");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10, /* Count */
- 10, /* Expected results */
- 11, 1, 2, 5, 6, 4, 3, 7, 8, 15);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10, /* Count */
+ 10, /* Expected results */
+ 11, 1, 2, 5, 6, 4, 3, 7, 8, 15);
cursor_closure_position (closure, 20, 10, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- 10, /* Count */
- 10, /* Expected results */
- 17, 16, 18, 10, 14, 12, 13, 9, 19, 20);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ 10, /* Count */
+ 10, /* Expected results */
+ 17, 16, 18, 10, 14, 12, 13, 9, 19, 20);
cursor_closure_position (closure, 20, 20, TRUE);
cursor_closure_add (closure, "/EBookClientCursor/Order/en_US%s", base_params[i].base_path);
@@ -2155,19 +2178,21 @@ main (gint argc,
closure = cursor_closure_new (&base_params[i], "fr_CA.utf8");
cursor_closure_alphabet (closure, TRUE, "A", "B", "C", "D", "E");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10, /* Count */
- 10, /* Expected results */
- 11, 1, 2, 5, 6, 4, 3, 7, 8, 15);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10, /* Count */
+ 10, /* Expected results */
+ 11, 1, 2, 5, 6, 4, 3, 7, 8, 15);
cursor_closure_position (closure, 20, 10, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- 10, /* Count */
- 10, /* Expected results */
- 17, 16, 18, 10, 14, 13, 12, 9, 19, 20);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ 10, /* Count */
+ 10, /* Expected results */
+ 17, 16, 18, 10, 14, 13, 12, 9, 19, 20);
cursor_closure_position (closure, 20, 20, TRUE);
cursor_closure_add (closure, "/EBookClientCursor/Order/fr_CA%s", base_params[i].base_path);
@@ -2175,19 +2200,21 @@ main (gint argc,
closure = cursor_closure_new (&base_params[i], "de_DE.utf8");
cursor_closure_alphabet (closure, TRUE, "A", "B", "C", "D", "E");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10, /* Count */
- 10, /* Expected results */
- 11, 1, 2, 5, 6, 7, 8, 4, 3, 15);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10, /* Count */
+ 10, /* Expected results */
+ 11, 1, 2, 5, 6, 7, 8, 4, 3, 15);
cursor_closure_position (closure, 20, 10, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- 10, /* Count */
- 10, /* Expected results */
- 17, 16, 18, 10, 14, 12, 13, 9, 20, 19);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ 10, /* Count */
+ 10, /* Expected results */
+ 17, 16, 18, 10, 14, 12, 13, 9, 20, 19);
cursor_closure_position (closure, 20, 20, TRUE);
cursor_closure_add (closure, "/EBookClientCursor/Order/de_DE%s", base_params[i].base_path);
@@ -2198,176 +2225,196 @@ main (gint argc,
/* Overshooting the contact list causes position to become total + 1 */
closure = cursor_closure_new (&base_params[i], "POSIX");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10, /* Count */
- 10, /* Expected results */
- 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10, /* Count */
+ 10, /* Expected results */
+ 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
cursor_closure_position (closure, 20, 10, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- 11, /* Count */
- 10, /* Expected results */
- 17, 16, 18, 10, 14, 12, 13, 9, 19, 20);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ 11, /* Count */
+ 10, /* Expected results */
+ 17, 16, 18, 10, 14, 12, 13, 9, 19, 20);
cursor_closure_position (closure, 20, 21, TRUE);
cursor_closure_add (closure, "/EBookClientCursor/Step/Overshoot%s", base_params[i].base_path);
/* Undershooting the contact list (in reverse) causes position to become 0 */
closure = cursor_closure_new (&base_params[i], "POSIX");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_END,
- -10, /* Count */
- 10, /* Expected results */
- 20, 19, 9, 13, 12, 14, 10, 18, 16, 17);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_END,
+ -10, /* Count */
+ 10, /* Expected results */
+ 20, 19, 9, 13, 12, 14, 10, 18, 16, 17);
cursor_closure_position (closure, 20, 11, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- -11, /* Count */
- 10, /* Expected results */
- 15, 7, 4, 5, 1, 8, 3, 6, 2, 11);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ -11, /* Count */
+ 10, /* Expected results */
+ 15, 7, 4, 5, 1, 8, 3, 6, 2, 11);
cursor_closure_position (closure, 20, 0, TRUE);
cursor_closure_add (closure, "/EBookClientCursor/Step/Undershoot%s",
base_params[i].base_path);
/* Stepping past the end position causes an E_CLIENT_ERROR_QUERY_REFUSED */
closure = cursor_closure_new (&base_params[i], "POSIX");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10, /* Count */
- 10, /* Expected results */
- 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10, /* Count */
+ 10, /* Expected results */
+ 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
cursor_closure_position (closure, 20, 10, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- 11, /* Count */
- 10, /* Expected results */
- 17, 16, 18, 10, 14, 12, 13, 9, 19, 20);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ 11, /* Count */
+ 10, /* Expected results */
+ 17, 16, 18, 10, 14, 12, 13, 9, 19, 20);
cursor_closure_position (closure, 20, 21, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- 1, /* Count */
- -1); /* Expect E_CLIENT_ERROR_QUERY_REFUSED */
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ 1, /* Count */
+ -1); /* Expect E_CLIENT_ERROR_QUERY_REFUSED */
cursor_closure_add (closure, "/EBookClientCursor/Step/EndOfListError/End%s",
base_params[i].base_path);
/* Stepping backwards past the beginning position causes an E_CLIENT_ERROR_QUERY_REFUSED */
closure = cursor_closure_new (&base_params[i], "POSIX");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_END,
- -10, /* Count */
- 10, /* Expected results */
- 20, 19, 9, 13, 12, 14, 10, 18, 16, 17);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_END,
+ -10, /* Count */
+ 10, /* Expected results */
+ 20, 19, 9, 13, 12, 14, 10, 18, 16, 17);
cursor_closure_position (closure, 20, 11, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- -11, /* Count */
- 10, /* Expected results */
- 15, 7, 4, 5, 1, 8, 3, 6, 2, 11);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ -11, /* Count */
+ 10, /* Expected results */
+ 15, 7, 4, 5, 1, 8, 3, 6, 2, 11);
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- -1, /* Count */
- -1); /* Expect E_CLIENT_ERROR_QUERY_REFUSED */
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ -1, /* Count */
+ -1); /* Expect E_CLIENT_ERROR_QUERY_REFUSED */
cursor_closure_add (closure, "/EBookClientCursor/Step/EndOfListError/Begin%s",
base_params[i].base_path);
/* Resetting query to get the beginning of the results */
closure = cursor_closure_new (&base_params[i], "POSIX");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10, /* Count */
- 10, /* Expected results */
- 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10, /* Count */
+ 10, /* Expected results */
+ 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
cursor_closure_position (closure, 20, 10, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10, /* Count */
- 10, /* Expected results */
- 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10, /* Count */
+ 10, /* Expected results */
+ 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
cursor_closure_position (closure, 20, 10, TRUE);
cursor_closure_add (closure, "/EBookClientCursor/Step/Reset/Forward%s",
base_params[i].base_path);
/* Resetting query to get the ending of the results (backwards) */
closure = cursor_closure_new (&base_params[i], "POSIX");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_END,
- -10, /* Count */
- 10, /* Expected results */
- 20, 19, 9, 13, 12, 14, 10, 18, 16, 17);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_END,
+ -10, /* Count */
+ 10, /* Expected results */
+ 20, 19, 9, 13, 12, 14, 10, 18, 16, 17);
cursor_closure_position (closure, 20, 11, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_END,
- -10, /* Count */
- 10, /* Expected results */
- 20, 19, 9, 13, 12, 14, 10, 18, 16, 17);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_END,
+ -10, /* Count */
+ 10, /* Expected results */
+ 20, 19, 9, 13, 12, 14, 10, 18, 16, 17);
cursor_closure_position (closure, 20, 11, TRUE);
cursor_closure_add (closure, "/EBookClientCursor/Step/Reset/Backwards%s",
base_params[i].base_path);
/* Move twice and then repeat query */
closure = cursor_closure_new (&base_params[i], "POSIX");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10, /* Count */
- 10, /* Expected results */
- 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10, /* Count */
+ 10, /* Expected results */
+ 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
cursor_closure_position (closure, 20, 10, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- 5, /* Count */
- 5, /* Expected results */
- 17, 16, 18, 10, 14);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ 5, /* Count */
+ 5, /* Expected results */
+ 17, 16, 18, 10, 14);
cursor_closure_position (closure, 20, 10, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- 5, /* Count */
- 5, /* Expected results */
- 17, 16, 18, 10, 14);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ 5, /* Count */
+ 5, /* Expected results */
+ 17, 16, 18, 10, 14);
cursor_closure_position (closure, 20, 15, TRUE);
cursor_closure_add (closure, "/EBookClientCursor/Step/RepeatPrevious/Forward%s",
base_params[i].base_path);
/* Move twice and then repeat query */
closure = cursor_closure_new (&base_params[i], "POSIX");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_END,
- -10, /* Count */
- 10, /* Expected results */
- 20, 19, 9, 13, 12, 14, 10, 18, 16, 17);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_END,
+ -10, /* Count */
+ 10, /* Expected results */
+ 20, 19, 9, 13, 12, 14, 10, 18, 16, 17);
cursor_closure_position (closure, 20, 11, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- -5, /* Count */
- 5, /* Expected results */
- 15, 7, 4, 5, 1);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ -5, /* Count */
+ 5, /* Expected results */
+ 15, 7, 4, 5, 1);
cursor_closure_position (closure, 20, 11, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- -5, /* Count */
- 5, /* Expected results */
- 15, 7, 4, 5, 1);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ -5, /* Count */
+ 5, /* Expected results */
+ 15, 7, 4, 5, 1);
cursor_closure_position (closure, 20, 6, TRUE);
cursor_closure_add (closure, "/EBookClientCursor/Step/RepeatPrevious/Backwards%s",
base_params[i].base_path);
@@ -2378,15 +2425,17 @@ main (gint argc,
/* Query Changes Position */
closure = cursor_closure_new (&base_params[i], "POSIX");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10, /* Count */
- 10, /* Expected results */
- 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10, /* Count */
+ 10, /* Expected results */
+ 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
cursor_closure_position (closure, 20, 10, TRUE);
- cursor_closure_set_sexp (closure,
- e_book_query_field_test (
+ cursor_closure_set_sexp (
+ closure,
+ e_book_query_field_test (
E_CONTACT_EMAIL,
E_BOOK_QUERY_ENDS_WITH,
".com"));
@@ -2404,12 +2453,13 @@ main (gint argc,
/* Test that adding a contact changes the total / position appropriately */
closure = cursor_closure_new (&base_params[i], "POSIX");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10, /* Count */
- 10, /* Expected results */
- 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10, /* Count */
+ 10, /* Expected results */
+ 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
cursor_closure_position (closure, 20, 10, TRUE);
cursor_closure_add_contact (closure, "custom-3");
cursor_closure_position (closure, 21, 11, FALSE);
@@ -2418,12 +2468,13 @@ main (gint argc,
/* Test that adding a contact changes the total / position appropriately after having moved
from the end */
closure = cursor_closure_new (&base_params[i], "POSIX");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_END,
- -10, /* Count */
- 10, /* Expected results */
- 20, 19, 9, 13, 12, 14, 10, 18, 16, 17);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_END,
+ -10, /* Count */
+ 10, /* Expected results */
+ 20, 19, 9, 13, 12, 14, 10, 18, 16, 17);
cursor_closure_position (closure, 20, 11, TRUE);
cursor_closure_add_contact (closure, "custom-3");
cursor_closure_position (closure, 21, 12, FALSE);
@@ -2432,12 +2483,13 @@ main (gint argc,
/* Test that removing a contact changes the total / position appropriately */
closure = cursor_closure_new (&base_params[i], "POSIX");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10, /* Count */
- 10, /* Expected results */
- 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10, /* Count */
+ 10, /* Expected results */
+ 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
cursor_closure_position (closure, 20, 10, TRUE);
cursor_closure_remove_contact (closure, "sorted-14");
cursor_closure_position (closure, 19, 10, FALSE);
@@ -2446,12 +2498,13 @@ main (gint argc,
/* Test that removing a contact changes the total / position appropriately after having moved
from the end */
closure = cursor_closure_new (&base_params[i], "POSIX");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_END,
- -10, /* Count */
- 10, /* Expected results */
- 20, 19, 9, 13, 12, 14, 10, 18, 16, 17);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_END,
+ -10, /* Count */
+ 10, /* Expected results */
+ 20, 19, 9, 13, 12, 14, 10, 18, 16, 17);
cursor_closure_position (closure, 20, 11, TRUE);
cursor_closure_remove_contact (closure, "sorted-14");
cursor_closure_position (closure, 19, 11, FALSE);
@@ -2503,76 +2556,84 @@ main (gint argc,
/* Start in POSIX */
closure = cursor_closure_new (&base_params[i], "POSIX");
cursor_closure_position (closure, 20, 0, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10, /* Count */
- 10, /* Expected results */
- 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10, /* Count */
+ 10, /* Expected results */
+ 11, 2, 6, 3, 8, 1, 5, 4, 7, 15);
cursor_closure_position (closure, 20, 10, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- 10, /* Count */
- 10, /* Expected results */
- 17, 16, 18, 10, 14, 12, 13, 9, 19, 20);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ 10, /* Count */
+ 10, /* Expected results */
+ 17, 16, 18, 10, 14, 12, 13, 9, 19, 20);
cursor_closure_position (closure, 20, 20, TRUE);
/* Now in en_US */
cursor_closure_change_locale (closure, "en_US.utf8");
cursor_closure_spin_loop (closure, 0);
cursor_closure_position (closure, 20, 0, FALSE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10, /* Count */
- 10, /* Expected results */
- 11, 1, 2, 5, 6, 4, 3, 7, 8, 15);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10, /* Count */
+ 10, /* Expected results */
+ 11, 1, 2, 5, 6, 4, 3, 7, 8, 15);
cursor_closure_position (closure, 20, 10, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- 10, /* Count */
- 10, /* Expected results */
- 17, 16, 18, 10, 14, 12, 13, 9, 19, 20);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ 10, /* Count */
+ 10, /* Expected results */
+ 17, 16, 18, 10, 14, 12, 13, 9, 19, 20);
cursor_closure_position (closure, 20, 20, TRUE);
/* Now in fr_CA */
cursor_closure_change_locale (closure, "fr_CA.utf8");
cursor_closure_spin_loop (closure, 0);
cursor_closure_position (closure, 20, 0, FALSE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10, /* Count */
- 10, /* Expected results */
- 11, 1, 2, 5, 6, 4, 3, 7, 8, 15);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10, /* Count */
+ 10, /* Expected results */
+ 11, 1, 2, 5, 6, 4, 3, 7, 8, 15);
cursor_closure_position (closure, 20, 10, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- 10, /* Count */
- 10, /* Expected results */
- 17, 16, 18, 10, 14, 13, 12, 9, 19, 20);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ 10, /* Count */
+ 10, /* Expected results */
+ 17, 16, 18, 10, 14, 13, 12, 9, 19, 20);
cursor_closure_position (closure, 20, 20, TRUE);
/* Now in de_DE */
cursor_closure_change_locale (closure, "de_DE.utf8");
cursor_closure_spin_loop (closure, 0);
cursor_closure_position (closure, 20, 0, FALSE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_BEGIN,
- 10, /* Count */
- 10, /* Expected results */
- 11, 1, 2, 5, 6, 7, 8, 4, 3, 15);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_BEGIN,
+ 10, /* Count */
+ 10, /* Expected results */
+ 11, 1, 2, 5, 6, 7, 8, 4, 3, 15);
cursor_closure_position (closure, 20, 10, TRUE);
- cursor_closure_step (closure,
- E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
- E_BOOK_CURSOR_ORIGIN_CURRENT,
- 10, /* Count */
- 10, /* Expected results */
- 17, 16, 18, 10, 14, 12, 13, 9, 20, 19);
+ cursor_closure_step (
+ closure,
+ E_BOOK_CURSOR_STEP_MOVE | E_BOOK_CURSOR_STEP_FETCH,
+ E_BOOK_CURSOR_ORIGIN_CURRENT,
+ 10, /* Count */
+ 10, /* Expected results */
+ 17, 16, 18, 10, 14, 12, 13, 9, 20, 19);
cursor_closure_position (closure, 20, 20, TRUE);
cursor_closure_add (closure, "/EBookClientCursor/ChangeLocale/Order%s",
base_params[i].base_path);
@@ -2647,7 +2708,8 @@ main (gint argc,
*/
closure = cursor_closure_new (&base_params[i], "POSIX");
thread = cursor_closure_thread (closure, thread_params[j].dedicated_cursor,
"move-by-thread");
- cursor_thread_add_test (thread, step_loop,
+ cursor_thread_add_test (
+ thread, step_loop,
GINT_TO_POINTER (thread_params[j].async), NULL);
for (k = 0; k < THREAD_ITERATIONS; k++) {
@@ -2657,16 +2719,18 @@ main (gint argc,
cursor_closure_spin_loop (closure, 0);
}
cursor_closure_thread_join (closure, thread);
- cursor_closure_add (closure, "/EBookClientCursor/Thread/Step/AddingAndRemoving%s%s",
- base_params[i].base_path,
- thread_params[j].base_path);
+ cursor_closure_add (
+ closure, "/EBookClientCursor/Thread/Step/AddingAndRemoving%s%s",
+ base_params[i].base_path,
+ thread_params[j].base_path);
/* The same test as above, except that the addressbook is changing locale instead
* of adding / removing contacts
*/
closure = cursor_closure_new (&base_params[i], "POSIX");
thread = cursor_closure_thread (closure, thread_params[j].dedicated_cursor,
"move-by-thread");
- cursor_thread_add_test (thread, step_loop,
+ cursor_thread_add_test (
+ thread, step_loop,
GINT_TO_POINTER (thread_params[j].async), NULL);
for (k = 0; k < THREAD_ITERATIONS; k++) {
@@ -2676,18 +2740,18 @@ main (gint argc,
cursor_closure_spin_loop (closure, 0);
}
cursor_closure_thread_join (closure, thread);
- cursor_closure_add (closure, "/EBookClientCursor/Thread/Step/ChangingLocale%s%s",
- base_params[i].base_path,
- thread_params[j].base_path);
-
-
+ cursor_closure_add (
+ closure, "/EBookClientCursor/Thread/Step/ChangingLocale%s%s",
+ base_params[i].base_path,
+ thread_params[j].base_path);
/* Add / Remove contacts with multiple threaded step() operations going on
concurrently */
closure = cursor_closure_new (&base_params[i], "POSIX");
for (k = 0; k < CONCURRENT_THREADS; k++) {
threads[k] = cursor_closure_thread (closure,
thread_params[j].dedicated_cursor, "move-by-thread");
- cursor_thread_add_test (threads[k], step_loop,
+ cursor_thread_add_test (
+ threads[k], step_loop,
GINT_TO_POINTER (thread_params[j].async), NULL);
}
@@ -2701,9 +2765,10 @@ main (gint argc,
for (k = 0; k < CONCURRENT_THREADS; k++)
cursor_closure_thread_join (closure, threads[k]);
- cursor_closure_add (closure,
"/EBookClientCursor/MultipleThreads/Step/AddingAndRemoving%s%s",
- base_params[i].base_path,
- thread_params[j].base_path);
+ cursor_closure_add (
+ closure, "/EBookClientCursor/MultipleThreads/Step/AddingAndRemoving%s%s",
+ base_params[i].base_path,
+ thread_params[j].base_path);
}
}
diff --git a/tests/libebook/client/test-book-client-custom-summary.c
b/tests/libebook/client/test-book-client-custom-summary.c
index df4cdd0..9f3c44e 100644
--- a/tests/libebook/client/test-book-client-custom-summary.c
+++ b/tests/libebook/client/test-book-client-custom-summary.c
@@ -57,7 +57,7 @@ setup_custom_book (ESource *scratch,
0);
}
-static ETestServerClosure setup_custom_closure = { E_TEST_SERVER_ADDRESS_BOOK, setup_custom_book, 0, TRUE,
NULL };
+static ETestServerClosure setup_custom_closure = { E_TEST_SERVER_ADDRESS_BOOK, setup_custom_book, 0, TRUE,
NULL };
static ETestServerClosure setup_default_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, TRUE, NULL };
/* Filter which tests we want to try with a regexp */
@@ -71,7 +71,6 @@ static GOptionEntry entries[] = {
{ NULL }
};
-
/* Define this macro to expect E_CLIENT_ERROR_NOT_SUPPORTED
* only on phone number queries when EDS is built with no
* phone number support.
@@ -84,7 +83,6 @@ static GOptionEntry entries[] = {
#define N_CONTACTS 15
-
typedef struct {
ETestServerClosure parent;
gchar *sexp;
@@ -111,8 +109,8 @@ setup_book (ClientTestFixture *fixture)
gchar *vcard;
EContact *contact;
- vcard = new_vcard_from_test_case (case_name);
- contact = e_contact_new_from_vcard (vcard);
+ vcard = new_vcard_from_test_case (case_name);
+ contact = e_contact_new_from_vcard (vcard);
contacts = g_slist_prepend (contacts, contact);
g_free (vcard);
g_free (case_name);
@@ -380,10 +378,12 @@ main (gint argc,
* a customized summary and another without a customized summary
*/
if (test_regex == NULL) {
- g_test_add ("/EBookClient/SetupDefaultBook", ClientTestFixture, &setup_default_closure,
- client_test_setup_default, setup_test, client_test_teardown);
- g_test_add ("/EBookClient/SetupCustomBook", ClientTestFixture, &setup_custom_closure,
- client_test_setup_custom, setup_test, client_test_teardown);
+ g_test_add (
+ "/EBookClient/SetupDefaultBook", ClientTestFixture, &setup_default_closure,
+ client_test_setup_default, setup_test, client_test_teardown);
+ g_test_add (
+ "/EBookClient/SetupCustomBook", ClientTestFixture, &setup_custom_closure,
+ client_test_setup_custom, setup_test, client_test_teardown);
}
/* Test all queries in 8 different combinations specified by the 'suites'
@@ -842,7 +842,6 @@ main (gint argc,
suites[i].custom,
TRUE);
-
/*
* Query: +49 408.765.5050 (one exact match)
* +------------------------------+--------------------+
@@ -885,7 +884,6 @@ main (gint argc,
suites[i].custom,
TRUE);
-
/*********************************************
* E_BOOK_QUERY_EQUALS_NATIONAL_PHONE_NUMBER *
*********************************************/
@@ -982,7 +980,6 @@ main (gint argc,
suites[i].custom,
TRUE);
-
/* Test that a query term with a specified country returns
* only vCards that are specifically in the specified country
* code.
@@ -1053,8 +1050,6 @@ main (gint argc,
suites[i].custom,
TRUE);
-
-
/********************************************
* E_BOOK_QUERY_EQUALS_SHORT_PHONE_NUMBER *
********************************************/
diff --git a/tests/libebook/client/test-book-client-e164-param.c
b/tests/libebook/client/test-book-client-e164-param.c
index 45f8651..7d2804d 100644
--- a/tests/libebook/client/test-book-client-e164-param.c
+++ b/tests/libebook/client/test-book-client-e164-param.c
@@ -86,7 +86,7 @@ test_add_e164_param (ETestServerFixture *fixture,
book_client = E_TEST_SERVER_UTILS_SERVICE (fixture, EBookClient);
g_print ("%p\n", book_client);
- vcard = new_vcard_from_test_case (data->vcard_name);
+ vcard = new_vcard_from_test_case (data->vcard_name);
contact = e_contact_new_from_vcard (vcard);
g_free (vcard);
diff --git a/tests/libebook/client/test-book-client-get-contact-uids.c
b/tests/libebook/client/test-book-client-get-contact-uids.c
index 012e0b4..f94b8dd 100644
--- a/tests/libebook/client/test-book-client-get-contact-uids.c
+++ b/tests/libebook/client/test-book-client-get-contact-uids.c
@@ -6,9 +6,9 @@
#include "client-test-utils.h"
#include "e-test-server-utils.h"
-static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
FALSE };
-static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
TRUE };
-static ETestServerClosure book_closure_direct_sync = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, FALSE };
+static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
+static ETestServerClosure book_closure_direct_sync = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, FALSE };
static ETestServerClosure book_closure_direct_async = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, TRUE };
static void
diff --git a/tests/libebook/client/test-book-client-get-contact.c
b/tests/libebook/client/test-book-client-get-contact.c
index 2f750fc..dd96946 100644
--- a/tests/libebook/client/test-book-client-get-contact.c
+++ b/tests/libebook/client/test-book-client-get-contact.c
@@ -6,9 +6,9 @@
#include "client-test-utils.h"
#include "e-test-server-utils.h"
-static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
FALSE };
-static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
TRUE };
-static ETestServerClosure book_closure_direct_sync = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, FALSE };
+static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
+static ETestServerClosure book_closure_direct_sync = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, FALSE };
static ETestServerClosure book_closure_direct_async = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, TRUE };
static void
diff --git a/tests/libebook/client/test-book-client-get-view.c
b/tests/libebook/client/test-book-client-get-view.c
index df8fbca..4fab6a2 100644
--- a/tests/libebook/client/test-book-client-get-view.c
+++ b/tests/libebook/client/test-book-client-get-view.c
@@ -6,9 +6,9 @@
#include "client-test-utils.h"
#include "e-test-server-utils.h"
-static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
FALSE };
-static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
TRUE };
-static ETestServerClosure book_closure_direct_sync = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, FALSE };
+static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
+static ETestServerClosure book_closure_direct_sync = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, FALSE };
static ETestServerClosure book_closure_direct_async = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, TRUE };
static void
diff --git a/tests/libebook/client/test-book-client-modify-contact.c
b/tests/libebook/client/test-book-client-modify-contact.c
index 371345e..ee9ea73 100644
--- a/tests/libebook/client/test-book-client-modify-contact.c
+++ b/tests/libebook/client/test-book-client-modify-contact.c
@@ -6,7 +6,7 @@
#include "client-test-utils.h"
#include "e-test-server-utils.h"
-static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
#define EMAIL_ADD "foo bar com"
diff --git a/tests/libebook/client/test-book-client-photo-is-uri.c
b/tests/libebook/client/test-book-client-photo-is-uri.c
index 0c5d4e5..fdcbc9d 100644
--- a/tests/libebook/client/test-book-client-photo-is-uri.c
+++ b/tests/libebook/client/test-book-client-photo-is-uri.c
@@ -110,8 +110,8 @@ give_james_brown_micheal_jacksons_face (EBookClient *book)
micheal_face = e_contact_get (micheal, E_CONTACT_PHOTO);
g_assert (micheal_face->type == E_CONTACT_PHOTO_TYPE_URI);
- james_face = g_new (EContactPhoto, 1);
- james_face->type = E_CONTACT_PHOTO_TYPE_URI;
+ james_face = g_new (EContactPhoto, 1);
+ james_face->type = E_CONTACT_PHOTO_TYPE_URI;
james_face->data.uri = g_strdup (micheal_face->data.uri);
e_contact_set (james, E_CONTACT_PHOTO, james_face);
@@ -285,8 +285,8 @@ add_contact_uri (EBookClient *book)
contact = e_contact_new ();
- photo = g_new (EContactPhoto, 1);
- photo->type = E_CONTACT_PHOTO_TYPE_URI;
+ photo = g_new (EContactPhoto, 1);
+ photo->type = E_CONTACT_PHOTO_TYPE_URI;
photo->data.uri = g_strdup ("http://en.wikipedia.org/wiki/File:Jamesbrown4.jpg";);
/* set the photo */
diff --git a/tests/libebook/client/test-book-client-preserve-uid.c
b/tests/libebook/client/test-book-client-preserve-uid.c
index 28e8e85..1ef4eb5 100644
--- a/tests/libebook/client/test-book-client-preserve-uid.c
+++ b/tests/libebook/client/test-book-client-preserve-uid.c
@@ -41,7 +41,7 @@ test_preserve_uid (ETestServerFixture *fixture,
book_client = E_TEST_SERVER_UTILS_SERVICE (fixture, EBookClient);
- vcard = new_vcard_from_test_case ("simple-1");
+ vcard = new_vcard_from_test_case ("simple-1");
contact = e_contact_new_from_vcard (vcard);
g_free (vcard);
@@ -69,7 +69,7 @@ test_uid_conflict (ETestServerFixture *fixture,
/* Hijack the first test case, ensure we already have the contact added */
test_preserve_uid (fixture, user_data);
- vcard = new_vcard_from_test_case ("simple-2");
+ vcard = new_vcard_from_test_case ("simple-2");
contact = e_contact_new_from_vcard (vcard);
g_free (vcard);
diff --git a/tests/libebook/client/test-book-client-refresh.c
b/tests/libebook/client/test-book-client-refresh.c
index 57ee0b7..72a54dd 100644
--- a/tests/libebook/client/test-book-client-refresh.c
+++ b/tests/libebook/client/test-book-client-refresh.c
@@ -7,7 +7,7 @@
#include "client-test-utils.h"
#include "e-test-server-utils.h"
-static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
/* asynchronous callback with a main-loop running */
diff --git a/tests/libebook/client/test-book-client-remove-contact-by-uid.c
b/tests/libebook/client/test-book-client-remove-contact-by-uid.c
index 250b8d6..5c49193 100644
--- a/tests/libebook/client/test-book-client-remove-contact-by-uid.c
+++ b/tests/libebook/client/test-book-client-remove-contact-by-uid.c
@@ -5,7 +5,7 @@
#include "client-test-utils.h"
#include "e-test-server-utils.h"
-static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
static void
diff --git a/tests/libebook/client/test-book-client-remove-contact.c
b/tests/libebook/client/test-book-client-remove-contact.c
index 3153c02..0e244fa 100644
--- a/tests/libebook/client/test-book-client-remove-contact.c
+++ b/tests/libebook/client/test-book-client-remove-contact.c
@@ -6,9 +6,9 @@
#include "client-test-utils.h"
#include "e-test-server-utils.h"
-static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
FALSE };
-static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
TRUE };
-static ETestServerClosure book_closure_direct_sync = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, FALSE };
+static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
+static ETestServerClosure book_closure_direct_sync = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, FALSE };
static ETestServerClosure book_closure_direct_async = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, TRUE };
static void
diff --git a/tests/libebook/client/test-book-client-remove-contacts.c
b/tests/libebook/client/test-book-client-remove-contacts.c
index 51998d1..cdf32a4 100644
--- a/tests/libebook/client/test-book-client-remove-contacts.c
+++ b/tests/libebook/client/test-book-client-remove-contacts.c
@@ -5,7 +5,7 @@
#include "client-test-utils.h"
#include "e-test-server-utils.h"
-static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
static void
diff --git a/tests/libebook/client/test-book-client-revision-view.c
b/tests/libebook/client/test-book-client-revision-view.c
index 21ecc7a..186a848 100644
--- a/tests/libebook/client/test-book-client-revision-view.c
+++ b/tests/libebook/client/test-book-client-revision-view.c
@@ -6,7 +6,7 @@
#include "client-test-utils.h"
#include "e-test-server-utils.h"
-static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
#define N_TEST_CONTACTS 4
@@ -22,7 +22,7 @@ setup_book (EBookClient *book_client)
for (i = 0; i < N_TEST_CONTACTS; i++)
{
EContact *contact = e_contact_new ();
- gchar *name = g_strdup_printf ("Contact #%d", i + 1);
+ gchar *name = g_strdup_printf ("Contact #%d", i + 1);
e_contact_set (contact, E_CONTACT_FULL_NAME, name);
e_contact_set (contact, E_CONTACT_NICKNAME, name);
@@ -92,7 +92,7 @@ objects_removed (EBookClientView *view,
static void
complete (EBookClientView *view,
const GError *error,
- gpointer user_data)
+ gpointer user_data)
{
GMainLoop *loop = (GMainLoop *) user_data;
finish_test (view, loop);
diff --git a/tests/libebook/client/test-book-client-suppress-notifications.c
b/tests/libebook/client/test-book-client-suppress-notifications.c
index 271db70..f9cea9f 100644
--- a/tests/libebook/client/test-book-client-suppress-notifications.c
+++ b/tests/libebook/client/test-book-client-suppress-notifications.c
@@ -6,9 +6,9 @@
#include "client-test-utils.h"
#include "e-test-server-utils.h"
-static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
FALSE };
-static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
TRUE };
-static ETestServerClosure book_closure_direct_sync = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, FALSE };
+static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
+static ETestServerClosure book_closure_direct_sync = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, FALSE };
static ETestServerClosure book_closure_direct_async = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, TRUE };
#define NOTIFICATION_WAIT 2000
diff --git a/tests/libebook/client/test-book-client-uid-only-view.c
b/tests/libebook/client/test-book-client-uid-only-view.c
index 46f3f94..4904004 100644
--- a/tests/libebook/client/test-book-client-uid-only-view.c
+++ b/tests/libebook/client/test-book-client-uid-only-view.c
@@ -11,9 +11,9 @@ typedef struct {
gboolean uids_only;
} UIDOnlyClosure;
-static UIDOnlyClosure book_closure_all_data_sync = { { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
FALSE }, FALSE };
-static UIDOnlyClosure book_closure_all_data_async = { { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
TRUE }, FALSE };
-static UIDOnlyClosure book_closure_uids_only_sync = { { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
FALSE }, TRUE };
+static UIDOnlyClosure book_closure_all_data_sync = { { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
FALSE }, FALSE };
+static UIDOnlyClosure book_closure_all_data_async = { { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
TRUE }, FALSE };
+static UIDOnlyClosure book_closure_uids_only_sync = { { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
FALSE }, TRUE };
static UIDOnlyClosure book_closure_uids_only_async = { { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
TRUE }, TRUE };
#define N_TEST_CONTACTS 4
@@ -26,7 +26,7 @@ static UIDOnlyClosure book_closure_uids_only_async = { { E_TEST_SERVER_ADDRESS_B
# define SETUP_TIMER(timer) GTimer *timer = g_timer_new ();
# define START_TIMER(timer) g_timer_start (timer);
# define STOP_TIMER(timer) g_timer_stop (timer);
-# define PRINT_TIMER(timer, activity) \
+# define PRINT_TIMER(timer, activity) \
printf ("%s finished in %02.6f seconds\n", activity, g_timer_elapsed (timer, NULL));
#else
# define SETUP_TIMER(timer)
@@ -35,7 +35,7 @@ static UIDOnlyClosure book_closure_uids_only_async = { { E_TEST_SERVER_ADDRESS_B
# define PRINT_TIMER(timer, activity)
#endif
-static gboolean uids_only = FALSE;
+static gboolean uids_only = FALSE;
/****************************************************************
* Modify/Setup the EBook *
@@ -48,7 +48,7 @@ setup_book (EBookClient *book_client)
for (i = 0; i < N_TEST_CONTACTS; i++)
{
EContact *contact = e_contact_new ();
- gchar *name = g_strdup_printf ("Contact #%d", i + 1);
+ gchar *name = g_strdup_printf ("Contact #%d", i + 1);
gchar *emails[5] = {
g_strdup_printf ("contact%d first email com", i),
g_strdup_printf ("contact%d second email com", i),
@@ -169,7 +169,7 @@ objects_removed (EBookClientView *view,
static void
complete (EBookClientView *view,
const GError *error,
- gpointer user_data)
+ gpointer user_data)
{
GMainLoop *loop = (GMainLoop *) user_data;
diff --git a/tests/libebook/client/test-book-client-view-operations.c
b/tests/libebook/client/test-book-client-view-operations.c
index e24e09b..05ef81d 100644
--- a/tests/libebook/client/test-book-client-view-operations.c
+++ b/tests/libebook/client/test-book-client-view-operations.c
@@ -8,9 +8,9 @@
#include "client-test-utils.h"
#include "e-test-server-utils.h"
-static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
FALSE };
-static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL,
TRUE };
-static ETestServerClosure book_closure_direct_sync = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, FALSE };
+static ETestServerClosure book_closure_sync = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, FALSE };
+static ETestServerClosure book_closure_async = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0, FALSE, NULL, TRUE };
+static ETestServerClosure book_closure_direct_sync = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, FALSE };
static ETestServerClosure book_closure_direct_async = { E_TEST_SERVER_DIRECT_ADDRESS_BOOK, NULL, 0, FALSE,
NULL, TRUE };
#define N_THREADS 5
@@ -168,7 +168,7 @@ test_view_thread_async (ThreadData *data)
ESource *source;
GError *error = NULL;
- context = g_main_context_new ();
+ context = g_main_context_new ();
data->loop = g_main_loop_new (context, FALSE);
g_main_context_push_thread_default (context);
@@ -252,7 +252,7 @@ test_view_thread_sync (ThreadData *data)
ESource *source;
GError *error = NULL;
- context = g_main_context_new ();
+ context = g_main_context_new ();
data->loop = g_main_loop_new (context, FALSE);
g_main_context_push_thread_default (context);
@@ -295,8 +295,8 @@ create_test_thread (const gchar *book_uid,
{
ThreadData *data = g_slice_new0 (ThreadData);
- data->book_uid = book_uid;
- data->closure = (ETestServerClosure *) user_data;
+ data->book_uid = book_uid;
+ data->closure = (ETestServerClosure *) user_data;
g_mutex_init (&data->complete_mutex);
g_cond_init (&data->complete_cond);
diff --git a/tests/libebook/client/test-book-client-write-write.c
b/tests/libebook/client/test-book-client-write-write.c
index 4fc29ee..0f17ab5 100644
--- a/tests/libebook/client/test-book-client-write-write.c
+++ b/tests/libebook/client/test-book-client-write-write.c
@@ -189,7 +189,7 @@ test_write_thread (ThreadData *data)
ESource *source;
GError *error = NULL;
- context = g_main_context_new ();
+ context = g_main_context_new ();
data->loop = g_main_loop_new (context, FALSE);
g_main_context_push_thread_default (context);
@@ -233,10 +233,10 @@ create_test_thread (const gchar *book_uid,
ThreadData *data = g_slice_new0 (ThreadData);
const gchar *name = e_contact_field_name (field);
- data->book_uid = book_uid;
+ data->book_uid = book_uid;
data->contact_uid = contact_uid;
- data->field = field;
- data->value = value;
+ data->field = field;
+ data->value = value;
data->thread = g_thread_new (name, (GThreadFunc) test_write_thread, data);
diff --git a/tests/libebook/test-ebook-commit-contact.c b/tests/libebook/test-ebook-commit-contact.c
index 2294c2c..8a7aeb3 100644
--- a/tests/libebook/test-ebook-commit-contact.c
+++ b/tests/libebook/test-ebook-commit-contact.c
@@ -13,7 +13,7 @@ static ETestServerClosure book_closure =
/* Global data */
static EBook *book = NULL;
-static gchar *uid = NULL;
+static gchar *uid = NULL;
static void
verify_precommit_and_prepare_contact (EContact *contact)
diff --git a/tests/libecal/client/test-cal-client-revision-view.c
b/tests/libecal/client/test-cal-client-revision-view.c
index 2148ab2..245460b 100644
--- a/tests/libecal/client/test-cal-client-revision-view.c
+++ b/tests/libecal/client/test-cal-client-revision-view.c
@@ -61,8 +61,8 @@ objects_added_cb (GObject *object,
GMainLoop *loop = (GMainLoop *) data;
for (l = objects; l; l = l->next) {
- icalcomponent *component = l->data;
- struct icaltimetype recurrence = icalcomponent_get_recurrenceid (component);
+ icalcomponent *component = l->data;
+ struct icaltimetype recurrence = icalcomponent_get_recurrenceid (component);
struct icaltimetype last_modified = get_last_modified (component);
g_print (
@@ -86,8 +86,8 @@ objects_modified_cb (GObject *object,
GMainLoop *loop = (GMainLoop *) data;
for (l = objects; l; l = l->next) {
- icalcomponent *component = l->data;
- struct icaltimetype recurrence = icalcomponent_get_recurrenceid (component);
+ icalcomponent *component = l->data;
+ struct icaltimetype recurrence = icalcomponent_get_recurrenceid (component);
struct icaltimetype last_modified = get_last_modified (component);
g_print (
diff --git a/tests/libedata-book/data-test-utils.c b/tests/libedata-book/data-test-utils.c
index 06a48a4..77e01db 100644
--- a/tests/libedata-book/data-test-utils.c
+++ b/tests/libedata-book/data-test-utils.c
@@ -46,8 +46,9 @@ new_vcard_from_test_case (const gchar *case_name)
file = g_file_new_for_path (filename);
if (!g_file_load_contents (file, NULL, &vcard, NULL, NULL, &error))
- g_error ("failed to read test contact file '%s': %s",
- filename, error->message);
+ g_error (
+ "failed to read test contact file '%s': %s",
+ filename, error->message);
g_free (case_filename);
g_free (filename);
@@ -68,16 +69,17 @@ new_contact_from_test_case (const gchar *case_name)
g_free (vcard);
if (!contact)
- g_error ("failed to construct contact from test case '%s'",
- case_name);
+ g_error (
+ "failed to construct contact from test case '%s'",
+ case_name);
return contact;
}
void
add_contact_from_test_case (EbSqlFixture *fixture,
- const gchar *case_name,
- EContact **ret_contact)
+ const gchar *case_name,
+ EContact **ret_contact)
{
EContact *contact;
GError *error = NULL;
@@ -132,10 +134,11 @@ setup_empty_book (void)
/* This is a bit of a cheat */
setup = g_object_new (E_TYPE_SOURCE_BACKEND_SUMMARY_SETUP, "source", scratch, NULL);
- e_source_backend_summary_setup_set_summary_fields (setup,
+ e_source_backend_summary_setup_set_summary_fields (
+ setup,
/* We don't use this field in our tests anyway */
- E_CONTACT_FILE_AS,
- 0);
+ E_CONTACT_FILE_AS,
+ 0);
g_object_unref (scratch);
@@ -144,8 +147,8 @@ setup_empty_book (void)
static gchar *
fetch_vcard_from_hash (const gchar *uid,
- const gchar *extra,
- gpointer user_data)
+ const gchar *extra,
+ gpointer user_data)
{
EbSqlFixture *fixture = user_data;
EContact *contact;
@@ -160,12 +163,12 @@ fetch_vcard_from_hash (const gchar *uid,
return NULL;
}
-static void
-contact_change_cb (EbSqlChangeType change_type,
- const gchar *uid,
- const gchar *extra,
- const gchar *vcard,
- gpointer user_data)
+static void
+contact_change_cb (EbSqlChangeType change_type,
+ const gchar *uid,
+ const gchar *extra,
+ const gchar *vcard,
+ gpointer user_data)
{
EbSqlFixture *fixture = user_data;
EContact *contact;
@@ -181,22 +184,23 @@ contact_change_cb (EbSqlChangeType change_type,
}
void
-e_sqlite_fixture_setup (EbSqlFixture *fixture,
- gconstpointer user_data)
+e_sqlite_fixture_setup (EbSqlFixture *fixture,
+ gconstpointer user_data)
{
- EbSqlClosure *closure = (EbSqlClosure *)user_data;
+ EbSqlClosure *closure = (EbSqlClosure *) user_data;
ESourceBackendSummarySetup *setup = NULL;
gchar *filename, *directory;
GError *error = NULL;
fixture->contacts =
- g_hash_table_new_full (g_str_hash,
- g_str_equal,
- g_free,
- g_object_unref);
+ g_hash_table_new_full (
+ g_str_hash,
+ g_str_equal,
+ g_free,
+ g_object_unref);
/* Cleanup from last test */
- directory = g_build_filename (g_get_tmp_dir (), "test-sqlite-cache", NULL);
+ directory = g_build_filename (g_get_tmp_dir (), "test-sqlite-cache", NULL);
delete_work_directory (directory);
g_free (directory);
filename = g_build_filename (g_get_tmp_dir (), "test-sqlite-cache", "contacts.db", NULL);
@@ -205,21 +209,23 @@ e_sqlite_fixture_setup (EbSqlFixture *fixture,
setup = closure->setup_summary ();
if (closure->without_vcards)
- fixture->ebsql = e_book_sqlite_new_full (filename,
- setup,
- fetch_vcard_from_hash,
- contact_change_cb,
- fixture,
- NULL, NULL,
- &error);
+ fixture->ebsql = e_book_sqlite_new_full (
+ filename,
+ setup,
+ fetch_vcard_from_hash,
+ contact_change_cb,
+ fixture,
+ NULL, NULL,
+ &error);
else
- fixture->ebsql = e_book_sqlite_new_full (filename,
- setup,
- NULL,
- contact_change_cb,
- fixture,
- NULL, NULL,
- &error);
+ fixture->ebsql = e_book_sqlite_new_full (
+ filename,
+ setup,
+ NULL,
+ contact_change_cb,
+ fixture,
+ NULL, NULL,
+ &error);
g_clear_object (&setup);
@@ -230,8 +236,8 @@ e_sqlite_fixture_setup (EbSqlFixture *fixture,
}
void
-e_sqlite_fixture_teardown (EbSqlFixture *fixture,
- gconstpointer user_data)
+e_sqlite_fixture_teardown (EbSqlFixture *fixture,
+ gconstpointer user_data)
{
g_object_unref (fixture->ebsql);
g_hash_table_destroy (fixture->contacts);
@@ -239,10 +245,10 @@ e_sqlite_fixture_teardown (EbSqlFixture *fixture,
void
e_sqlite_cursor_fixture_setup (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
- EbSqlFixture *base_fixture = (EbSqlFixture *)fixture;
- EbSqlCursorClosure *data = (EbSqlCursorClosure *)user_data;
+ EbSqlFixture *base_fixture = (EbSqlFixture *) fixture;
+ EbSqlCursorClosure *data = (EbSqlCursorClosure *) user_data;
EContactField sort_fields[] = { E_CONTACT_FAMILY_NAME, E_CONTACT_GIVEN_NAME };
EBookCursorSortType sort_types[] = { data->sort_type, data->sort_type };
GSList *contacts = NULL;
@@ -263,9 +269,9 @@ e_sqlite_cursor_fixture_setup (EbSqlCursorFixture *fixture,
gchar *vcard;
EContact *contact;
- vcard = new_vcard_from_test_case (case_name);
- contact = e_contact_new_from_vcard (vcard);
- contacts = g_slist_prepend (contacts, contact);
+ vcard = new_vcard_from_test_case (case_name);
+ contact = e_contact_new_from_vcard (vcard);
+ contacts = g_slist_prepend (contacts, contact);
extra_list = g_slist_prepend (extra_list, case_name);
g_free (vcard);
@@ -273,9 +279,10 @@ e_sqlite_cursor_fixture_setup (EbSqlCursorFixture *fixture,
fixture->contacts[i] = contact;
/* These need to be added to the hash as well */
- g_hash_table_insert (base_fixture->contacts,
- g_strdup (case_name),
- g_object_ref (contact));
+ g_hash_table_insert (
+ base_fixture->contacts,
+ g_strdup (case_name),
+ g_object_ref (contact));
}
if (!e_book_sqlite_add_contacts (base_fixture->ebsql,
@@ -301,8 +308,9 @@ e_sqlite_cursor_fixture_setup (EbSqlCursorFixture *fixture,
fixture->query = NULL;
}
- fixture->cursor = e_book_sqlite_cursor_new (base_fixture->ebsql, sexp,
- sort_fields, sort_types, 2, &error);
+ fixture->cursor = e_book_sqlite_cursor_new (
+ base_fixture->ebsql, sexp,
+ sort_fields, sort_types, 2, &error);
if (!fixture->cursor)
g_error ("Failed to create cursor: %s\n", error->message);
@@ -312,7 +320,7 @@ e_sqlite_cursor_fixture_setup (EbSqlCursorFixture *fixture,
void
e_sqlite_cursor_fixture_filtered_setup (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
fixture->query = e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_ENDS_WITH, ".com");
@@ -321,9 +329,9 @@ e_sqlite_cursor_fixture_filtered_setup (EbSqlCursorFixture *fixture,
void
e_sqlite_cursor_fixture_teardown (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
- EbSqlFixture *base_fixture = (EbSqlFixture *)fixture;
+ EbSqlFixture *base_fixture = (EbSqlFixture *) fixture;
gint i;
for (i = 0; i < N_SORTED_CONTACTS; i++) {
@@ -337,9 +345,9 @@ e_sqlite_cursor_fixture_teardown (EbSqlCursorFixture *fixture,
void
e_sqlite_cursor_fixture_set_locale (EbSqlCursorFixture *fixture,
- const gchar *locale)
+ const gchar *locale)
{
- EbSqlFixture *base_fixture = (EbSqlFixture *)fixture;
+ EbSqlFixture *base_fixture = (EbSqlFixture *) fixture;
GError *error = NULL;
if (!e_book_sqlite_set_locale (base_fixture->ebsql,
@@ -349,14 +357,14 @@ e_sqlite_cursor_fixture_set_locale (EbSqlCursorFixture *fixture,
static gint
find_contact_data (EbSqlSearchData *data,
- const gchar *uid)
+ const gchar *uid)
{
return g_strcmp0 (data->uid, uid);
}
void
-assert_contacts_order_slist (GSList *results,
- GSList *uids)
+assert_contacts_order_slist (GSList *results,
+ GSList *uids)
{
gint position = -1;
GSList *link, *l;
@@ -369,7 +377,7 @@ assert_contacts_order_slist (GSList *results,
const gchar *uid = l->data;
gint new_position;
- link = g_slist_find_custom (results, uid, (GCompareFunc)find_contact_data);
+ link = g_slist_find_custom (results, uid, (GCompareFunc) find_contact_data);
if (!link)
g_error ("Specified uid '%s' was not found in results", uid);
@@ -381,9 +389,9 @@ assert_contacts_order_slist (GSList *results,
}
void
-assert_contacts_order (GSList *results,
- const gchar *first_uid,
- ...)
+assert_contacts_order (GSList *results,
+ const gchar *first_uid,
+ ...)
{
GSList *uids = NULL;
gchar *uid;
@@ -391,13 +399,13 @@ assert_contacts_order (GSList *results,
g_assert (first_uid);
- uids = g_slist_append (uids, (gpointer)first_uid);
+ uids = g_slist_append (uids, (gpointer) first_uid);
va_start (args, first_uid);
- uid = va_arg (args, gchar*);
+ uid = va_arg (args, gchar *);
while (uid) {
uids = g_slist_append (uids, uid);
- uid = va_arg (args, gchar*);
+ uid = va_arg (args, gchar *);
}
va_end (args);
@@ -406,7 +414,7 @@ assert_contacts_order (GSList *results,
}
void
-print_results (GSList *results)
+print_results (GSList *results)
{
GSList *l;
@@ -431,9 +439,9 @@ print_results (GSList *results)
static StepData *
step_test_new_internal (const gchar *test_path,
- const gchar *locale,
- gboolean store_vcards,
- gboolean empty_book)
+ const gchar *locale,
+ gboolean store_vcards,
+ gboolean empty_book)
{
StepData *data;
@@ -457,7 +465,7 @@ step_test_free (StepData *data)
GList *l;
g_free (data->path);
- g_free ((gchar *)data->parent.locale);
+ g_free ((gchar *) data->parent.locale);
for (l = data->assertions; l; l = l->next) {
StepAssertion *assertion = l->data;
@@ -471,10 +479,10 @@ step_test_free (StepData *data)
StepData *
step_test_new (const gchar *test_prefix,
- const gchar *test_path,
- const gchar *locale,
- gboolean store_vcards,
- gboolean empty_book)
+ const gchar *test_path,
+ const gchar *locale,
+ gboolean store_vcards,
+ gboolean empty_book)
{
StepData *data;
gchar *path;
@@ -487,12 +495,12 @@ step_test_new (const gchar *test_prefix,
}
StepData *
-step_test_new_full (const gchar *test_prefix,
- const gchar *test_path,
- const gchar *locale,
- gboolean store_vcards,
- gboolean empty_book,
- EBookCursorSortType sort_type)
+step_test_new_full (const gchar *test_prefix,
+ const gchar *test_path,
+ const gchar *locale,
+ gboolean store_vcards,
+ gboolean empty_book,
+ EBookCursorSortType sort_type)
{
StepData *data;
gchar *path;
@@ -507,9 +515,9 @@ step_test_new_full (const gchar *test_prefix,
static void
test_cursor_move_teardown (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
- StepData *data = (StepData *)user_data;
+ StepData *data = (StepData *) user_data;
e_sqlite_cursor_fixture_teardown (fixture, user_data);
step_test_free (data);
@@ -517,11 +525,11 @@ test_cursor_move_teardown (EbSqlCursorFixture *fixture,
static void
assert_step (EbSqlCursorFixture *fixture,
- StepData *data,
- StepAssertion *assertion,
- GSList *results,
- gint n_results,
- gboolean expect_results)
+ StepData *data,
+ StepAssertion *assertion,
+ GSList *results,
+ gint n_results,
+ gboolean expect_results)
{
GSList *uids = NULL;
gint i, expected = 0;
@@ -546,8 +554,9 @@ assert_step (EbSqlCursorFixture *fixture,
g_assert_cmpint (g_slist_length (results), ==, expected);
#if DEBUG_FIXTURE
- g_print ("%s: Constructing expected result list for a fetch of %d: ",
- data->path, assertion->count);
+ g_print (
+ "%s: Constructing expected result list for a fetch of %d: ",
+ data->path, assertion->count);
#endif
for (i = 0; i < ABS (assertion->count); i++) {
gint index = assertion->expected[i];
@@ -556,7 +565,7 @@ assert_step (EbSqlCursorFixture *fixture,
if (index < 0)
break;
- uid = (gchar *)e_contact_get_const (fixture->contacts[index], E_CONTACT_UID);
+ uid = (gchar *) e_contact_get_const (fixture->contacts[index], E_CONTACT_UID);
uids = g_slist_append (uids, uid);
#if DEBUG_FIXTURE
@@ -574,10 +583,10 @@ assert_step (EbSqlCursorFixture *fixture,
static void
test_step (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
- EbSqlFixture *base_fixture = (EbSqlFixture *)fixture;
- StepData *data = (StepData *)user_data;
+ EbSqlFixture *base_fixture = (EbSqlFixture *) fixture;
+ StepData *data = (StepData *) user_data;
GSList *results = NULL;
GError *error = NULL;
gint n_results;
@@ -603,8 +612,9 @@ test_step (EbSqlCursorFixture *fixture,
*/
if (e_phone_number_is_supported () &&
assertion->count != n_locale_changes)
- g_error ("Expected %d e164 numbers to change, %d actually changed.",
- assertion->count, n_locale_changes);
+ g_error (
+ "Expected %d e164 numbers to change, %d actually changed.",
+ assertion->count, n_locale_changes);
reset = TRUE;
continue;
@@ -613,47 +623,49 @@ test_step (EbSqlCursorFixture *fixture,
/* For the first call to e_book_sqlite_cursor_step(),
* or the first reset after locale change, set the origin accordingly.
*/
- if (reset) {
- if (assertion->count < 0)
- origin = EBSQL_CURSOR_ORIGIN_END;
- else
- origin = EBSQL_CURSOR_ORIGIN_BEGIN;
+ if (reset) {
+ if (assertion->count < 0)
+ origin = EBSQL_CURSOR_ORIGIN_END;
+ else
+ origin = EBSQL_CURSOR_ORIGIN_BEGIN;
reset = FALSE;
- } else
- origin = EBSQL_CURSOR_ORIGIN_CURRENT;
+ } else
+ origin = EBSQL_CURSOR_ORIGIN_CURRENT;
/* Try only fetching the contacts but not moving the cursor */
- n_results = e_book_sqlite_cursor_step (base_fixture->ebsql,
- fixture->cursor,
- EBSQL_CURSOR_STEP_FETCH,
- origin,
- assertion->count,
- &results,
- NULL, &error);
+ n_results = e_book_sqlite_cursor_step (
+ base_fixture->ebsql,
+ fixture->cursor,
+ EBSQL_CURSOR_STEP_FETCH,
+ origin,
+ assertion->count,
+ &results,
+ NULL, &error);
if (n_results < 0)
g_error ("Error fetching cursor results: %s", error->message);
print_results (results);
assert_step (fixture, data, assertion, results, n_results, TRUE);
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
results = NULL;
/* Do it again, this time only moving the cursor */
- n_results = e_book_sqlite_cursor_step (base_fixture->ebsql,
- fixture->cursor,
- EBSQL_CURSOR_STEP_MOVE,
- origin,
- assertion->count,
- &results,
- NULL, &error);
+ n_results = e_book_sqlite_cursor_step (
+ base_fixture->ebsql,
+ fixture->cursor,
+ EBSQL_CURSOR_STEP_MOVE,
+ origin,
+ assertion->count,
+ &results,
+ NULL, &error);
if (n_results < 0)
g_error ("Error fetching cursor results: %s", error->message);
print_results (results);
assert_step (fixture, data, assertion, results, n_results, FALSE);
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
results = NULL;
}
@@ -661,8 +673,8 @@ test_step (EbSqlCursorFixture *fixture,
static void
step_test_add_assertion_va_list (StepData *data,
- gint count,
- va_list args)
+ gint count,
+ va_list args)
{
StepAssertion *assertion = g_slice_new0 (StepAssertion);
gint expected, i;
@@ -697,8 +709,8 @@ step_test_add_assertion_va_list (StepData *data,
*/
void
step_test_add_assertion (StepData *data,
- gint count,
- ...)
+ gint count,
+ ...)
{
va_list args;
@@ -708,28 +720,29 @@ step_test_add_assertion (StepData *data,
}
void
-step_test_change_locale (StepData *data,
- const gchar *locale,
- gint expected_changes)
+step_test_change_locale (StepData *data,
+ const gchar *locale,
+ gint expected_changes)
{
StepAssertion *assertion = g_slice_new0 (StepAssertion);
assertion->locale = g_strdup (locale);
- assertion->count = expected_changes;
- data->assertions = g_list_append (data->assertions, assertion);
+ assertion->count = expected_changes;
+ data->assertions = g_list_append (data->assertions, assertion);
}
void
-step_test_add (StepData *data,
- gboolean filtered)
+step_test_add (StepData *data,
+ gboolean filtered)
{
data->filtered = filtered;
- g_test_add (data->path, EbSqlCursorFixture, data,
- filtered ?
- e_sqlite_cursor_fixture_filtered_setup :
- e_sqlite_cursor_fixture_setup,
- test_step,
- test_cursor_move_teardown);
+ g_test_add (
+ data->path, EbSqlCursorFixture, data,
+ filtered ?
+ e_sqlite_cursor_fixture_filtered_setup :
+ e_sqlite_cursor_fixture_setup,
+ test_step,
+ test_cursor_move_teardown);
}
diff --git a/tests/libedata-book/data-test-utils.h b/tests/libedata-book/data-test-utils.h
index 1da28fb..066d027 100644
--- a/tests/libedata-book/data-test-utils.h
+++ b/tests/libedata-book/data-test-utils.h
@@ -63,7 +63,6 @@
* http://demo.icu-project.org/icu-bin/locexp?_=en_US&d_=en&x=col
*/
-
/* 13 contacts in the test data have an email address ending with ".com" */
#define N_FILTERED_CONTACTS 13
#define N_SORTED_CONTACTS 20
@@ -143,8 +142,6 @@ void e_sqlite_cursor_fixture_filtered_setup (EbSqlCursorFixture *fixture,
gchar *new_vcard_from_test_case (const gchar *case_name);
EContact *new_contact_from_test_case (const gchar *case_name);
-
-
void add_contact_from_test_case (EbSqlFixture *fixture,
const gchar *case_name,
EContact **ret_contact);
diff --git a/tests/libedata-book/test-sqlite-create-cursor.c b/tests/libedata-book/test-sqlite-create-cursor.c
index 3549ea1..43cf854 100644
--- a/tests/libedata-book/test-sqlite-create-cursor.c
+++ b/tests/libedata-book/test-sqlite-create-cursor.c
@@ -9,24 +9,25 @@
static EbSqlClosure closure = { FALSE, NULL };
static void
-test_create_cursor_empty_query (EbSqlFixture *fixture,
- gconstpointer user_data)
+test_create_cursor_empty_query (EbSqlFixture *fixture,
+ gconstpointer user_data)
{
EbSqlCursor *cursor;
EContactField sort_fields[] = { E_CONTACT_FAMILY_NAME, E_CONTACT_GIVEN_NAME };
EBookCursorSortType sort_types[] = { E_BOOK_CURSOR_SORT_ASCENDING, E_BOOK_CURSOR_SORT_ASCENDING };
GError *error = NULL;
- cursor = e_book_sqlite_cursor_new (fixture->ebsql, NULL,
- sort_fields, sort_types, 2, &error);
+ cursor = e_book_sqlite_cursor_new (
+ fixture->ebsql, NULL,
+ sort_fields, sort_types, 2, &error);
g_assert (cursor != NULL);
e_book_sqlite_cursor_free (fixture->ebsql, cursor);
}
static void
-test_create_cursor_valid_query (EbSqlFixture *fixture,
- gconstpointer user_data)
+test_create_cursor_valid_query (EbSqlFixture *fixture,
+ gconstpointer user_data)
{
EbSqlCursor *cursor;
EContactField sort_fields[] = { E_CONTACT_FAMILY_NAME, E_CONTACT_GIVEN_NAME };
@@ -36,10 +37,11 @@ test_create_cursor_valid_query (EbSqlFixture *fixture,
GError *error = NULL;
query = e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_IS, "James Brown");
- sexp = e_book_query_to_string (query);
+ sexp = e_book_query_to_string (query);
- cursor = e_book_sqlite_cursor_new (fixture->ebsql, sexp,
- sort_fields, sort_types, 2, &error);
+ cursor = e_book_sqlite_cursor_new (
+ fixture->ebsql, sexp,
+ sort_fields, sort_types, 2, &error);
g_assert (cursor != NULL);
e_book_sqlite_cursor_free (fixture->ebsql, cursor);
@@ -48,16 +50,17 @@ test_create_cursor_valid_query (EbSqlFixture *fixture,
}
static void
-test_create_cursor_invalid_sort (EbSqlFixture *fixture,
- gconstpointer user_data)
+test_create_cursor_invalid_sort (EbSqlFixture *fixture,
+ gconstpointer user_data)
{
EbSqlCursor *cursor;
EContactField sort_fields[] = { E_CONTACT_TEL };
EBookCursorSortType sort_types[] = { E_BOOK_CURSOR_SORT_ASCENDING };
GError *error = NULL;
- cursor = e_book_sqlite_cursor_new (fixture->ebsql, NULL,
- sort_fields, sort_types, 1, &error);
+ cursor = e_book_sqlite_cursor_new (
+ fixture->ebsql, NULL,
+ sort_fields, sort_types, 1, &error);
g_assert (cursor == NULL);
g_assert (error);
@@ -65,8 +68,8 @@ test_create_cursor_invalid_sort (EbSqlFixture *fixture,
}
static void
-test_create_cursor_missing_sort (EbSqlFixture *fixture,
- gconstpointer user_data)
+test_create_cursor_missing_sort (EbSqlFixture *fixture,
+ gconstpointer user_data)
{
EbSqlCursor *cursor;
GError *error = NULL;
@@ -91,14 +94,18 @@ main (gint argc,
g_assert (g_setenv ("LC_ALL", "en_US.UTF-8", TRUE));
setlocale (LC_ALL, "");
- g_test_add ("/EbSqlCursor/Create/EmptyQuery", EbSqlFixture, &closure,
- e_sqlite_fixture_setup, test_create_cursor_empty_query, e_sqlite_fixture_teardown);
- g_test_add ("/EbSqlCursor/Create/ValidQuery", EbSqlFixture, &closure,
- e_sqlite_fixture_setup, test_create_cursor_valid_query, e_sqlite_fixture_teardown);
- g_test_add ("/EbSqlCursor/Create/InvalidSort", EbSqlFixture, &closure,
- e_sqlite_fixture_setup, test_create_cursor_invalid_sort, e_sqlite_fixture_teardown);
- g_test_add ("/EbSqlCursor/Create/MissingSort", EbSqlFixture, &closure,
- e_sqlite_fixture_setup, test_create_cursor_missing_sort, e_sqlite_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Create/EmptyQuery", EbSqlFixture, &closure,
+ e_sqlite_fixture_setup, test_create_cursor_empty_query, e_sqlite_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Create/ValidQuery", EbSqlFixture, &closure,
+ e_sqlite_fixture_setup, test_create_cursor_valid_query, e_sqlite_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Create/InvalidSort", EbSqlFixture, &closure,
+ e_sqlite_fixture_setup, test_create_cursor_invalid_sort, e_sqlite_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Create/MissingSort", EbSqlFixture, &closure,
+ e_sqlite_fixture_setup, test_create_cursor_missing_sort, e_sqlite_fixture_teardown);
return g_test_run ();
}
diff --git a/tests/libedata-book/test-sqlite-cursor-calculate.c
b/tests/libedata-book/test-sqlite-cursor-calculate.c
index 3766f56..ff991c3 100644
--- a/tests/libedata-book/test-sqlite-cursor-calculate.c
+++ b/tests/libedata-book/test-sqlite-cursor-calculate.c
@@ -6,19 +6,19 @@
#include "data-test-utils.h"
-static EbSqlCursorClosure ascending_closure = {
+static EbSqlCursorClosure ascending_closure = {
{ FALSE, NULL },
NULL, E_BOOK_CURSOR_SORT_ASCENDING
};
-static EbSqlCursorClosure descending_closure = {
+static EbSqlCursorClosure descending_closure = {
{ FALSE, NULL },
NULL, E_BOOK_CURSOR_SORT_DESCENDING
};
static void
test_cursor_calculate_initial (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GError *error = NULL;
gint position = 0, total = 0;
@@ -33,7 +33,7 @@ test_cursor_calculate_initial (EbSqlCursorFixture *fixture,
static void
test_cursor_calculate_move_forward (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GSList *results = NULL;
GError *error = NULL;
@@ -50,14 +50,15 @@ test_cursor_calculate_move_forward (EbSqlCursorFixture *fixture,
/* Assert the first 5 contacts in en_US order */
g_assert_cmpint (g_slist_length (results), ==, 5);
- assert_contacts_order (results,
- "sorted-11",
- "sorted-1",
- "sorted-2",
- "sorted-5",
- "sorted-6",
- NULL);
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ assert_contacts_order (
+ results,
+ "sorted-11",
+ "sorted-1",
+ "sorted-2",
+ "sorted-5",
+ "sorted-6",
+ NULL);
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
/* Check new position */
@@ -72,7 +73,7 @@ test_cursor_calculate_move_forward (EbSqlCursorFixture *fixture,
static void
test_cursor_calculate_move_backwards (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GSList *results = NULL;
GError *error = NULL;
@@ -89,14 +90,15 @@ test_cursor_calculate_move_backwards (EbSqlCursorFixture *fixture,
/* Assert the last 5 contacts in en_US order */
g_assert_cmpint (g_slist_length (results), ==, 5);
- assert_contacts_order (results,
- "sorted-20",
- "sorted-19",
- "sorted-9",
- "sorted-13",
- "sorted-12",
- NULL);
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ assert_contacts_order (
+ results,
+ "sorted-20",
+ "sorted-19",
+ "sorted-9",
+ "sorted-13",
+ "sorted-12",
+ NULL);
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
/* Check new position */
@@ -111,7 +113,7 @@ test_cursor_calculate_move_backwards (EbSqlCursorFixture *fixture,
static void
test_cursor_calculate_back_and_forth (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GSList *results = NULL;
GError *error = NULL;
@@ -119,15 +121,15 @@ test_cursor_calculate_back_and_forth (EbSqlCursorFixture *fixture,
/* Move cursor */
if (e_book_sqlite_cursor_step (((EbSqlFixture *) fixture)->ebsql,
- fixture->cursor,
+ fixture->cursor,
EBSQL_CURSOR_STEP_MOVE | EBSQL_CURSOR_STEP_FETCH,
EBSQL_CURSOR_ORIGIN_BEGIN,
7,
&results, NULL, &error) < 0)
g_error ("Error fetching cursor results: %s", error->message);
-
+
g_assert_cmpint (g_slist_length (results), ==, 7);
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
results = NULL;
@@ -150,7 +152,7 @@ test_cursor_calculate_back_and_forth (EbSqlCursorFixture *fixture,
g_error ("Error fetching cursor results: %s", error->message);
g_assert_cmpint (g_slist_length (results), ==, 4);
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
results = NULL;
@@ -173,7 +175,7 @@ test_cursor_calculate_back_and_forth (EbSqlCursorFixture *fixture,
g_error ("Error fetching cursor results: %s", error->message);
g_assert_cmpint (g_slist_length (results), ==, 5);
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
results = NULL;
@@ -189,7 +191,7 @@ test_cursor_calculate_back_and_forth (EbSqlCursorFixture *fixture,
static void
test_cursor_calculate_partial_target (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GError *error = NULL;
gint position = 0, total = 0;
@@ -204,8 +206,9 @@ test_cursor_calculate_partial_target (EbSqlCursorFixture *fixture,
e_collator_unref (collator);
/* Set the cursor at the start of family names beginning with 'C' */
- e_book_sqlite_cursor_set_target_alphabetic_index (((EbSqlFixture *) fixture)->ebsql,
- fixture->cursor, 3);
+ e_book_sqlite_cursor_set_target_alphabetic_index (
+ ((EbSqlFixture *) fixture)->ebsql,
+ fixture->cursor, 3);
/* Check new position */
if (!e_book_sqlite_cursor_calculate (((EbSqlFixture *) fixture)->ebsql,
@@ -219,7 +222,7 @@ test_cursor_calculate_partial_target (EbSqlCursorFixture *fixture,
static void
test_cursor_calculate_after_modification (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GError *error = NULL;
gint position = 0, total = 0;
@@ -271,7 +274,7 @@ test_cursor_calculate_after_modification (EbSqlCursorFixture *fixture,
static void
test_cursor_calculate_filtered_initial (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GError *error = NULL;
gint position = 0, total = 0;
@@ -286,7 +289,7 @@ test_cursor_calculate_filtered_initial (EbSqlCursorFixture *fixture,
static void
test_cursor_calculate_filtered_move_forward (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GSList *results = NULL;
GError *error = NULL;
@@ -301,7 +304,7 @@ test_cursor_calculate_filtered_move_forward (EbSqlCursorFixture *fixture,
g_error ("Error fetching cursor results: %s", error->message);
g_assert_cmpint (g_slist_length (results), ==, 5);
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
results = NULL;
@@ -317,7 +320,7 @@ test_cursor_calculate_filtered_move_forward (EbSqlCursorFixture *fixture,
static void
test_cursor_calculate_filtered_move_backwards (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GSList *results = NULL;
GError *error = NULL;
@@ -333,7 +336,7 @@ test_cursor_calculate_filtered_move_backwards (EbSqlCursorFixture *fixture,
g_error ("Error fetching cursor results: %s", error->message);
g_assert_cmpint (g_slist_length (results), ==, 5);
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
results = NULL;
@@ -349,7 +352,7 @@ test_cursor_calculate_filtered_move_backwards (EbSqlCursorFixture *fixture,
static void
test_cursor_calculate_filtered_partial_target (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GError *error = NULL;
gint position = 0, total = 0;
@@ -364,8 +367,9 @@ test_cursor_calculate_filtered_partial_target (EbSqlCursorFixture *fixture,
e_collator_unref (collator);
/* Set the cursor at the start of family names beginning with 'C' */
- e_book_sqlite_cursor_set_target_alphabetic_index (((EbSqlFixture *) fixture)->ebsql,
- fixture->cursor, 3);
+ e_book_sqlite_cursor_set_target_alphabetic_index (
+ ((EbSqlFixture *) fixture)->ebsql,
+ fixture->cursor, 3);
/* Check new position */
if (!e_book_sqlite_cursor_calculate (((EbSqlFixture *) fixture)->ebsql,
@@ -379,7 +383,7 @@ test_cursor_calculate_filtered_partial_target (EbSqlCursorFixture *fixture,
static void
test_cursor_calculate_filtered_after_modification (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GError *error = NULL;
gint position = 0, total = 0;
@@ -422,7 +426,7 @@ test_cursor_calculate_filtered_after_modification (EbSqlCursorFixture *fixture,
static void
test_cursor_calculate_descending_move_forward (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GSList *results = NULL;
GError *error = NULL;
@@ -439,14 +443,15 @@ test_cursor_calculate_descending_move_forward (EbSqlCursorFixture *fixture,
/* Assert the first 5 contacts in en_US order */
g_assert_cmpint (g_slist_length (results), ==, 5);
- assert_contacts_order (results,
- "sorted-20",
- "sorted-19",
- "sorted-9",
- "sorted-13",
- "sorted-12",
- NULL);
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ assert_contacts_order (
+ results,
+ "sorted-20",
+ "sorted-19",
+ "sorted-9",
+ "sorted-13",
+ "sorted-12",
+ NULL);
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
results = NULL;
@@ -462,7 +467,7 @@ test_cursor_calculate_descending_move_forward (EbSqlCursorFixture *fixture,
static void
test_cursor_calculate_descending_move_backwards (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GSList *results = NULL;
GError *error = NULL;
@@ -471,21 +476,22 @@ test_cursor_calculate_descending_move_backwards (EbSqlCursorFixture *fixture,
/* Move cursor */
if (e_book_sqlite_cursor_step (((EbSqlFixture *) fixture)->ebsql,
fixture->cursor,
- EBSQL_CURSOR_STEP_MOVE | EBSQL_CURSOR_STEP_FETCH,
+ EBSQL_CURSOR_STEP_MOVE | EBSQL_CURSOR_STEP_FETCH,
EBSQL_CURSOR_ORIGIN_END,
-5, &results, NULL, &error) < 0)
g_error ("Error fetching cursor results: %s", error->message);
/* Assert the last 5 contacts in en_US order */
g_assert_cmpint (g_slist_length (results), ==, 5);
- assert_contacts_order (results,
- "sorted-11",
- "sorted-1",
- "sorted-2",
- "sorted-5",
- "sorted-6",
- NULL);
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ assert_contacts_order (
+ results,
+ "sorted-11",
+ "sorted-1",
+ "sorted-2",
+ "sorted-5",
+ "sorted-6",
+ NULL);
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
results = NULL;
@@ -501,7 +507,7 @@ test_cursor_calculate_descending_move_backwards (EbSqlCursorFixture *fixture,
static void
test_cursor_calculate_descending_partial_target (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GError *error = NULL;
gint position = 0, total = 0;
@@ -516,8 +522,9 @@ test_cursor_calculate_descending_partial_target (EbSqlCursorFixture *fixture,
e_collator_unref (collator);
/* Set the cursor at the start of family names beginning with 'C' */
- e_book_sqlite_cursor_set_target_alphabetic_index (((EbSqlFixture *) fixture)->ebsql,
- fixture->cursor, 3);
+ e_book_sqlite_cursor_set_target_alphabetic_index (
+ ((EbSqlFixture *) fixture)->ebsql,
+ fixture->cursor, 3);
/* Check new position */
if (!e_book_sqlite_cursor_calculate (((EbSqlFixture *) fixture)->ebsql,
@@ -532,7 +539,7 @@ test_cursor_calculate_descending_partial_target (EbSqlCursorFixture *fixture,
static void
test_cursor_calculate_descending_after_modification (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GError *error = NULL;
gint position = 0, total = 0;
@@ -591,76 +598,93 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EbSqlCursor/Calculate/Initial", EbSqlCursorFixture, &ascending_closure,
- e_sqlite_cursor_fixture_setup,
- test_cursor_calculate_initial,
- e_sqlite_cursor_fixture_teardown);
- g_test_add ("/EbSqlCursor/Calculate/MoveForward", EbSqlCursorFixture, &ascending_closure,
- e_sqlite_cursor_fixture_setup,
- test_cursor_calculate_move_forward,
- e_sqlite_cursor_fixture_teardown);
- g_test_add ("/EbSqlCursor/Calculate/MoveBackwards", EbSqlCursorFixture, &ascending_closure,
- e_sqlite_cursor_fixture_setup,
- test_cursor_calculate_move_backwards,
- e_sqlite_cursor_fixture_teardown);
- g_test_add ("/EbSqlCursor/Calculate/BackAndForth", EbSqlCursorFixture, &ascending_closure,
- e_sqlite_cursor_fixture_setup,
- test_cursor_calculate_back_and_forth,
- e_sqlite_cursor_fixture_teardown);
- g_test_add ("/EbSqlCursor/Calculate/AlphabeticTarget", EbSqlCursorFixture, &ascending_closure,
- e_sqlite_cursor_fixture_setup,
- test_cursor_calculate_partial_target,
- e_sqlite_cursor_fixture_teardown);
- g_test_add ("/EbSqlCursor/Calculate/AfterModification", EbSqlCursorFixture, &ascending_closure,
- e_sqlite_cursor_fixture_setup,
- test_cursor_calculate_after_modification,
- e_sqlite_cursor_fixture_teardown);
-
- g_test_add ("/EbSqlCursor/Calculate/Filtered/Initial", EbSqlCursorFixture, &ascending_closure,
- e_sqlite_cursor_fixture_filtered_setup,
- test_cursor_calculate_filtered_initial,
- e_sqlite_cursor_fixture_teardown);
- g_test_add ("/EbSqlCursor/Calculate/Filtered/MoveForward", EbSqlCursorFixture, &ascending_closure,
- e_sqlite_cursor_fixture_filtered_setup,
- test_cursor_calculate_filtered_move_forward,
- e_sqlite_cursor_fixture_teardown);
- g_test_add ("/EbSqlCursor/Calculate/Filtered/MoveBackwards", EbSqlCursorFixture, &ascending_closure,
- e_sqlite_cursor_fixture_filtered_setup,
- test_cursor_calculate_filtered_move_backwards,
- e_sqlite_cursor_fixture_teardown);
- g_test_add ("/EbSqlCursor/Calculate/Filtered/AlphabeticTarget", EbSqlCursorFixture,
&ascending_closure,
- e_sqlite_cursor_fixture_filtered_setup,
- test_cursor_calculate_filtered_partial_target,
- e_sqlite_cursor_fixture_teardown);
- g_test_add ("/EbSqlCursor/Calculate/Filtered/AfterModification", EbSqlCursorFixture,
&ascending_closure,
- e_sqlite_cursor_fixture_filtered_setup,
- test_cursor_calculate_filtered_after_modification,
- e_sqlite_cursor_fixture_teardown);
-
- g_test_add ("/EbSqlCursor/Calculate/Descending/Initial", EbSqlCursorFixture, &descending_closure,
- e_sqlite_cursor_fixture_setup,
- test_cursor_calculate_initial,
- e_sqlite_cursor_fixture_teardown);
- g_test_add ("/EbSqlCursor/Calculate/Descending/MoveForward", EbSqlCursorFixture, &descending_closure,
- e_sqlite_cursor_fixture_setup,
- test_cursor_calculate_descending_move_forward,
- e_sqlite_cursor_fixture_teardown);
- g_test_add ("/EbSqlCursor/Calculate/Descending/MoveBackwards", EbSqlCursorFixture,
&descending_closure,
- e_sqlite_cursor_fixture_setup,
- test_cursor_calculate_descending_move_backwards,
- e_sqlite_cursor_fixture_teardown);
- g_test_add ("/EbSqlCursor/Calculate/Descending/BackAndForth", EbSqlCursorFixture, &descending_closure,
- e_sqlite_cursor_fixture_setup,
- test_cursor_calculate_back_and_forth,
- e_sqlite_cursor_fixture_teardown);
- g_test_add ("/EbSqlCursor/Calculate/Descending/AlphabeticTarget", EbSqlCursorFixture,
&descending_closure,
- e_sqlite_cursor_fixture_setup,
- test_cursor_calculate_descending_partial_target,
- e_sqlite_cursor_fixture_teardown);
- g_test_add ("/EbSqlCursor/Calculate/Descending/AfterModification", EbSqlCursorFixture,
&descending_closure,
- e_sqlite_cursor_fixture_setup,
- test_cursor_calculate_descending_after_modification,
- e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Calculate/Initial", EbSqlCursorFixture, &ascending_closure,
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_calculate_initial,
+ e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Calculate/MoveForward", EbSqlCursorFixture, &ascending_closure,
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_calculate_move_forward,
+ e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Calculate/MoveBackwards", EbSqlCursorFixture, &ascending_closure,
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_calculate_move_backwards,
+ e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Calculate/BackAndForth", EbSqlCursorFixture, &ascending_closure,
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_calculate_back_and_forth,
+ e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Calculate/AlphabeticTarget", EbSqlCursorFixture, &ascending_closure,
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_calculate_partial_target,
+ e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Calculate/AfterModification", EbSqlCursorFixture, &ascending_closure,
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_calculate_after_modification,
+ e_sqlite_cursor_fixture_teardown);
+
+ g_test_add (
+ "/EbSqlCursor/Calculate/Filtered/Initial", EbSqlCursorFixture, &ascending_closure,
+ e_sqlite_cursor_fixture_filtered_setup,
+ test_cursor_calculate_filtered_initial,
+ e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Calculate/Filtered/MoveForward", EbSqlCursorFixture, &ascending_closure,
+ e_sqlite_cursor_fixture_filtered_setup,
+ test_cursor_calculate_filtered_move_forward,
+ e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Calculate/Filtered/MoveBackwards", EbSqlCursorFixture, &ascending_closure,
+ e_sqlite_cursor_fixture_filtered_setup,
+ test_cursor_calculate_filtered_move_backwards,
+ e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Calculate/Filtered/AlphabeticTarget", EbSqlCursorFixture, &ascending_closure,
+ e_sqlite_cursor_fixture_filtered_setup,
+ test_cursor_calculate_filtered_partial_target,
+ e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Calculate/Filtered/AfterModification", EbSqlCursorFixture, &ascending_closure,
+ e_sqlite_cursor_fixture_filtered_setup,
+ test_cursor_calculate_filtered_after_modification,
+ e_sqlite_cursor_fixture_teardown);
+
+ g_test_add (
+ "/EbSqlCursor/Calculate/Descending/Initial", EbSqlCursorFixture, &descending_closure,
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_calculate_initial,
+ e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Calculate/Descending/MoveForward", EbSqlCursorFixture, &descending_closure,
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_calculate_descending_move_forward,
+ e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Calculate/Descending/MoveBackwards", EbSqlCursorFixture, &descending_closure,
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_calculate_descending_move_backwards,
+ e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Calculate/Descending/BackAndForth", EbSqlCursorFixture, &descending_closure,
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_calculate_back_and_forth,
+ e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Calculate/Descending/AlphabeticTarget", EbSqlCursorFixture, &descending_closure,
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_calculate_descending_partial_target,
+ e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/Calculate/Descending/AfterModification", EbSqlCursorFixture,
&descending_closure,
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_calculate_descending_after_modification,
+ e_sqlite_cursor_fixture_teardown);
return g_test_run ();
}
diff --git a/tests/libedata-book/test-sqlite-cursor-change-locale.c
b/tests/libedata-book/test-sqlite-cursor-change-locale.c
index 6f74609..c0034da 100644
--- a/tests/libedata-book/test-sqlite-cursor-change-locale.c
+++ b/tests/libedata-book/test-sqlite-cursor-change-locale.c
@@ -31,8 +31,9 @@ main (gint argc,
for (i = 0; i < G_N_ELEMENTS (params); i++) {
- data = step_test_new (params[i].path, "/ChangeLocale/POSIX/en_US", "POSIX",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/ChangeLocale/POSIX/en_US", "POSIX",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, 5, 11, 2, 6, 3, 8);
step_test_add_assertion (data, 5, 1, 5, 4, 7, 15);
step_test_add_assertion (data, 5, 17, 16, 18, 10, 14);
@@ -45,8 +46,9 @@ main (gint argc,
step_test_add_assertion (data, 5, 12, 13, 9, 19, 20);
step_test_add (data, FALSE);
- data = step_test_new (params[i].path, "/ChangeLocale/en_US/fr_CA", "en_US.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/ChangeLocale/en_US/fr_CA", "en_US.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, 5, 11, 1, 2, 5, 6);
step_test_add_assertion (data, 5, 4, 3, 7, 8, 15);
step_test_add_assertion (data, 5, 17, 16, 18, 10, 14);
@@ -59,8 +61,9 @@ main (gint argc,
step_test_add_assertion (data, 5, 13, 12, 9, 19, 20);
step_test_add (data, FALSE);
- data = step_test_new (params[i].path, "/ChangeLocale/fr_CA/de_DE", "fr_CA.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/ChangeLocale/fr_CA/de_DE", "fr_CA.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, 5, 11, 1, 2, 5, 6);
step_test_add_assertion (data, 5, 4, 3, 7, 8, 15);
step_test_add_assertion (data, 5, 17, 16, 18, 10, 14);
diff --git a/tests/libedata-book/test-sqlite-cursor-move-by-de-DE.c
b/tests/libedata-book/test-sqlite-cursor-move-by-de-DE.c
index 78a598b..a72310c 100644
--- a/tests/libedata-book/test-sqlite-cursor-move-by-de-DE.c
+++ b/tests/libedata-book/test-sqlite-cursor-move-by-de-DE.c
@@ -31,32 +31,37 @@ main (gint argc,
for (i = 0; i < G_N_ELEMENTS (params); i++) {
- data = step_test_new (params[i].path, "/de_DE/Move/Forward", "de_DE.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/de_DE/Move/Forward", "de_DE.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, 5, 11, 1, 2, 5, 6);
step_test_add_assertion (data, 6, 7, 8, 4, 3, 15, 17);
step_test_add (data, FALSE);
- data = step_test_new (params[i].path, "/de_DE/Move/ForwardOnNameless", "de_DE.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/de_DE/Move/ForwardOnNameless", "de_DE.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, 1, 11);
step_test_add_assertion (data, 3, 1, 2, 5);
step_test_add (data, FALSE);
- data = step_test_new (params[i].path, "/de_DE/Move/Backwards", "de_DE.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/de_DE/Move/Backwards", "de_DE.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, -5, 19, 20, 9, 13, 12);
step_test_add_assertion (data, -8, 14, 10, 18, 16, 17, 15, 3, 4);
step_test_add (data, FALSE);
- data = step_test_new (params[i].path, "/de_DE/Filtered/Move/Forward", "de_DE.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/de_DE/Filtered/Move/Forward", "de_DE.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, 5, 11, 1, 2, 5, 8);
step_test_add_assertion (data, 8, 3, 17, 16, 18, 10, 14, 12, 9);
step_test_add (data, TRUE);
- data = step_test_new (params[i].path, "/de_DE/Filtered/Move/Backwards", "de_DE.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/de_DE/Filtered/Move/Backwards", "de_DE.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, -5, 9, 12, 14, 10, 18);
step_test_add_assertion (data, -8, 16, 17, 3, 8, 5, 2, 1, 11);
step_test_add (data, TRUE);
diff --git a/tests/libedata-book/test-sqlite-cursor-move-by-en-US.c
b/tests/libedata-book/test-sqlite-cursor-move-by-en-US.c
index afec8ba..26044c5 100644
--- a/tests/libedata-book/test-sqlite-cursor-move-by-en-US.c
+++ b/tests/libedata-book/test-sqlite-cursor-move-by-en-US.c
@@ -31,48 +31,55 @@ main (gint argc,
for (i = 0; i < G_N_ELEMENTS (params); i++) {
- data = step_test_new (params[i].path, "/en_US/Move/Forward", "en_US.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/en_US/Move/Forward", "en_US.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, 5, 11, 1, 2, 5, 6);
step_test_add_assertion (data, 6, 4, 3, 7, 8, 15, 17);
step_test_add (data, FALSE);
- data = step_test_new (params[i].path, "/en_US/Move/ForwardOnNameless", "en_US.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/en_US/Move/ForwardOnNameless", "en_US.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, 1, 11);
step_test_add_assertion (data, 3, 1, 2, 5);
step_test_add (data, FALSE);
- data = step_test_new (params[i].path, "/en_US/Move/Backwards", "en_US.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/en_US/Move/Backwards", "en_US.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, -5, 20, 19, 9, 13, 12);
step_test_add_assertion (data, -8, 14, 10, 18, 16, 17, 15, 8, 7);
step_test_add (data, FALSE);
- data = step_test_new (params[i].path, "/en_US/Filtered/Move/Forward", "en_US.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/en_US/Filtered/Move/Forward", "en_US.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, 5, 11, 1, 2, 5, 3);
step_test_add_assertion (data, 8, 8, 17, 16, 18, 10, 14, 12, 9);
step_test_add (data, TRUE);
- data = step_test_new (params[i].path, "/en_US/Filtered/Move/Backwards", "en_US.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/en_US/Filtered/Move/Backwards", "en_US.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, -5, 9, 12, 14, 10, 18);
step_test_add_assertion (data, -8, 16, 17, 8, 3, 5, 2, 1, 11);
step_test_add (data, TRUE);
- data = step_test_new_full (params[i].path, "/en_US/Move/Descending/Forward", "en_US.UTF-8",
- params[i].store_vcards, params[i].empty_book,
- E_BOOK_CURSOR_SORT_DESCENDING);
+ data = step_test_new_full (
+ params[i].path, "/en_US/Move/Descending/Forward", "en_US.UTF-8",
+ params[i].store_vcards, params[i].empty_book,
+ E_BOOK_CURSOR_SORT_DESCENDING);
step_test_add_assertion (data, 5, 20, 19, 9, 13, 12);
step_test_add_assertion (data, 5, 14, 10, 18, 16, 17);
step_test_add_assertion (data, 5, 15, 8, 7, 3, 4);
step_test_add_assertion (data, 5, 6, 5, 2, 1, 11);
step_test_add (data, FALSE);
- data = step_test_new_full (params[i].path, "/en_US/Move/Descending/Backwards", "en_US.UTF-8",
- params[i].store_vcards, params[i].empty_book,
- E_BOOK_CURSOR_SORT_DESCENDING);
+ data = step_test_new_full (
+ params[i].path, "/en_US/Move/Descending/Backwards", "en_US.UTF-8",
+ params[i].store_vcards, params[i].empty_book,
+ E_BOOK_CURSOR_SORT_DESCENDING);
step_test_add_assertion (data, -10, 11, 1, 2, 5, 6, 4, 3, 7, 8, 15);
step_test_add_assertion (data, -10, 17, 16, 18, 10, 14, 12, 13, 9, 19, 20);
step_test_add (data, FALSE);
diff --git a/tests/libedata-book/test-sqlite-cursor-move-by-fr-CA.c
b/tests/libedata-book/test-sqlite-cursor-move-by-fr-CA.c
index 3bf20d2..2895839 100644
--- a/tests/libedata-book/test-sqlite-cursor-move-by-fr-CA.c
+++ b/tests/libedata-book/test-sqlite-cursor-move-by-fr-CA.c
@@ -29,35 +29,39 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
-
for (i = 0; i < G_N_ELEMENTS (params); i++) {
- data = step_test_new (params[i].path, "/fr_CA/Move/Forward", "fr_CA.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/fr_CA/Move/Forward", "fr_CA.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, 5, 11, 1, 2, 5, 6);
step_test_add_assertion (data, 6, 4, 3, 7, 8, 15, 17);
step_test_add (data, FALSE);
- data = step_test_new (params[i].path, "/fr_CA/Move/ForwardOnNameless", "fr_CA.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/fr_CA/Move/ForwardOnNameless", "fr_CA.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, 1, 11);
step_test_add_assertion (data, 3, 1, 2, 5);
step_test_add (data, FALSE);
- data = step_test_new (params[i].path, "/fr_CA/Move/Backwards", "fr_CA.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/fr_CA/Move/Backwards", "fr_CA.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, -5, 20, 19, 9, 12, 13);
step_test_add_assertion (data, -8, 14, 10, 18, 16, 17, 15, 8, 7);
step_test_add (data, FALSE);
- data = step_test_new (params[i].path, "/fr_CA/Filtered/Move/Forward", "fr_CA.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/fr_CA/Filtered/Move/Forward", "fr_CA.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, 5, 11, 1, 2, 5, 3);
step_test_add_assertion (data, 8, 8, 17, 16, 18, 10, 14, 12, 9);
step_test_add (data, TRUE);
- data = step_test_new (params[i].path, "/fr_CA/Filtered/Move/Backwards", "fr_CA.UTF-8",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/fr_CA/Filtered/Move/Backwards", "fr_CA.UTF-8",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, -5, 9, 12, 14, 10, 18);
step_test_add_assertion (data, -8, 16, 17, 8, 3, 5, 2, 1, 11);
step_test_add (data, TRUE);
diff --git a/tests/libedata-book/test-sqlite-cursor-move-by-posix.c
b/tests/libedata-book/test-sqlite-cursor-move-by-posix.c
index dc40d85..acce947 100644
--- a/tests/libedata-book/test-sqlite-cursor-move-by-posix.c
+++ b/tests/libedata-book/test-sqlite-cursor-move-by-posix.c
@@ -31,32 +31,37 @@ main (gint argc,
for (i = 0; i < G_N_ELEMENTS (params); i++) {
- data = step_test_new (params[i].path, "/POSIX/Move/Forward", "POSIX",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/POSIX/Move/Forward", "POSIX",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, 5, 11, 2, 6, 3, 8);
step_test_add_assertion (data, 6, 1, 5, 4, 7, 15, 17);
step_test_add (data, FALSE);
- data = step_test_new (params[i].path, "/POSIX/Move/ForwardOnNameless", "POSIX",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/POSIX/Move/ForwardOnNameless", "POSIX",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, 1, 11);
step_test_add_assertion (data, 3, 2, 6, 3);
step_test_add (data, FALSE);
- data = step_test_new (params[i].path, "/POSIX/Move/Backwards", "POSIX",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/POSIX/Move/Backwards", "POSIX",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, -5, 20, 19, 9, 13, 12);
step_test_add_assertion (data, -12, 14, 10, 18, 16, 17, 15, 7, 4, 5, 1, 8, 3);
step_test_add (data, FALSE);
- data = step_test_new (params[i].path, "/POSIX/Filtered/Move/Forward", "POSIX",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/POSIX/Filtered/Move/Forward", "POSIX",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, 5, 11, 2, 3, 8, 1);
step_test_add_assertion (data, 8, 5, 17, 16, 18, 10, 14, 12, 9);
step_test_add (data, TRUE);
- data = step_test_new (params[i].path, "/POSIX/Filtered/Move/Backwards", "POSIX",
- params[i].store_vcards, params[i].empty_book);
+ data = step_test_new (
+ params[i].path, "/POSIX/Filtered/Move/Backwards", "POSIX",
+ params[i].store_vcards, params[i].empty_book);
step_test_add_assertion (data, -5, 9, 12, 14, 10, 18);
step_test_add_assertion (data, -8, 16, 17, 5, 1, 8, 3, 2, 11);
step_test_add (data, TRUE);
diff --git a/tests/libedata-book/test-sqlite-cursor-set-sexp.c
b/tests/libedata-book/test-sqlite-cursor-set-sexp.c
index 739fa76..e23c91b 100644
--- a/tests/libedata-book/test-sqlite-cursor-set-sexp.c
+++ b/tests/libedata-book/test-sqlite-cursor-set-sexp.c
@@ -10,7 +10,7 @@ static EbSqlCursorClosure book_closure = { { FALSE, NULL }, NULL, E_BOOK_CURSOR_
static void
test_cursor_sexp_calculate_position (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GError *error = NULL;
EBookQuery *query;
@@ -32,7 +32,7 @@ test_cursor_sexp_calculate_position (EbSqlCursorFixture *fixture,
g_assert (node);
data = node->data;
g_assert_cmpstr (data->uid, ==, "sorted-16");
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
/* Check position */
@@ -65,7 +65,7 @@ test_cursor_sexp_calculate_position (EbSqlCursorFixture *fixture,
static void
test_cursor_sexp_and_step (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GError *error = NULL;
EBookQuery *query;
@@ -95,7 +95,7 @@ test_cursor_sexp_and_step (EbSqlCursorFixture *fixture,
g_assert (node);
data = node->data;
g_assert_cmpstr (data->uid, ==, "sorted-8");
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
results = NULL;
@@ -112,7 +112,7 @@ test_cursor_sexp_and_step (EbSqlCursorFixture *fixture,
g_assert (node);
data = node->data;
g_assert_cmpstr (data->uid, ==, "sorted-12");
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
}
@@ -125,15 +125,16 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EbSqlCursor/SetSexp/CalculatePosition", EbSqlCursorFixture, &book_closure,
- e_sqlite_cursor_fixture_setup,
- test_cursor_sexp_calculate_position,
- e_sqlite_cursor_fixture_teardown);
- g_test_add ("/EbSqlCursor/SetSexp/Step", EbSqlCursorFixture, &book_closure,
- e_sqlite_cursor_fixture_setup,
- test_cursor_sexp_and_step,
- e_sqlite_cursor_fixture_teardown);
-
+ g_test_add (
+ "/EbSqlCursor/SetSexp/CalculatePosition", EbSqlCursorFixture, &book_closure,
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_sexp_calculate_position,
+ e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ "/EbSqlCursor/SetSexp/Step", EbSqlCursorFixture, &book_closure,
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_sexp_and_step,
+ e_sqlite_cursor_fixture_teardown);
return g_test_run ();
}
diff --git a/tests/libedata-book/test-sqlite-cursor-set-target.c
b/tests/libedata-book/test-sqlite-cursor-set-target.c
index c2c5fbd..0cc48d0 100644
--- a/tests/libedata-book/test-sqlite-cursor-set-target.c
+++ b/tests/libedata-book/test-sqlite-cursor-set-target.c
@@ -11,7 +11,7 @@
*****************************************************/
static void
test_cursor_set_target_reset_cursor (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GSList *results = NULL;
GError *error = NULL;
@@ -28,15 +28,16 @@ test_cursor_set_target_reset_cursor (EbSqlCursorFixture *fixture,
/* Assert the first 5 contacts in en_US order */
g_assert_cmpint (g_slist_length (results), ==, 5);
- assert_contacts_order (results,
- "sorted-11",
- "sorted-1",
- "sorted-2",
- "sorted-5",
- "sorted-6",
- NULL);
-
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ assert_contacts_order (
+ results,
+ "sorted-11",
+ "sorted-1",
+ "sorted-2",
+ "sorted-5",
+ "sorted-6",
+ NULL);
+
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
results = NULL;
@@ -52,15 +53,16 @@ test_cursor_set_target_reset_cursor (EbSqlCursorFixture *fixture,
/* Assert the first 5 contacts in en_US order again */
g_assert_cmpint (g_slist_length (results), ==, 5);
- assert_contacts_order (results,
- "sorted-11",
- "sorted-1",
- "sorted-2",
- "sorted-5",
- "sorted-6",
- NULL);
-
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ assert_contacts_order (
+ results,
+ "sorted-11",
+ "sorted-1",
+ "sorted-2",
+ "sorted-5",
+ "sorted-6",
+ NULL);
+
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
}
@@ -69,7 +71,7 @@ test_cursor_set_target_reset_cursor (EbSqlCursorFixture *fixture,
*****************************************************/
static void
test_cursor_set_target_c_next_results (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GSList *results = NULL;
GError *error = NULL;
@@ -84,8 +86,9 @@ test_cursor_set_target_c_next_results (EbSqlCursorFixture *fixture,
e_collator_unref (collator);
/* Set the cursor at the start of family names beginning with 'C' */
- e_book_sqlite_cursor_set_target_alphabetic_index (((EbSqlFixture *) fixture)->ebsql,
- fixture->cursor, 3);
+ e_book_sqlite_cursor_set_target_alphabetic_index (
+ ((EbSqlFixture *) fixture)->ebsql,
+ fixture->cursor, 3);
if (e_book_sqlite_cursor_step (((EbSqlFixture *) fixture)->ebsql,
fixture->cursor,
@@ -98,15 +101,16 @@ test_cursor_set_target_c_next_results (EbSqlCursorFixture *fixture,
/* Assert that we got the results starting at C */
g_assert_cmpint (g_slist_length (results), ==, 5);
- assert_contacts_order (results,
- "sorted-10",
- "sorted-14",
- "sorted-12",
- "sorted-13",
- "sorted-9",
- NULL);
-
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ assert_contacts_order (
+ results,
+ "sorted-10",
+ "sorted-14",
+ "sorted-12",
+ "sorted-13",
+ "sorted-9",
+ NULL);
+
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
}
@@ -115,7 +119,7 @@ test_cursor_set_target_c_next_results (EbSqlCursorFixture *fixture,
*****************************************************/
static void
test_cursor_set_target_c_prev_results (EbSqlCursorFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
GSList *results = NULL;
GError *error = NULL;
@@ -130,11 +134,12 @@ test_cursor_set_target_c_prev_results (EbSqlCursorFixture *fixture,
e_collator_unref (collator);
/* Set the cursor at the start of family names beginning with 'C' */
- e_book_sqlite_cursor_set_target_alphabetic_index (((EbSqlFixture *) fixture)->ebsql,
- fixture->cursor, 3);
+ e_book_sqlite_cursor_set_target_alphabetic_index (
+ ((EbSqlFixture *) fixture)->ebsql,
+ fixture->cursor, 3);
if (e_book_sqlite_cursor_step (((EbSqlFixture *) fixture)->ebsql,
- fixture->cursor,
+ fixture->cursor,
EBSQL_CURSOR_STEP_MOVE | EBSQL_CURSOR_STEP_FETCH,
EBSQL_CURSOR_ORIGIN_CURRENT,
-5, &results, NULL, &error) < 0)
@@ -144,15 +149,16 @@ test_cursor_set_target_c_prev_results (EbSqlCursorFixture *fixture,
/* Assert that we got the results before C */
g_assert_cmpint (g_slist_length (results), ==, 5);
- assert_contacts_order (results,
- "sorted-18",
- "sorted-16",
- "sorted-17",
- "sorted-15",
- "sorted-8",
- NULL);
-
- g_slist_foreach (results, (GFunc)e_book_sqlite_search_data_free, NULL);
+ assert_contacts_order (
+ results,
+ "sorted-18",
+ "sorted-16",
+ "sorted-17",
+ "sorted-15",
+ "sorted-8",
+ NULL);
+
+ g_slist_foreach (results, (GFunc) e_book_sqlite_search_data_free, NULL);
g_slist_free (results);
}
@@ -185,24 +191,27 @@ main (gint argc,
gchar *path;
path = g_strconcat (prefixes[i], "/SetTarget/ResetCursor", NULL);
- g_test_add (path, EbSqlCursorFixture, &closures[i],
- e_sqlite_cursor_fixture_setup,
- test_cursor_set_target_reset_cursor,
- e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ path, EbSqlCursorFixture, &closures[i],
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_set_target_reset_cursor,
+ e_sqlite_cursor_fixture_teardown);
g_free (path);
path = g_strconcat (prefixes[i], "/SetTarget/Alphabetic/C/NextResults", NULL);
- g_test_add (path, EbSqlCursorFixture, &closures[i],
- e_sqlite_cursor_fixture_setup,
- test_cursor_set_target_c_next_results,
- e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ path, EbSqlCursorFixture, &closures[i],
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_set_target_c_next_results,
+ e_sqlite_cursor_fixture_teardown);
g_free (path);
path = g_strconcat (prefixes[i], "/SetTarget/Alphabetic/C/PreviousResults", NULL);
- g_test_add (path, EbSqlCursorFixture, &closures[i],
- e_sqlite_cursor_fixture_setup,
- test_cursor_set_target_c_prev_results,
- e_sqlite_cursor_fixture_teardown);
+ g_test_add (
+ path, EbSqlCursorFixture, &closures[i],
+ e_sqlite_cursor_fixture_setup,
+ test_cursor_set_target_c_prev_results,
+ e_sqlite_cursor_fixture_teardown);
g_free (path);
}
diff --git a/tests/libedata-book/test-sqlite-get-contact.c b/tests/libedata-book/test-sqlite-get-contact.c
index 4a73f00..8cc7e44 100644
--- a/tests/libedata-book/test-sqlite-get-contact.c
+++ b/tests/libedata-book/test-sqlite-get-contact.c
@@ -7,8 +7,8 @@
#include "data-test-utils.h"
static void
-test_get_contact (EbSqlFixture *fixture,
- gconstpointer user_data)
+test_get_contact (EbSqlFixture *fixture,
+ gconstpointer user_data)
{
EContact *contact = NULL;
EContact *other = NULL;
@@ -17,13 +17,14 @@ test_get_contact (EbSqlFixture *fixture,
add_contact_from_test_case (fixture, "simple-1", &contact);
if (!e_book_sqlite_get_contact (fixture->ebsql,
- (const gchar *)e_contact_get_const (contact, E_CONTACT_UID),
- FALSE,
+ (const gchar *) e_contact_get_const (contact, E_CONTACT_UID),
+ FALSE,
&other,
&error))
- g_error ("Failed to get contact with uid '%s': %s",
- (const gchar *)e_contact_get_const (contact, E_CONTACT_UID),
- error->message);
+ g_error (
+ "Failed to get contact with uid '%s': %s",
+ (const gchar *) e_contact_get_const (contact, E_CONTACT_UID),
+ error->message);
g_object_unref (contact);
g_object_unref (other);
@@ -59,8 +60,9 @@ main (gint argc,
setlocale (LC_ALL, "");
for (i = 0; i < G_N_ELEMENTS (closures); i++)
- g_test_add (paths[i], EbSqlFixture, &closures[i],
- e_sqlite_fixture_setup, test_get_contact, e_sqlite_fixture_teardown);
+ g_test_add (
+ paths[i], EbSqlFixture, &closures[i],
+ e_sqlite_fixture_setup, test_get_contact, e_sqlite_fixture_teardown);
return g_test_run ();
}
diff --git a/tests/libedataserver/e-collator-test.c b/tests/libedataserver/e-collator-test.c
index 70e931e..477d375 100644
--- a/tests/libedataserver/e-collator-test.c
+++ b/tests/libedataserver/e-collator-test.c
@@ -1,7 +1,6 @@
#include <libedataserver/libedataserver.h>
#include <locale.h>
-
typedef struct {
ECollator *collator;
@@ -9,7 +8,7 @@ typedef struct {
static void
print_locale (CollatorFixture *fixture,
- const gchar *locale)
+ const gchar *locale)
{
const gchar *const *labels;
gint n_labels, i;
@@ -41,9 +40,9 @@ print_locale (CollatorFixture *fixture,
static void
collator_test_setup (CollatorFixture *fixture,
- gconstpointer data)
+ gconstpointer data)
{
- const gchar *locale = (const gchar *)data;
+ const gchar *locale = (const gchar *) data;
GError *error = NULL;
fixture->collator = e_collator_new (locale, &error);
@@ -57,14 +56,14 @@ collator_test_setup (CollatorFixture *fixture,
static void
collator_test_teardown (CollatorFixture *fixture,
- gconstpointer data)
+ gconstpointer data)
{
e_collator_unref (fixture->collator);
}
static void
test_en_US (CollatorFixture *fixture,
- gconstpointer data)
+ gconstpointer data)
{
gint n_labels, underflow, inflow, overflow;
@@ -91,7 +90,7 @@ test_en_US (CollatorFixture *fixture,
static void
test_el_GR (CollatorFixture *fixture,
- gconstpointer data)
+ gconstpointer data)
{
gint n_labels, underflow, inflow, overflow;
@@ -121,7 +120,7 @@ test_el_GR (CollatorFixture *fixture,
static void
test_ru_RU (CollatorFixture *fixture,
- gconstpointer data)
+ gconstpointer data)
{
gint n_labels, underflow, inflow, overflow;
const gchar *const *labels;
@@ -146,7 +145,7 @@ test_ru_RU (CollatorFixture *fixture,
static void
test_ja_JP (CollatorFixture *fixture,
- gconstpointer data)
+ gconstpointer data)
{
gint n_labels, underflow, inflow, overflow;
const gchar *const *labels;
@@ -171,7 +170,7 @@ test_ja_JP (CollatorFixture *fixture,
static void
test_zh_CN (CollatorFixture *fixture,
- gconstpointer data)
+ gconstpointer data)
{
gint n_labels, underflow, inflow, overflow;
const gchar *const *labels;
@@ -200,7 +199,7 @@ test_zh_CN (CollatorFixture *fixture,
static void
test_ko_KR (CollatorFixture *fixture,
- gconstpointer data)
+ gconstpointer data)
{
gint n_labels, underflow, inflow, overflow;
const gchar *const *labels;
@@ -225,7 +224,7 @@ test_ko_KR (CollatorFixture *fixture,
static void
test_ar_TN (CollatorFixture *fixture,
- gconstpointer data)
+ gconstpointer data)
{
gint n_labels, underflow, inflow, overflow;
const gchar *const *labels;
diff --git a/tests/test-server-utils/e-test-server-utils.c b/tests/test-server-utils/e-test-server-utils.c
index 7ef27b6..8faa08e 100644
--- a/tests/test-server-utils/e-test-server-utils.c
+++ b/tests/test-server-utils/e-test-server-utils.c
@@ -80,7 +80,7 @@ static gint global_test_source_id = 0;
*/
static void
add_weak_ref (ETestServerFixture *fixture,
- ETestServiceType service_type)
+ ETestServiceType service_type)
{
GObject *object;
@@ -105,7 +105,7 @@ add_weak_ref (ETestServerFixture *fixture,
static gboolean
object_finalize_timeout (gpointer user_data)
{
- const gchar *message = (const gchar *)user_data;
+ const gchar *message = (const gchar *) user_data;
g_error ("%s", message);
@@ -122,7 +122,7 @@ object_unref_idle (gpointer user_data)
static void
weak_notify_loop_quit (gpointer data,
- GObject *where_the_object_was)
+ GObject *where_the_object_was)
{
ETestServerFixture *fixture = (ETestServerFixture *) data;
@@ -131,7 +131,7 @@ weak_notify_loop_quit (gpointer data,
static void
assert_object_finalized (ETestServerFixture *fixture,
- ETestServiceType service_type)
+ ETestServiceType service_type)
{
const gchar *message = NULL;
GObject *object = NULL;
@@ -164,9 +164,10 @@ assert_object_finalized (ETestServerFixture *fixture,
g_object_weak_ref (object, weak_notify_loop_quit, fixture);
/* Fail the test if we reach the timeout */
- timeout_id = g_timeout_add_seconds (FINALIZE_SECONDS,
- object_finalize_timeout,
- (gpointer)message);
+ timeout_id = g_timeout_add_seconds (
+ FINALIZE_SECONDS,
+ object_finalize_timeout,
+ (gpointer) message);
/* We can't release the strong reference yet, it might try
* to quit the main loop before we've started it.
@@ -216,7 +217,7 @@ generate_source_name (void)
{
gchar *source_name = NULL;
- if (test_installed_services()) {
+ if (test_installed_services ()) {
gchar buffer[128] = "eds-source-XXXXXX";
gint fd;
@@ -228,9 +229,10 @@ generate_source_name (void)
source_name = g_strdup (buffer);
} else {
- source_name = g_strdup_printf ("%s-%d",
- ADDRESS_BOOK_SOURCE_UID,
- global_test_source_id++);
+ source_name = g_strdup_printf (
+ "%s-%d",
+ ADDRESS_BOOK_SOURCE_UID,
+ global_test_source_id++);
}
return source_name;
@@ -532,10 +534,10 @@ e_test_server_utils_setup (ETestServerFixture *fixture,
gconstpointer user_data)
{
ETestServerClosure *closure = (ETestServerClosure *) user_data;
- FixturePair pair = { fixture, closure };
+ FixturePair pair = { fixture, closure };
/* Create work directory */
- if (!test_installed_services())
+ if (!test_installed_services ())
g_assert (g_mkdir_with_parents (EDS_TEST_WORK_DIR, 0755) == 0);
/* Init refs */
@@ -655,7 +657,6 @@ e_test_server_utils_teardown (ETestServerFixture *fixture,
g_weak_ref_clear (&fixture->registry_ref);
g_weak_ref_clear (&fixture->client_ref);
-
if (!test_installed_services ()) {
#if !GLOBAL_DBUS_DAEMON
/* Teardown the D-Bus Daemon
@@ -702,7 +703,7 @@ e_test_server_utils_run_full (ETestServerFlags flags)
gint tests_ret;
/* Cleanup work directory */
- if (!test_installed_services()) {
+ if (!test_installed_services ()) {
if ((flags & E_TEST_SERVER_KEEP_WORK_DIRECTORY) == 0)
delete_work_directory ();
diff --git a/tests/test-server-utils/test-fixture.c b/tests/test-server-utils/test-fixture.c
index 022e73d..759177b 100644
--- a/tests/test-server-utils/test-fixture.c
+++ b/tests/test-server-utils/test-fixture.c
@@ -25,9 +25,9 @@
#define N_CYCLES 10
static ETestServerClosure registry_closure = { E_TEST_SERVER_NONE, NULL, 0 };
-static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
static ETestServerClosure calendar_closure = { E_TEST_SERVER_CALENDAR, NULL, E_CAL_CLIENT_SOURCE_TYPE_EVENTS
};
-static ETestServerClosure deprecated_book_closure = { E_TEST_SERVER_DEPRECATED_ADDRESS_BOOK, NULL, 0 };
+static ETestServerClosure deprecated_book_closure = { E_TEST_SERVER_DEPRECATED_ADDRESS_BOOK, NULL, 0 };
static ETestServerClosure deprecated_calendar_closure = { E_TEST_SERVER_DEPRECATED_CALENDAR, NULL,
E_CAL_SOURCE_TYPE_EVENT };
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
![http://en.wikipedia.org/wiki/File:Jamesbrown4.jpg"](http://en.wikipedia.org/wiki/File:Jamesbrown4.jpg"){kind=link}