[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: Sat, 12 Jan 2013 19:14:47 +0000 (UTC)
commit 69d5f406435fef06a3b8a13536562743f74250da
Author: Matthew Barnes <mbarnes redhat com>
Date: Sat Jan 12 10:54:47 2013 -0500
Coding style and whitespace cleanups.
addressbook/backends/file/e-book-backend-file.c | 16 +-
addressbook/backends/ldap/e-source-ldap.c | 2 +-
.../backends/webdav/e-book-backend-webdav.c | 23 +-
addressbook/libebook/e-book-query.c | 6 +-
addressbook/libebook/e-contact.c | 106 +++---
.../libebook/e-source-backend-summary-setup.c | 182 +++++-----
.../libedata-book/e-book-backend-sqlitedb.c | 405 +++++++++++---------
addressbook/libedata-book/e-data-book-factory.h | 1 -
calendar/backends/caldav/e-cal-backend-caldav.c | 37 +-
.../backends/contacts/e-cal-backend-contacts.c | 2 +-
calendar/backends/contacts/e-source-contacts.c | 2 +-
calendar/backends/http/e-cal-backend-http.c | 3 +-
camel/camel-db.c | 2 +-
camel/camel-filter-driver.c | 6 +-
camel/camel-imapx-utils.h | 12 +-
camel/camel-session.c | 12 +-
camel/providers/sendmail/camel-sendmail-settings.c | 4 +-
libebackend/e-backend.c | 85 +++--
libebackend/e-server-side-source.c | 2 +-
libebackend/e-user-prompter-server-extension.c | 12 +-
libebackend/e-user-prompter-server-extension.h | 34 +-
libebackend/e-user-prompter-server.c | 70 ++--
libebackend/e-user-prompter-server.h | 18 +-
libebackend/e-user-prompter.c | 127 ++++---
libebackend/e-user-prompter.h | 83 ++--
libedataserver/e-cancellable-locks.c | 18 +-
libedataserver/e-cancellable-locks.h | 2 +-
libedataserver/e-client.c | 4 +-
libedataserver/e-data-server-util.c | 45 ++-
libedataserver/e-source-mail-submission.c | 5 +-
libedataserver/e-source-registry.c | 2 +-
libedataserver/e-source-webdav.c | 221 +++++++-----
modules/trust-prompt/certificate-viewer.c | 73 ++--
modules/trust-prompt/e-asn1-object.c | 29 +-
modules/trust-prompt/module-trust-prompt.c | 52 ++--
modules/trust-prompt/trust-prompt-gtk.c | 41 ++-
modules/trust-prompt/trust-prompt.h | 6 +-
.../evolution-source-registry-migrate-sources.c | 9 +-
.../evolution-source-registry.c | 6 +-
.../evolution-user-prompter.c | 4 +-
services/evolution-user-prompter/prompt-user-gtk.c | 66 ++--
services/evolution-user-prompter/prompt-user.h | 2 +-
tests/libebook/client/test-client-add-contact.c | 17 +-
tests/libebook/client/test-client-async.c | 27 +-
tests/libebook/client/test-client-custom-summary.c | 126 ++++---
.../libebook/client/test-client-get-contact-uids.c | 21 +-
tests/libebook/client/test-client-get-contact.c | 27 +-
tests/libebook/client/test-client-get-revision.c | 7 +-
tests/libebook/client/test-client-get-view.c | 22 +-
tests/libebook/client/test-client-modify-contact.c | 27 +-
tests/libebook/client/test-client-photo-is-uri.c | 7 +-
tests/libebook/client/test-client-refresh.c | 20 +-
.../client/test-client-remove-contact-by-uid.c | 16 +-
tests/libebook/client/test-client-remove-contact.c | 17 +-
.../libebook/client/test-client-remove-contacts.c | 16 +-
tests/libebook/client/test-client-revision-view.c | 24 +-
.../client/test-client-suppress-notifications.c | 24 +-
tests/libebook/client/test-client-uid-only-view.c | 41 +-
tests/libebook/client/test-client.c | 8 +-
tests/libebook/test-ebook-add-contact.c | 14 +-
tests/libebook/test-ebook-commit-contact.c | 15 +-
tests/libebook/test-ebook-get-book-view.c | 20 +-
tests/libebook/test-ebook-get-contact.c | 15 +-
tests/libebook/test-ebook-get-required-fields.c | 15 +-
.../libebook/test-ebook-get-static-capabilities.c | 7 +-
.../test-ebook-get-supported-auth-methods.c | 17 +-
tests/libebook/test-ebook-get-supported-fields.c | 14 +-
tests/libebook/test-ebook-remove-contact-by-id.c | 7 +-
tests/libebook/test-ebook-remove-contact.c | 14 +-
tests/libebook/test-ebook-remove-contacts.c | 14 +-
tests/libecal/client/test-client-add-timezone.c | 16 +-
tests/libecal/client/test-client-bulk-methods.c | 27 +-
tests/libecal/client/test-client-create-object.c | 32 +-
.../client/test-client-get-attachment-uris.c | 16 +-
tests/libecal/client/test-client-get-free-busy.c | 16 +-
tests/libecal/client/test-client-get-object-list.c | 22 +-
tests/libecal/client/test-client-get-revision.c | 7 +-
tests/libecal/client/test-client-get-view.c | 28 +-
tests/libecal/client/test-client-modify-object.c | 16 +-
tests/libecal/client/test-client-receive-objects.c | 16 +-
tests/libecal/client/test-client-refresh.c | 17 +-
tests/libecal/client/test-client-remove-object.c | 16 +-
tests/libecal/client/test-client-revision-view.c | 28 +-
tests/libecal/client/test-client-send-objects.c | 16 +-
tests/libecal/test-ecal-add-timezone.c | 7 +-
tests/libecal/test-ecal-create-object--2.c | 7 +-
tests/libecal/test-ecal-create-object.c | 7 +-
tests/libecal/test-ecal-get-alarm-email-address.c | 7 +-
tests/libecal/test-ecal-get-cal-address.c | 7 +-
tests/libecal/test-ecal-get-capabilities.c | 7 +-
tests/libecal/test-ecal-get-default-object.c | 7 +-
tests/libecal/test-ecal-get-free-busy.c | 8 +-
tests/libecal/test-ecal-get-ldap-attribute.c | 7 +-
tests/libecal/test-ecal-get-object-list.c | 8 +-
tests/libecal/test-ecal-get-objects-for-uid.c | 7 +-
tests/libecal/test-ecal-get-query.c | 10 +-
tests/libecal/test-ecal-get-timezone.c | 7 +-
tests/libecal/test-ecal-modify-object.c | 7 +-
tests/libecal/test-ecal-receive-objects.c | 7 +-
tests/libecal/test-ecal-remove-object.c | 7 +-
tests/libecal/test-ecal-send-objects.c | 7 +-
tests/libecal/test-ecal-set-default-timezone.c | 7 +-
tests/libecal/test-ecal-set-mode.c | 7 +-
tests/libedataserver/e-user-prompter-test.c | 40 +-
tests/test-server-utils/e-test-server-utils.c | 26 +-
tests/test-server-utils/e-test-server-utils.h | 5 +-
tests/test-server-utils/test-fixture.c | 50 ++--
107 files changed, 1619 insertions(+), 1349 deletions(-)
---
diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index d40d52d..c62ecaf 100644
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -1260,12 +1260,12 @@ e_book_backend_file_open (EBookBackendSync *backend,
g_type_ensure (E_TYPE_SOURCE_BACKEND_SUMMARY_SETUP);
setup = e_source_get_extension (source, E_SOURCE_EXTENSION_BACKEND_SUMMARY_SETUP);
-
+
/* The old BDB exists, lets migrate that to sqlite right away
*/
if (g_file_test (filename, G_FILE_TEST_EXISTS)) {
bf->priv->sqlitedb = e_book_backend_sqlitedb_new_full (
- dirname,
+ dirname,
SQLITEDB_EMAIL_ID,
SQLITEDB_FOLDER_ID,
SQLITEDB_FOLDER_NAME,
@@ -1293,7 +1293,7 @@ e_book_backend_file_open (EBookBackendSync *backend,
g_free (dirname);
g_free (filename);
g_free (backup);
-
+
g_object_unref (bf->priv->sqlitedb);
bf->priv->sqlitedb = NULL;
return;
@@ -1334,12 +1334,12 @@ e_book_backend_file_open (EBookBackendSync *backend,
g_free (dirname);
g_free (filename);
g_free (backup);
- return;
- }
+ return;
+ }
/* Create the sqlitedb */
bf->priv->sqlitedb = e_book_backend_sqlitedb_new_full (
- dirname,
+ dirname,
SQLITEDB_EMAIL_ID,
SQLITEDB_FOLDER_ID,
SQLITEDB_FOLDER_NAME,
@@ -1352,8 +1352,8 @@ e_book_backend_file_open (EBookBackendSync *backend,
g_free (dirname);
g_free (filename);
g_free (backup);
- return;
- }
+ return;
+ }
/* An sqlite DB only 'exists' if the populated flag is set */
populated = e_book_backend_sqlitedb_get_is_populated (
diff --git a/addressbook/backends/ldap/e-source-ldap.c b/addressbook/backends/ldap/e-source-ldap.c
index 42d8a08..854552f 100644
--- a/addressbook/backends/ldap/e-source-ldap.c
+++ b/addressbook/backends/ldap/e-source-ldap.c
@@ -485,7 +485,7 @@ e_source_ldap_set_can_browse (ESourceLDAP *extension,
{
g_return_if_fail (E_IS_SOURCE_LDAP (extension));
- if ((extension->priv->can_browse ? 1 : 0) == (can_browse ? 1 : 0))
+ if (extension->priv->can_browse == can_browse)
return;
extension->priv->can_browse = can_browse;
diff --git a/addressbook/backends/webdav/e-book-backend-webdav.c b/addressbook/backends/webdav/e-book-backend-webdav.c
index ef3c2bb..69bcea8 100644
--- a/addressbook/backends/webdav/e-book-backend-webdav.c
+++ b/addressbook/backends/webdav/e-book-backend-webdav.c
@@ -143,8 +143,8 @@ get_closure (EDataBookView *book_view)
static guint
send_and_handle_ssl (EBookBackendWebdav *webdav,
- SoupMessage *message,
- GCancellable *cancellable)
+ SoupMessage *message,
+ GCancellable *cancellable)
{
guint status_code;
@@ -186,7 +186,7 @@ send_and_handle_ssl (EBookBackendWebdav *webdav,
static EContact *
download_contact (EBookBackendWebdav *webdav,
const gchar *uri,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
SoupMessage *message;
const gchar *etag;
@@ -238,7 +238,7 @@ static guint
upload_contact (EBookBackendWebdav *webdav,
EContact *contact,
gchar **reason,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
ESource *source;
ESourceWebdav *webdav_extension;
@@ -448,7 +448,7 @@ e_book_backend_webdav_create_contacts (EBookBackend *backend,
static guint
delete_contact (EBookBackendWebdav *webdav,
const gchar *uri,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
SoupMessage *message;
guint status;
@@ -789,7 +789,7 @@ parse_propfind_response (xmlTextReaderPtr reader)
static SoupMessage *
send_propfind (EBookBackendWebdav *webdav,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
SoupMessage *message;
EBookBackendWebdavPrivate *priv = webdav->priv;
@@ -882,7 +882,7 @@ xp_object_get_status (xmlXPathObjectPtr result)
static gboolean
check_addressbook_changed (EBookBackendWebdav *webdav,
gchar **new_ctag,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
gboolean res = TRUE;
const gchar *request = "<?xml version=\"1.0\" encoding=\"utf-8\"?><propfind xmlns=\"DAV:\"><prop><getctag/></prop></propfind>";
@@ -963,8 +963,8 @@ check_addressbook_changed (EBookBackendWebdav *webdav,
static GError *
download_contacts (EBookBackendWebdav *webdav,
EFlag *running,
- EDataBookView *book_view,
- GCancellable *cancellable)
+ EDataBookView *book_view,
+ GCancellable *cancellable)
{
EBookBackendWebdavPrivate *priv = webdav->priv;
EBookBackend *book_backend;
@@ -1406,7 +1406,7 @@ e_book_backend_webdav_open (EBookBackend *backend,
g_mutex_lock (&priv->cache_lock);
/* make sure the priv->uri ends with a forward slash */
- if (priv->uri[strlen(priv->uri) - 1] != '/') {
+ if (priv->uri[strlen (priv->uri) - 1] != '/') {
gchar *tmp = priv->uri;
priv->uri = g_strconcat (tmp, "/", NULL);
g_free (tmp);
@@ -1420,7 +1420,8 @@ e_book_backend_webdav_open (EBookBackend *backend,
g_mutex_unlock (&priv->cache_lock);
session = soup_session_sync_new ();
- g_object_set (session,
+ g_object_set (
+ session,
SOUP_SESSION_TIMEOUT, 90,
SOUP_SESSION_SSL_STRICT, TRUE,
SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,
diff --git a/addressbook/libebook/e-book-query.c b/addressbook/libebook/e-book-query.c
index 6e5b00e..c39b9ba 100644
--- a/addressbook/libebook/e-book-query.c
+++ b/addressbook/libebook/e-book-query.c
@@ -619,9 +619,9 @@ func_exists (struct _ESExp *f,
static ESExpResult *
func_exists_vcard (struct _ESExp *f,
- gint argc,
- struct _ESExpResult **argv,
- gpointer data)
+ gint argc,
+ struct _ESExpResult **argv,
+ gpointer data)
{
GList **list = data;
ESExpResult *r;
diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c
index ca129db..b918d57 100644
--- a/addressbook/libebook/e-contact.c
+++ b/addressbook/libebook/e-contact.c
@@ -333,12 +333,12 @@ static void
e_contact_finalize (GObject *object)
{
EContactPrivate *priv;
- gint i;
+ gint ii;
priv = E_CONTACT_GET_PRIVATE (object);
- for (i = E_CONTACT_FIELD_FIRST; i < E_CONTACT_FIELD_LAST; i++)
- g_free (priv->cached_strings[i]);
+ for (ii = E_CONTACT_FIELD_FIRST; ii < E_CONTACT_FIELD_LAST; ii++)
+ g_free (priv->cached_strings[ii]);
/* Chain up to parent's finalize() method. */
G_OBJECT_CLASS (e_contact_parent_class)->finalize (object);
@@ -348,7 +348,7 @@ static void
e_contact_class_init (EContactClass *class)
{
GObjectClass *object_class;
- gint i;
+ gint ii;
g_type_class_add_private (class, sizeof (EContactPrivate));
@@ -357,57 +357,57 @@ e_contact_class_init (EContactClass *class)
object_class->get_property = e_contact_get_property;
object_class->finalize = e_contact_finalize;
- for (i = E_CONTACT_FIELD_FIRST; i < E_CONTACT_FIELD_LAST; i++) {
+ for (ii = E_CONTACT_FIELD_FIRST; ii < E_CONTACT_FIELD_LAST; ii++) {
GParamSpec *pspec = NULL;
+ GParamFlags flags;
/* Verify the table is correctly ordered */
- g_assert (i == field_info[i].field_id);
+ g_assert (ii == field_info[ii].field_id);
- if (field_info[i].t & E_CONTACT_FIELD_TYPE_STRING)
+ flags = G_PARAM_READABLE |
+ G_PARAM_STATIC_NICK |
+ G_PARAM_STATIC_BLURB;
+
+ if (!field_info[ii].read_only)
+ flags |= G_PARAM_WRITABLE;
+
+ if (field_info[ii].t & E_CONTACT_FIELD_TYPE_STRING)
pspec = g_param_spec_string (
- field_info[i].field_name,
- _(field_info[i].pretty_name),
- field_info[i].pretty_name,
+ field_info[ii].field_name,
+ _(field_info[ii].pretty_name),
+ field_info[ii].pretty_name,
NULL,
- (field_info[i].read_only ? G_PARAM_READABLE : G_PARAM_READWRITE) |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
- else if (field_info[i].t & E_CONTACT_FIELD_TYPE_BOOLEAN)
+ flags);
+ else if (field_info[ii].t & E_CONTACT_FIELD_TYPE_BOOLEAN)
pspec = g_param_spec_boolean (
- field_info[i].field_name,
- _(field_info[i].pretty_name),
- field_info[i].pretty_name,
+ field_info[ii].field_name,
+ _(field_info[ii].pretty_name),
+ field_info[ii].pretty_name,
FALSE,
- (field_info[i].read_only ? G_PARAM_READABLE : G_PARAM_READWRITE) |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
- else if (field_info[i].t & E_CONTACT_FIELD_TYPE_STRUCT)
+ flags);
+ else if (field_info[ii].t & E_CONTACT_FIELD_TYPE_STRUCT)
+ pspec = g_param_spec_boxed (
+ field_info[ii].field_name,
+ _(field_info[ii].pretty_name),
+ field_info[ii].pretty_name,
+ field_info[ii].boxed_type_getter (),
+ flags);
+ else if (field_info[ii].t & E_CONTACT_FIELD_TYPE_MULTI)
pspec = g_param_spec_boxed (
- field_info[i].field_name,
- _(field_info[i].pretty_name),
- field_info[i].pretty_name,
- field_info[i].boxed_type_getter (),
- (field_info[i].read_only ? G_PARAM_READABLE : G_PARAM_READWRITE) |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
- else if (field_info[i].t & E_CONTACT_FIELD_TYPE_MULTI)
- pspec = g_param_spec_boxed (field_info[i].field_name,
- _(field_info[i].pretty_name),
- field_info[i].pretty_name,
- E_TYPE_CONTACT_ATTR_LIST,
- (field_info[i].read_only ? G_PARAM_READABLE : G_PARAM_READWRITE)
- | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
+ field_info[ii].field_name,
+ _(field_info[ii].pretty_name),
+ field_info[ii].pretty_name,
+ E_TYPE_CONTACT_ATTR_LIST,
+ flags);
else
pspec = g_param_spec_pointer (
- field_info[i].field_name,
- _(field_info[i].pretty_name),
- field_info[i].pretty_name,
- (field_info[i].read_only ? G_PARAM_READABLE : G_PARAM_READWRITE) |
- G_PARAM_STATIC_NICK |
- G_PARAM_STATIC_BLURB);
+ field_info[ii].field_name,
+ _(field_info[ii].pretty_name),
+ field_info[ii].pretty_name,
+ flags);
g_object_class_install_property (
- object_class, field_info[i].field_id, pspec);
+ object_class, field_info[ii].field_id, pspec);
}
}
@@ -1516,10 +1516,11 @@ e_contact_vcard_attribute (EContactField field_id)
EContactField
e_contact_field_id (const gchar *field_name)
{
- gint i;
- for (i = E_CONTACT_FIELD_FIRST; i < E_CONTACT_FIELD_LAST; i++) {
- if (!g_ascii_strcasecmp (field_info[i].field_name, field_name))
- return field_info[i].field_id;
+ gint ii;
+
+ for (ii = E_CONTACT_FIELD_FIRST; ii < E_CONTACT_FIELD_LAST; ii++) {
+ if (!g_ascii_strcasecmp (field_info[ii].field_name, field_name))
+ return field_info[ii].field_id;
}
return 0;
@@ -1538,15 +1539,15 @@ e_contact_field_id (const gchar *field_name)
EContactField
e_contact_field_id_from_vcard (const gchar *vcard_field)
{
- gint i;
+ gint ii;
- for (i = E_CONTACT_FIELD_FIRST; i < E_CONTACT_FIELD_LAST; i++) {
- if (field_info[i].vcard_field_name == NULL)
+ for (ii = E_CONTACT_FIELD_FIRST; ii < E_CONTACT_FIELD_LAST; ii++) {
+ if (field_info[ii].vcard_field_name == NULL)
continue;
- if (field_info[i].t & E_CONTACT_FIELD_TYPE_SYNTHETIC)
+ if (field_info[ii].t & E_CONTACT_FIELD_TYPE_SYNTHETIC)
continue;
- if (!strcmp (field_info[i].vcard_field_name, vcard_field))
- return field_info[i].field_id;
+ if (!strcmp (field_info[ii].vcard_field_name, vcard_field))
+ return field_info[ii].field_id;
}
g_warning ("unknown vCard field `%s'", vcard_field);
@@ -2591,7 +2592,6 @@ e_contact_cert_copy (EContactCert *cert)
E_CONTACT_DEFINE_BOXED_TYPE (e_contact_cert, "EContactCert")
-
/**
* e_contact_attr_list_copy:
* @list: A #GList of strings
diff --git a/addressbook/libebook/e-source-backend-summary-setup.c b/addressbook/libebook/e-source-backend-summary-setup.c
index 2e7f595..2538475 100644
--- a/addressbook/libebook/e-source-backend-summary-setup.c
+++ b/addressbook/libebook/e-source-backend-summary-setup.c
@@ -70,39 +70,24 @@ G_DEFINE_TYPE (
e_source_backend_summary_setup,
E_TYPE_SOURCE_EXTENSION)
-
-static void
-source_backend_summary_setup_finalize (GObject *object)
-{
- ESourceBackendSummarySetupPrivate *priv;
-
- priv = E_SOURCE_BACKEND_SUMMARY_GET_PRIVATE (object);
-
- g_mutex_clear (&priv->property_lock);
- g_free (priv->summary_fields);
- g_free (priv->indexed_fields);
-
- G_OBJECT_CLASS (e_source_backend_summary_setup_parent_class)->finalize (object);
-}
-
static gchar *
source_backend_summary_setup_dup_literal_fields (ESourceBackendSummarySetup *extension,
- gint which)
+ gint which)
{
gchar *duplicate = NULL;
g_mutex_lock (&extension->priv->property_lock);
switch (which) {
- case PROP_SUMMARY_FIELDS:
- duplicate = g_strdup (extension->priv->summary_fields);
- break;
- case PROP_INDEXED_FIELDS:
- duplicate = g_strdup (extension->priv->indexed_fields);
- break;
- default:
- g_assert_not_reached();
- break;
+ case PROP_SUMMARY_FIELDS:
+ duplicate = g_strdup (extension->priv->summary_fields);
+ break;
+ case PROP_INDEXED_FIELDS:
+ duplicate = g_strdup (extension->priv->indexed_fields);
+ break;
+ default:
+ g_assert_not_reached ();
+ break;
}
g_mutex_unlock (&extension->priv->property_lock);
@@ -112,24 +97,24 @@ source_backend_summary_setup_dup_literal_fields (ESourceBackendSummarySetup *ext
static void
source_backend_summary_setup_set_literal_fields (ESourceBackendSummarySetup *extension,
- const gchar *literal_fields,
- gint which)
+ const gchar *literal_fields,
+ gint which)
{
const gchar *property_name;
gchar **target;
switch (which) {
- case PROP_SUMMARY_FIELDS:
- target = &(extension->priv->summary_fields);
- property_name = "summary-fields";
- break;
- case PROP_INDEXED_FIELDS:
- target = &(extension->priv->indexed_fields);
- property_name = "indexed-fields";
- break;
- default:
- g_assert_not_reached();
- break;
+ case PROP_SUMMARY_FIELDS:
+ target = &(extension->priv->summary_fields);
+ property_name = "summary-fields";
+ break;
+ case PROP_INDEXED_FIELDS:
+ target = &(extension->priv->indexed_fields);
+ property_name = "indexed-fields";
+ break;
+ default:
+ g_assert_not_reached ();
+ break;
}
g_mutex_lock (&extension->priv->property_lock);
@@ -149,15 +134,16 @@ source_backend_summary_setup_set_literal_fields (ESourceBackendSummarySetup *ext
static void
source_backend_summary_setup_set_property (GObject *object,
- guint property_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
switch (property_id) {
- case PROP_SUMMARY_FIELDS:
- case PROP_INDEXED_FIELDS:
- source_backend_summary_setup_set_literal_fields
- (E_SOURCE_BACKEND_SUMMARY_SETUP (object), g_value_get_string (value), property_id);
+ case PROP_SUMMARY_FIELDS:
+ case PROP_INDEXED_FIELDS:
+ source_backend_summary_setup_set_literal_fields (
+ E_SOURCE_BACKEND_SUMMARY_SETUP (object),
+ g_value_get_string (value), property_id);
return;
}
@@ -166,16 +152,18 @@ source_backend_summary_setup_set_property (GObject *object,
static void
source_backend_summary_setup_get_property (GObject *object,
- guint property_id,
- GValue *value,
- GParamSpec *pspec)
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
switch (property_id) {
- case PROP_SUMMARY_FIELDS:
- case PROP_INDEXED_FIELDS:
- g_value_take_string (value,
- source_backend_summary_setup_dup_literal_fields
- (E_SOURCE_BACKEND_SUMMARY_SETUP (object), property_id));
+ case PROP_SUMMARY_FIELDS:
+ case PROP_INDEXED_FIELDS:
+ g_value_take_string (
+ value,
+ source_backend_summary_setup_dup_literal_fields (
+ E_SOURCE_BACKEND_SUMMARY_SETUP (object),
+ property_id));
return;
}
@@ -183,18 +171,37 @@ source_backend_summary_setup_get_property (GObject *object,
}
static void
+source_backend_summary_setup_finalize (GObject *object)
+{
+ ESourceBackendSummarySetupPrivate *priv;
+
+ priv = E_SOURCE_BACKEND_SUMMARY_GET_PRIVATE (object);
+
+ g_mutex_clear (&priv->property_lock);
+ g_free (priv->summary_fields);
+ g_free (priv->indexed_fields);
+
+ /* Chain up to parent's finalize() method. */
+ G_OBJECT_CLASS (e_source_backend_summary_setup_parent_class)->
+ finalize (object);
+}
+
+static void
e_source_backend_summary_setup_class_init (ESourceBackendSummarySetupClass *class)
{
- GObjectClass *object_class;
+ GObjectClass *object_class;
ESourceExtensionClass *extension_class;
- extension_class = E_SOURCE_EXTENSION_CLASS (class);
- extension_class->name = E_SOURCE_EXTENSION_BACKEND_SUMMARY_SETUP;
+ g_type_class_add_private (
+ class, sizeof (ESourceBackendSummarySetupPrivate));
- object_class = G_OBJECT_CLASS (class);
- object_class->finalize = source_backend_summary_setup_finalize;
+ object_class = G_OBJECT_CLASS (class);
object_class->get_property = source_backend_summary_setup_get_property;
object_class->set_property = source_backend_summary_setup_set_property;
+ object_class->finalize = source_backend_summary_setup_finalize;
+
+ extension_class = E_SOURCE_EXTENSION_CLASS (class);
+ extension_class->name = E_SOURCE_EXTENSION_BACKEND_SUMMARY_SETUP;
g_object_class_install_property (
object_class,
@@ -215,14 +222,13 @@ e_source_backend_summary_setup_class_init (ESourceBackendSummarySetupClass *clas
g_param_spec_string (
"indexed-fields",
"Indexed Fields",
- "The list of summary fields which are to be given indexes in the underlying database",
+ "The list of summary fields which are to be "
+ "given indexes in the underlying database",
NULL,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT |
G_PARAM_STATIC_STRINGS |
E_SOURCE_PARAM_SETTING));
-
- g_type_class_add_private (class, sizeof (ESourceBackendSummarySetupPrivate));
}
static void
@@ -233,9 +239,9 @@ e_source_backend_summary_setup_init (ESourceBackendSummarySetup *extension)
}
static EContactField *
-source_backend_summary_setup_get_fields_array (ESourceBackendSummarySetup *extension,
- gint *n_fields,
- gint which)
+source_backend_summary_setup_get_fields_array (ESourceBackendSummarySetup *extension,
+ gint *n_fields,
+ gint which)
{
EContactField field;
EContactField *fields = NULL;
@@ -273,9 +279,9 @@ source_backend_summary_setup_get_fields_array (ESourceBackendSummarySetup *exte
static void
e_source_backend_summary_setup_set_fields_array (ESourceBackendSummarySetup *extension,
- EContactField *fields,
- gint n_fields,
- gint which)
+ EContactField *fields,
+ gint n_fields,
+ gint which)
{
gint i;
GString *string;
@@ -306,8 +312,8 @@ e_source_backend_summary_setup_set_fields_array (ESourceBackendSummarySetup *ext
static void
e_source_backend_summary_setup_set_fields_va_list (ESourceBackendSummarySetup *extension,
- va_list var_args,
- gint which)
+ va_list var_args,
+ gint which)
{
GString *string;
gboolean malformed = FALSE, first_field = TRUE;
@@ -355,8 +361,8 @@ e_source_backend_summary_setup_set_fields_va_list (ESourceBackendSummarySetup *e
* Since: 3.8
*/
EContactField *
-e_source_backend_summary_setup_get_summary_fields (ESourceBackendSummarySetup *extension,
- gint *n_fields)
+e_source_backend_summary_setup_get_summary_fields (ESourceBackendSummarySetup *extension,
+ gint *n_fields)
{
g_return_val_if_fail (E_IS_SOURCE_BACKEND_SUMMARY_SETUP (extension), NULL);
g_return_val_if_fail (n_fields != NULL, NULL);
@@ -385,8 +391,8 @@ e_source_backend_summary_setup_get_summary_fields (ESourceBackendSummarySetup *
*/
void
e_source_backend_summary_setup_set_summary_fieldsv (ESourceBackendSummarySetup *extension,
- EContactField *fields,
- gint n_fields)
+ EContactField *fields,
+ gint n_fields)
{
g_return_if_fail (E_IS_SOURCE_BACKEND_SUMMARY_SETUP (extension));
g_return_if_fail (n_fields >= 0);
@@ -418,7 +424,7 @@ e_source_backend_summary_setup_set_summary_fieldsv (ESourceBackendSummarySetup *
*/
void
e_source_backend_summary_setup_set_summary_fields (ESourceBackendSummarySetup *extension,
- ...)
+ ...)
{
va_list var_args;
@@ -443,9 +449,9 @@ e_source_backend_summary_setup_set_summary_fields (ESourceBackendSummarySetup *e
* Since: 3.8
*/
EContactField *
-e_source_backend_summary_setup_get_indexed_fields (ESourceBackendSummarySetup *extension,
- EBookIndexType **types,
- gint *n_fields)
+e_source_backend_summary_setup_get_indexed_fields (ESourceBackendSummarySetup *extension,
+ EBookIndexType **types,
+ gint *n_fields)
{
EContactField *ret_fields;
EBookIndexType *ret_types;
@@ -539,10 +545,10 @@ e_source_backend_summary_setup_get_indexed_fields (ESourceBackendSummarySetup *
* Since: 3.8
*/
void
-e_source_backend_summary_setup_set_indexed_fieldsv (ESourceBackendSummarySetup *extension,
- EContactField *fields,
- EBookIndexType *types,
- gint n_fields)
+e_source_backend_summary_setup_set_indexed_fieldsv (ESourceBackendSummarySetup *extension,
+ EContactField *fields,
+ EBookIndexType *types,
+ gint n_fields)
{
GString *string;
gboolean malformed = FALSE;
@@ -562,7 +568,7 @@ e_source_backend_summary_setup_set_indexed_fieldsv (ESourceBackendSummarySetup
for (i = 0; i < n_fields && malformed == FALSE; i++) {
const gchar *field;
const gchar *type;
-
+
field = e_contact_field_name (fields[i]);
type = e_enum_to_string (E_TYPE_BOOK_INDEX_TYPE, types[i]);
@@ -574,7 +580,7 @@ e_source_backend_summary_setup_set_indexed_fieldsv (ESourceBackendSummarySetup
malformed = TRUE;
} else {
if (i > 0)
- g_string_append_c (string, ':');
+ g_string_append_c (string, ':');
g_string_append_printf (string, "%s,%s", field, type);
}
}
@@ -611,8 +617,8 @@ e_source_backend_summary_setup_set_indexed_fieldsv (ESourceBackendSummarySetup
* Since: 3.8
*/
void
-e_source_backend_summary_setup_set_indexed_fields (ESourceBackendSummarySetup *extension,
- ...)
+e_source_backend_summary_setup_set_indexed_fields (ESourceBackendSummarySetup *extension,
+ ...)
{
GString *string;
gboolean malformed = FALSE, first = TRUE;
@@ -634,7 +640,7 @@ e_source_backend_summary_setup_set_indexed_fields (ESourceBackendSummarySetup *
field = e_contact_field_name (field_in);
if (field == NULL) {
g_warning ("Invalid contact field specified in "
- "e_source_backend_summary_setup_set_indexed_fields()");
+ "e_source_backend_summary_setup_set_indexed_fields()");
malformed = TRUE;
break;
}
@@ -643,13 +649,13 @@ e_source_backend_summary_setup_set_indexed_fields (ESourceBackendSummarySetup *
type = e_enum_to_string (E_TYPE_BOOK_INDEX_TYPE, type_in);
if (type == NULL) {
g_warning ("Invalid index type "
- "e_source_backend_summary_setup_set_indexed_fields()");
+ "e_source_backend_summary_setup_set_indexed_fields()");
malformed = TRUE;
break;
}
if (!first)
- g_string_append_c (string, ':');
+ g_string_append_c (string, ':');
else
first = FALSE;
diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb.c b/addressbook/libedata-book/e-book-backend-sqlitedb.c
index 7aeaf09..cca1c6d 100644
--- a/addressbook/libedata-book/e-book-backend-sqlitedb.c
+++ b/addressbook/libedata-book/e-book-backend-sqlitedb.c
@@ -119,7 +119,7 @@ static gboolean append_summary_field (GArray *array,
static const gchar *
summary_dbname_from_field (EBookBackendSqliteDB *ebsdb,
- EContactField field)
+ EContactField field)
{
gint i;
@@ -133,7 +133,7 @@ summary_dbname_from_field (EBookBackendSqliteDB *ebsdb,
static gint
summary_index_from_field_name (EBookBackendSqliteDB *ebsdb,
- const gchar *field_name)
+ const gchar *field_name)
{
gint i;
EContactField field;
@@ -330,10 +330,10 @@ print_debug_cb (gpointer ref,
static void
book_backend_sql_debug (sqlite3 *db,
- const gchar *stmt,
- gint (*callback)(gpointer ,gint,gchar **,gchar **),
- gpointer data,
- GError **error)
+ const gchar *stmt,
+ gint (*callback)(gpointer ,gint,gchar **,gchar **),
+ gpointer data,
+ GError **error)
{
gchar *debug;
GError *local_error = NULL;
@@ -591,10 +591,9 @@ rollback:
return FALSE;
}
-
static gchar *
format_multivalues (EBookBackendSqliteDB *ebsdb,
- gboolean *reverse_multivalues)
+ gboolean *reverse_multivalues)
{
gint i;
GString *string;
@@ -662,11 +661,11 @@ rollback:
static gint
collect_columns_cb (gpointer ref,
- gint col,
- gchar **cols,
- gchar **name)
+ gint col,
+ gchar **cols,
+ gchar **name)
{
- GList **columns = (GList **)ref;
+ GList **columns = (GList **) ref;
gint i;
for (i = 0; i < col; i++) {
@@ -690,8 +689,8 @@ collect_columns_cb (gpointer ref,
static gboolean
introspect_summary (EBookBackendSqliteDB *ebsdb,
- const gchar *folderid,
- GError **error)
+ const gchar *folderid,
+ GError **error)
{
gboolean success;
gchar *stmt;
@@ -809,14 +808,14 @@ introspect_summary (EBookBackendSqliteDB *ebsdb,
introspect_summary_finish:
- g_list_free_full (summary_columns, (GDestroyNotify)g_free);
+ g_list_free_full (summary_columns, (GDestroyNotify) g_free);
g_free (multivalues);
/* Apply the introspected summary fields */
if (success) {
g_free (ebsdb->priv->summary_fields);
ebsdb->priv->n_summary_fields = summary_fields->len;
- ebsdb->priv->summary_fields = (SummaryField *)g_array_free (summary_fields, FALSE);
+ ebsdb->priv->summary_fields = (SummaryField *) g_array_free (summary_fields, FALSE);
} else if (summary_fields) {
g_array_free (summary_fields, TRUE);
}
@@ -824,7 +823,6 @@ introspect_summary (EBookBackendSqliteDB *ebsdb,
return success;
}
-
/* The column names match the fields used in book-backend-sexp */
static gboolean
create_contacts_table (EBookBackendSqliteDB *ebsdb,
@@ -874,10 +872,12 @@ create_contacts_table (EBookBackendSqliteDB *ebsdb,
if ((ebsdb->priv->summary_fields[i].index & INDEX_PREFIX) != 0 &&
ebsdb->priv->summary_fields[i].type != E_TYPE_CONTACT_ATTR_LIST) {
/* Derive index name from field & folder */
- tmp = g_strdup_printf ("INDEX_%s_%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)", tmp, folderid,
+ tmp = g_strdup_printf (
+ "INDEX_%s_%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)", 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);
@@ -888,10 +888,12 @@ create_contacts_table (EBookBackendSqliteDB *ebsdb,
(ebsdb->priv->summary_fields[i].index & INDEX_SUFFIX) != 0 &&
ebsdb->priv->summary_fields[i].type != E_TYPE_CONTACT_ATTR_LIST) {
/* Derive index name from field & folder */
- tmp = g_strdup_printf ("RINDEX_%s_%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_reverse)", tmp, folderid,
+ tmp = g_strdup_printf (
+ "RINDEX_%s_%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_reverse)", 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);
@@ -902,7 +904,7 @@ create_contacts_table (EBookBackendSqliteDB *ebsdb,
/* Construct the create statement from the attribute list summary table */
if (success && ebsdb->priv->have_attr_list) {
string = g_string_new ("CREATE TABLE IF NOT EXISTS %Q ( uid TEXT NOT NULL REFERENCES %Q(uid), "
- "field TEXT, value TEXT");
+ "field TEXT, value TEXT");
if (ebsdb->priv->have_attr_list_suffix)
g_string_append (string, ", value_reverse TEXT");
@@ -994,16 +996,16 @@ book_backend_sqlitedb_load (EBookBackendSqliteDB *ebsdb,
static EBookBackendSqliteDB *
e_book_backend_sqlitedb_new_internal (const gchar *path,
- const gchar *emailid,
- const gchar *folderid,
- const gchar *folder_name,
- gboolean store_vcard,
- SummaryField *fields,
- gint n_fields,
- gboolean have_attr_list,
- gboolean have_attr_list_prefix,
- gboolean have_attr_list_suffix,
- GError **error)
+ const gchar *emailid,
+ const gchar *folderid,
+ const gchar *folder_name,
+ gboolean store_vcard,
+ SummaryField *fields,
+ gint n_fields,
+ gboolean have_attr_list,
+ gboolean have_attr_list_prefix,
+ gboolean have_attr_list_suffix,
+ GError **error)
{
EBookBackendSqliteDB *ebsdb;
gchar *hash_key, *filename;
@@ -1078,10 +1080,10 @@ exit:
}
static gboolean
-append_summary_field (GArray *array,
- EContactField field,
- gboolean *have_attr_list,
- GError **error)
+append_summary_field (GArray *array,
+ EContactField field,
+ gboolean *have_attr_list,
+ GError **error)
{
const gchar *dbname = NULL;
GType type = G_TYPE_INVALID;
@@ -1089,8 +1091,9 @@ append_summary_field (GArray *array,
SummaryField new_field = { 0, };
if (field < 1 || field >= E_CONTACT_FIELD_LAST) {
- g_set_error (error, E_BOOK_SDB_ERROR,
- 0, _("Invalid contact field '%d' specified in summary"), field);
+ g_set_error (
+ error, E_BOOK_SDB_ERROR, 0,
+ _("Invalid contact field '%d' specified in summary"), field);
return FALSE;
}
@@ -1122,10 +1125,11 @@ append_summary_field (GArray *array,
if (type != G_TYPE_STRING &&
type != G_TYPE_BOOLEAN &&
type != E_TYPE_CONTACT_ATTR_LIST) {
- g_set_error (error, E_BOOK_SDB_ERROR, 0,
- _("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), g_type_name (type));
+ g_set_error (
+ error, E_BOOK_SDB_ERROR, 0,
+ _("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), g_type_name (type));
return FALSE;
}
@@ -1141,12 +1145,12 @@ append_summary_field (GArray *array,
}
static void
-summary_fields_add_indexes (GArray *array,
- EContactField *indexes,
- EBookIndexType *index_types,
- gint n_indexes,
- gboolean *have_attr_list_prefix,
- gboolean *have_attr_list_suffix)
+summary_fields_add_indexes (GArray *array,
+ EContactField *indexes,
+ EBookIndexType *index_types,
+ gint n_indexes,
+ gboolean *have_attr_list_prefix,
+ gboolean *have_attr_list_suffix)
{
gint i, j;
@@ -1177,7 +1181,6 @@ summary_fields_add_indexes (GArray *array,
}
}
-
/**
* e_book_backend_sqlitedb_new_full:
* @path: location where the db would be created
@@ -1205,12 +1208,12 @@ summary_fields_add_indexes (GArray *array,
**/
EBookBackendSqliteDB *
e_book_backend_sqlitedb_new_full (const gchar *path,
- const gchar *emailid,
- const gchar *folderid,
- const gchar *folder_name,
- gboolean store_vcard,
- ESourceBackendSummarySetup *setup,
- GError **error)
+ const gchar *emailid,
+ const gchar *folderid,
+ const gchar *folder_name,
+ gboolean store_vcard,
+ ESourceBackendSummarySetup *setup,
+ GError **error)
{
EBookBackendSqliteDB *ebsdb = NULL;
EContactField *fields;
@@ -1232,7 +1235,7 @@ e_book_backend_sqlitedb_new_full (const gchar *path,
g_free (fields);
g_free (index_types);
g_free (indexed_fields);
-
+
return ebsdb;
}
@@ -1258,17 +1261,19 @@ e_book_backend_sqlitedb_new_full (const gchar *path,
}
/* Add the 'indexed' flag to the SummaryField structs */
- summary_fields_add_indexes (summary_fields, indexed_fields, index_types, n_indexed_fields,
- &have_attr_list_prefix, &have_attr_list_suffix);
-
- ebsdb = e_book_backend_sqlitedb_new_internal (path, emailid, folderid, folder_name,
- store_vcard,
- (SummaryField *) summary_fields->data,
- summary_fields->len,
- have_attr_list,
- have_attr_list_prefix,
- have_attr_list_suffix,
- error);
+ summary_fields_add_indexes (
+ summary_fields, indexed_fields, index_types, n_indexed_fields,
+ &have_attr_list_prefix, &have_attr_list_suffix);
+
+ ebsdb = e_book_backend_sqlitedb_new_internal (
+ path, emailid, folderid, folder_name,
+ store_vcard,
+ (SummaryField *) summary_fields->data,
+ summary_fields->len,
+ have_attr_list,
+ have_attr_list_prefix,
+ have_attr_list_suffix,
+ error);
g_free (fields);
g_free (index_types);
@@ -1278,8 +1283,6 @@ e_book_backend_sqlitedb_new_full (const gchar *path,
return ebsdb;
}
-
-
/**
* e_book_backend_sqlitedb_new
* @path: location where the db would be created
@@ -1317,20 +1320,22 @@ e_book_backend_sqlitedb_new (const gchar *path,
append_summary_field (summary_fields, default_summary_fields[i], &have_attr_list, NULL);
/* Add the default index flags */
- summary_fields_add_indexes (summary_fields,
- default_indexed_fields,
- default_index_types,
- G_N_ELEMENTS (default_indexed_fields),
- &have_attr_list_prefix, &have_attr_list_suffix);
-
- ebsdb = e_book_backend_sqlitedb_new_internal (path, emailid, folderid, folder_name,
- store_vcard,
- (SummaryField *) summary_fields->data,
- summary_fields->len,
- have_attr_list,
- have_attr_list_prefix,
- have_attr_list_suffix,
- error);
+ summary_fields_add_indexes (
+ summary_fields,
+ default_indexed_fields,
+ default_index_types,
+ G_N_ELEMENTS (default_indexed_fields),
+ &have_attr_list_prefix, &have_attr_list_suffix);
+
+ ebsdb = e_book_backend_sqlitedb_new_internal (
+ path, emailid, folderid, folder_name,
+ store_vcard,
+ (SummaryField *) summary_fields->data,
+ summary_fields->len,
+ have_attr_list,
+ have_attr_list_prefix,
+ have_attr_list_suffix,
+ error);
g_array_free (summary_fields, FALSE);
return ebsdb;
@@ -1360,7 +1365,7 @@ e_book_backend_sqlitedb_unlock_updates (EBookBackendSqliteDB *ebsdb,
/* Add Contact (free the result with g_free() ) */
static gchar *
insert_stmt_from_contact (EBookBackendSqliteDB *ebsdb,
- EContact *contact,
+ EContact *contact,
gboolean partial_content,
const gchar *folderid,
gboolean store_vcard)
@@ -1434,10 +1439,10 @@ insert_stmt_from_contact (EBookBackendSqliteDB *ebsdb,
static gboolean
insert_contact (EBookBackendSqliteDB *ebsdb,
- EContact *contact,
- gboolean partial_content,
- const gchar *folderid,
- GError **error)
+ EContact *contact,
+ gboolean partial_content,
+ const gchar *folderid,
+ GError **error)
{
EBookBackendSqliteDBPrivate *priv;
gboolean success;
@@ -1471,7 +1476,7 @@ insert_contact (EBookBackendSqliteDB *ebsdb,
values = e_contact_get (contact, priv->summary_fields[i].field);
for (l = values; success && l != NULL; l = l->next) {
- gchar *value = (gchar *)l->data;
+ gchar *value = (gchar *) l->data;
gchar *normal = e_util_utf8_normalize (value);
if (priv->have_attr_list_suffix) {
@@ -1508,7 +1513,6 @@ insert_contact (EBookBackendSqliteDB *ebsdb,
return success;
}
-
/**
* e_book_backend_sqlitedb_add_contact
* @ebsdb:
@@ -1643,7 +1647,8 @@ generate_uid_list_for_stmt (GSList *uids)
}
static gchar *
-generate_delete_stmt (const gchar *table, GSList *uids)
+generate_delete_stmt (const gchar *table,
+ GSList *uids)
{
GString *str = g_string_new (NULL);
gchar *tmp;
@@ -1657,7 +1662,7 @@ generate_delete_stmt (const gchar *table, GSList *uids)
g_free (tmp);
g_string_append_c (str, ')');
- return g_string_free (str, FALSE);
+ return g_string_free (str, FALSE);
}
/**
@@ -1680,18 +1685,18 @@ e_book_backend_sqlitedb_remove_contacts (EBookBackendSqliteDB *ebsdb,
g_return_val_if_fail (folderid != NULL, FALSE);
g_return_val_if_fail (uids != NULL, FALSE);
- success = book_backend_sqlitedb_start_transaction (ebsdb, error);
+ success = book_backend_sqlitedb_start_transaction (ebsdb, error);
/* Delete the auxillary contact infos first */
- if (success && ebsdb->priv->have_attr_list) {
- gchar *lists_folder = g_strdup_printf ("%s_lists", folderid);
+ if (success && ebsdb->priv->have_attr_list) {
+ gchar *lists_folder = g_strdup_printf ("%s_lists", folderid);
- stmt = generate_delete_stmt (lists_folder, uids);
- g_free (lists_folder);
+ stmt = generate_delete_stmt (lists_folder, uids);
+ g_free (lists_folder);
- success = book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL, error);
- g_free (stmt);
- }
+ success = book_backend_sql_exec (ebsdb->priv->db, stmt, NULL, NULL, error);
+ g_free (stmt);
+ }
if (success) {
stmt = generate_delete_stmt (folderid, uids);
@@ -1897,7 +1902,7 @@ e_book_backend_sqlitedb_is_summary_fields (GHashTable *fields_of_interest)
**/
gboolean
e_book_backend_sqlitedb_check_summary_fields (EBookBackendSqliteDB *ebsdb,
- GHashTable *fields_of_interest)
+ GHashTable *fields_of_interest)
{
gboolean summary_fields = TRUE;
GHashTableIter iter;
@@ -1923,7 +1928,7 @@ e_book_backend_sqlitedb_check_summary_fields (EBookBackendSqliteDB *ebsdb,
/* free return value with g_free */
static gchar *
summary_select_stmt (GHashTable *fields_of_interest,
- gboolean distinct)
+ gboolean distinct)
{
GString *string;
@@ -2023,8 +2028,9 @@ e_book_backend_sqlitedb_get_vcard_string (EBookBackendSqliteDB *ebsdb,
select_portion = summary_select_stmt (fields_of_interest, FALSE);
- stmt = sqlite3_mprintf ("%s FROM %Q AS summary WHERE summary.uid = %Q",
- select_portion, folderid, uid);
+ stmt = sqlite3_mprintf (
+ "%s FROM %Q AS summary WHERE summary.uid = %Q",
+ select_portion, folderid, uid);
book_backend_sql_exec (ebsdb->priv->db, stmt, store_data_to_vcard, &vcards, error);
sqlite3_free (stmt);
g_free (select_portion);
@@ -2054,8 +2060,9 @@ e_book_backend_sqlitedb_get_vcard_string (EBookBackendSqliteDB *ebsdb,
local_with_all_required_fields = TRUE;
} else {
- g_set_error (error, E_BOOK_SDB_ERROR,
- 0, _("Full search_contacts are not stored in cache. vcards cannot be returned."));
+ g_set_error (
+ error, E_BOOK_SDB_ERROR, 0,
+ _("Full search_contacts are not stored in cache. vcards cannot be returned."));
}
@@ -2073,7 +2080,6 @@ e_book_backend_sqlitedb_get_vcard_string (EBookBackendSqliteDB *ebsdb,
return vcard_str;
}
-
enum {
CHECK_IS_SUMMARY = (1 << 0),
CHECK_IS_LIST_ATTR = (1 << 1),
@@ -2081,9 +2087,9 @@ enum {
static ESExpResult *
func_check_subset (ESExp *f,
- gint argc,
- struct _ESExpTerm **argv,
- gpointer data)
+ gint argc,
+ struct _ESExpTerm **argv,
+ gpointer data)
{
ESExpResult *r, *r1;
gboolean one_non_summary_query = FALSE;
@@ -2204,8 +2210,8 @@ static const struct {
**/
gboolean
e_book_backend_sqlitedb_check_summary_query (EBookBackendSqliteDB *ebsdb,
- const gchar *query,
- gboolean *with_list_attrs)
+ const gchar *query,
+ gboolean *with_list_attrs)
{
ESExp *sexp;
ESExpResult *r;
@@ -2221,7 +2227,7 @@ e_book_backend_sqlitedb_check_summary_query (EBookBackendSqliteDB *ebsdb,
for (i = 0; i < G_N_ELEMENTS (check_symbols); i++) {
if (check_symbols[i].type == 1) {
e_sexp_add_ifunction (
- sexp, 0, check_symbols[i].name,
+ sexp, 0, check_symbols[i].name,
(ESExpIFunc *) check_symbols[i].func, ebsdb);
} else {
e_sexp_add_function (
@@ -2251,7 +2257,6 @@ e_book_backend_sqlitedb_check_summary_query (EBookBackendSqliteDB *ebsdb,
return retval;
}
-
/**
* e_book_backend_sqlitedb_is_summary_query:
*
@@ -2346,8 +2351,8 @@ typedef enum {
static gchar *
convert_string_value (const gchar *value,
- gboolean normalize,
- gboolean reverse,
+ gboolean normalize,
+ gboolean reverse,
match_type match)
{
GString *str;
@@ -2427,12 +2432,12 @@ convert_string_value (const gchar *value,
static gchar *
field_name_and_query_term (EBookBackendSqliteDB *ebsdb,
- const gchar *folderid,
- const gchar *field_name_input,
- const gchar *query_term_input,
- match_type match,
- gboolean *is_list_attr,
- gchar **query_term)
+ const gchar *folderid,
+ const gchar *field_name_input,
+ const gchar *query_term_input,
+ match_type match,
+ gboolean *is_list_attr,
+ gchar **query_term)
{
gint summary_index;
gchar *field_name = NULL;
@@ -2455,7 +2460,7 @@ field_name_and_query_term (EBookBackendSqliteDB *ebsdb,
/* Or also if its an exact match, and we *only* have reverse data which is indexed,
* then prefer the indexed reverse search. */
- else if (match == MATCH_IS &&
+ else if (match == MATCH_IS &&
(ebsdb->priv->summary_fields[summary_index].index & INDEX_SUFFIX) != 0 &&
(ebsdb->priv->summary_fields[summary_index].index & INDEX_PREFIX) == 0)
suffix_search = TRUE;
@@ -2470,25 +2475,29 @@ field_name_and_query_term (EBookBackendSqliteDB *ebsdb,
field_name = g_strdup ("multi.value_reverse");
list_attr = TRUE;
} else
- field_name = g_strconcat ("summary.",
- ebsdb->priv->summary_fields[summary_index].dbname,
- "_reverse", NULL);
+ field_name = g_strconcat (
+ "summary.",
+ ebsdb->priv->summary_fields[summary_index].dbname,
+ "_reverse", NULL);
if (ebsdb->priv->summary_fields[summary_index].field == E_CONTACT_UID ||
ebsdb->priv->summary_fields[summary_index].field == E_CONTACT_REV)
- value = convert_string_value (query_term_input, FALSE, TRUE,
- (match == MATCH_ENDS_WITH) ? MATCH_BEGINS_WITH : MATCH_IS);
+ value = convert_string_value (
+ query_term_input, FALSE, TRUE,
+ (match == MATCH_ENDS_WITH) ? MATCH_BEGINS_WITH : MATCH_IS);
else
- value = convert_string_value (query_term_input, TRUE, TRUE,
- (match == MATCH_ENDS_WITH) ? MATCH_BEGINS_WITH : MATCH_IS);
+ value = convert_string_value (
+ query_term_input, TRUE, TRUE,
+ (match == MATCH_ENDS_WITH) ? MATCH_BEGINS_WITH : MATCH_IS);
} else {
if (ebsdb->priv->summary_fields[summary_index].type == E_TYPE_CONTACT_ATTR_LIST) {
field_name = g_strdup ("multi.value");
list_attr = TRUE;
} else
- field_name = g_strconcat ("summary.",
- ebsdb->priv->summary_fields[summary_index].dbname, NULL);
+ field_name = g_strconcat (
+ "summary.",
+ ebsdb->priv->summary_fields[summary_index].dbname, NULL);
if (ebsdb->priv->summary_fields[summary_index].field == E_CONTACT_UID ||
ebsdb->priv->summary_fields[summary_index].field == E_CONTACT_REV)
@@ -2518,7 +2527,7 @@ convert_match_exp (struct _ESExp *f,
gpointer data,
match_type match)
{
- BuildQueryData *qdata = (BuildQueryData *)data;
+ BuildQueryData *qdata = (BuildQueryData *) data;
EBookBackendSqliteDB *ebsdb = qdata->ebsdb;
ESExpResult *r;
gchar *str = NULL;
@@ -2540,46 +2549,51 @@ convert_match_exp (struct _ESExp *f,
if (!g_ascii_strcasecmp (field, "full_name")) {
GString *names = g_string_new (NULL);
- field_name = field_name_and_query_term (ebsdb, qdata->folderid, "full_name",
- argv[1]->value.string,
- match, NULL, &query_term);
- g_string_append_printf (names, "(%s IS NOT NULL AND %s %s %s)",
- field_name, field_name, oper, query_term);
+ field_name = field_name_and_query_term (
+ ebsdb, qdata->folderid, "full_name",
+ argv[1]->value.string,
+ match, NULL, &query_term);
+ g_string_append_printf (
+ names, "(%s IS NOT NULL AND %s %s %s)",
+ field_name, field_name, oper, query_term);
g_free (field_name);
g_free (query_term);
if (summary_dbname_from_field (ebsdb, E_CONTACT_FAMILY_NAME)) {
- field_name = field_name_and_query_term (ebsdb, qdata->folderid, "family_name",
- argv[1]->value.string,
- match, NULL, &query_term);
- g_string_append_printf
- (names, " OR (%s IS NOT NULL AND %s %s %s)",
- field_name, field_name, oper, query_term);
+ field_name = field_name_and_query_term (
+ ebsdb, qdata->folderid, "family_name",
+ argv[1]->value.string,
+ match, NULL, &query_term);
+ g_string_append_printf (
+ names, " OR (%s IS NOT NULL AND %s %s %s)",
+ field_name, field_name, oper, query_term);
g_free (field_name);
g_free (query_term);
}
if (summary_dbname_from_field (ebsdb, E_CONTACT_GIVEN_NAME)) {
- field_name = field_name_and_query_term (ebsdb, qdata->folderid, "given_name",
- argv[1]->value.string,
- match, NULL, &query_term);
- g_string_append_printf
- (names, " OR (%s IS NOT NULL AND %s %s %s)",
- field_name, field_name, oper, query_term);
+ field_name = field_name_and_query_term (
+ ebsdb, qdata->folderid, "given_name",
+ argv[1]->value.string,
+ match, NULL, &query_term);
+ g_string_append_printf (
+ names, " OR (%s IS NOT NULL AND %s %s %s)",
+ field_name, field_name, oper, query_term);
g_free (field_name);
g_free (query_term);
}
if (summary_dbname_from_field (ebsdb, E_CONTACT_NICKNAME)) {
- field_name = field_name_and_query_term (ebsdb, qdata->folderid, "nickname",
- argv[1]->value.string,
- match, NULL, &query_term);
- g_string_append_printf
- (names, " OR (%s IS NOT NULL AND %s %s %s)",
- field_name, field_name, oper, query_term);
+ field_name = field_name_and_query_term (
+ ebsdb, qdata->folderid, "nickname",
+ argv[1]->value.string,
+ match, NULL, &query_term);
+ g_string_append_printf (
+ names, " OR (%s IS NOT NULL AND %s %s %s)",
+ field_name, field_name, oper, query_term);
g_free (field_name);
g_free (query_term);
}
@@ -2591,20 +2605,23 @@ convert_match_exp (struct _ESExp *f,
gboolean is_list = FALSE;
/* This should ideally be the only valid case from all the above special casing, but oh well... */
- field_name = field_name_and_query_term (ebsdb, qdata->folderid, field,
- argv[1]->value.string,
- match, &is_list, &query_term);
+ field_name = field_name_and_query_term (
+ ebsdb, qdata->folderid, field,
+ argv[1]->value.string,
+ match, &is_list, &query_term);
if (is_list) {
gchar *tmp;
tmp = sqlite3_mprintf ("summary.uid = multi.uid AND multi.field = %Q", field);
- str = g_strdup_printf ("(%s AND %s %s %s)",
- tmp, field_name, oper, query_term);
+ str = g_strdup_printf (
+ "(%s AND %s %s %s)",
+ tmp, field_name, oper, query_term);
sqlite3_free (tmp);
} else
- str = g_strdup_printf ("(%s IS NOT NULL AND %s %s %s)",
- field_name, field_name, oper, query_term);
+ str = g_strdup_printf (
+ "(%s IS NOT NULL AND %s %s %s)",
+ field_name, field_name, oper, query_term);
g_free (field_name);
g_free (query_term);
@@ -2671,8 +2688,8 @@ static struct {
static gchar *
sexp_to_sql_query (EBookBackendSqliteDB *ebsdb,
- const gchar *folderid,
- const gchar *query)
+ const gchar *folderid,
+ const gchar *query)
{
BuildQueryData data = { ebsdb, folderid };
ESExp *sexp;
@@ -2685,7 +2702,7 @@ sexp_to_sql_query (EBookBackendSqliteDB *ebsdb,
for (i = 0; i < G_N_ELEMENTS (symbols); i++) {
if (symbols[i].immediate)
e_sexp_add_ifunction (
- sexp, 0, symbols[i].name,
+ sexp, 0, symbols[i].name,
(ESExpIFunc *) symbols[i].func, &data);
else
e_sexp_add_function (
@@ -2758,7 +2775,7 @@ book_backend_sqlitedb_search_query (EBookBackendSqliteDB *ebsdb,
const gchar *folderid,
GHashTable *fields_of_interest,
gboolean *with_all_required_fields,
- gboolean query_with_list_attrs,
+ gboolean query_with_list_attrs,
GError **error)
{
GSList *vcard_data = NULL;
@@ -2772,24 +2789,26 @@ book_backend_sqlitedb_search_query (EBookBackendSqliteDB *ebsdb,
if (uid_rev_fields (fields_of_interest)) {
gchar *select_portion;
- select_portion = summary_select_stmt (fields_of_interest,
- query_with_list_attrs);
+ select_portion = summary_select_stmt (
+ fields_of_interest, query_with_list_attrs);
if (sql && sql[0]) {
if (query_with_list_attrs) {
gchar *list_table = g_strconcat (folderid, "_lists", NULL);
- stmt = sqlite3_mprintf ("%s FROM %Q AS summary, %Q AS multi WHERE %s",
- select_portion, folderid, list_table, sql);
+ stmt = sqlite3_mprintf (
+ "%s FROM %Q AS summary, %Q AS multi WHERE %s",
+ select_portion, folderid, list_table, sql);
g_free (list_table);
} else {
- stmt = sqlite3_mprintf ("%s FROM %Q AS summary WHERE %s",
- select_portion, folderid, sql);
+ stmt = sqlite3_mprintf (
+ "%s FROM %Q AS summary WHERE %s",
+ select_portion, folderid, sql);
}
success = book_backend_sql_exec (
- ebsdb->priv->db, stmt,
+ ebsdb->priv->db, stmt,
store_data_to_vcard, &vcard_data, error);
sqlite3_free (stmt);
@@ -2811,16 +2830,18 @@ book_backend_sqlitedb_search_query (EBookBackendSqliteDB *ebsdb,
if (query_with_list_attrs) {
gchar *list_table = g_strconcat (folderid, "_lists", NULL);
- stmt = sqlite3_mprintf ("SELECT DISTINCT summary.uid, vcard, bdata "
- "FROM %Q AS summary, %Q AS multi WHERE %s",
- folderid, list_table, sql);
+ stmt = sqlite3_mprintf (
+ "SELECT DISTINCT summary.uid, vcard, bdata "
+ "FROM %Q AS summary, %Q AS multi WHERE %s",
+ folderid, list_table, sql);
g_free (list_table);
} else {
- stmt = sqlite3_mprintf ("SELECT uid, vcard, bdata FROM %Q as summary WHERE %s", folderid, sql);
+ stmt = sqlite3_mprintf (
+ "SELECT uid, vcard, bdata FROM %Q as summary WHERE %s", folderid, sql);
}
success = book_backend_sql_exec (
- ebsdb->priv->db, stmt,
+ ebsdb->priv->db, stmt,
addto_vcard_list_cb , &vcard_data, error);
sqlite3_free (stmt);
@@ -2835,8 +2856,9 @@ book_backend_sqlitedb_search_query (EBookBackendSqliteDB *ebsdb,
local_with_all_required_fields = TRUE;
} else {
- g_set_error (error, E_BOOK_SDB_ERROR,
- 0, _("Full search_contacts are not stored in cache. vcards cannot be returned."));
+ g_set_error (
+ error, E_BOOK_SDB_ERROR, 0,
+ _("Full search_contacts are not stored in cache. vcards cannot be returned."));
}
READER_UNLOCK (ebsdb);
@@ -2979,7 +3001,7 @@ e_book_backend_sqlitedb_search (EBookBackendSqliteDB *ebsdb,
g_set_error (
error, E_BOOK_SDB_ERROR, 0,
_("Full search_contacts are not stored in cache. "
- "Hence only summary query is supported."));
+ "Hence only summary query is supported."));
}
if (searched)
@@ -3025,12 +3047,15 @@ e_book_backend_sqlitedb_search_uids (EBookBackendSqliteDB *ebsdb,
if (query_with_list_attrs) {
gchar *list_table = g_strconcat (folderid, "_lists", NULL);
- stmt = sqlite3_mprintf ("SELECT DISTINCT summary.uid FROM %Q AS summary, %Q AS multi WHERE %s",
- folderid, list_table, sql_query);
+ stmt = sqlite3_mprintf (
+ "SELECT DISTINCT summary.uid FROM %Q AS summary, %Q AS multi WHERE %s",
+ folderid, list_table, sql_query);
g_free (list_table);
} else
- stmt = sqlite3_mprintf ("SELECT summary.uid FROM %Q AS summary WHERE %s", folderid, sql_query);
+ stmt = sqlite3_mprintf (
+ "SELECT summary.uid FROM %Q AS summary WHERE %s",
+ folderid, sql_query);
book_backend_sql_exec (ebsdb->priv->db, stmt, addto_slist_cb, &uids, error);
sqlite3_free (stmt);
@@ -3057,7 +3082,7 @@ e_book_backend_sqlitedb_search_uids (EBookBackendSqliteDB *ebsdb,
g_set_error (
error, E_BOOK_SDB_ERROR, 0,
_("Full vcards are not stored in cache. "
- "Hence only summary query is supported."));
+ "Hence only summary query is supported."));
}
if (searched)
diff --git a/addressbook/libedata-book/e-data-book-factory.h b/addressbook/libedata-book/e-data-book-factory.h
index 194d1ca..48b777e 100644
--- a/addressbook/libedata-book/e-data-book-factory.h
+++ b/addressbook/libedata-book/e-data-book-factory.h
@@ -46,7 +46,6 @@
(G_TYPE_INSTANCE_GET_CLASS \
((obj), E_TYPE_DATA_BOOK_FACTORY, EDataBookFactoryClass))
-
/**
* EDS_ADDRESS_BOOK_MODULES:
*
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index ece46ee..fadb862 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -1026,8 +1026,8 @@ static void
send_and_handle_redirection (ECalBackendCalDAV *cbdav,
SoupMessage *msg,
gchar **new_location,
- GCancellable *cancellable,
- GError **error)
+ GCancellable *cancellable,
+ GError **error)
{
gchar *old_uri = NULL;
@@ -1105,7 +1105,7 @@ caldav_generate_uri (ECalBackendCalDAV *cbdav,
static gboolean
caldav_server_open_calendar (ECalBackendCalDAV *cbdav,
gboolean *server_unreachable,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **perror)
{
SoupMessage *message;
@@ -1523,7 +1523,7 @@ caldav_server_download_attachment (ECalBackendCalDAV *cbdav,
static gboolean
caldav_server_get_object (ECalBackendCalDAV *cbdav,
CalDAVObject *object,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **perror)
{
SoupMessage *message;
@@ -1590,7 +1590,7 @@ static void
caldav_post_freebusy (ECalBackendCalDAV *cbdav,
const gchar *url,
gchar **post_fb,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **error)
{
SoupMessage *message;
@@ -1672,7 +1672,7 @@ static gboolean
caldav_server_put_object (ECalBackendCalDAV *cbdav,
CalDAVObject *object,
icalcomponent *icalcomp,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **perror)
{
SoupMessage *message;
@@ -1820,7 +1820,7 @@ caldav_server_put_object (ECalBackendCalDAV *cbdav,
static void
caldav_server_delete_object (ECalBackendCalDAV *cbdav,
CalDAVObject *object,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **perror)
{
SoupMessage *message;
@@ -1858,8 +1858,8 @@ caldav_server_delete_object (ECalBackendCalDAV *cbdav,
static gboolean
caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav,
- GCancellable *cancellable,
- GError **error)
+ GCancellable *cancellable,
+ GError **error)
{
SoupMessage *message;
xmlOutputBufferPtr buf;
@@ -2746,7 +2746,7 @@ initialize_backend (ECalBackendCalDAV *cbdav,
static gboolean
open_calendar (ECalBackendCalDAV *cbdav,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **error)
{
gboolean server_unreachable = FALSE;
@@ -3715,7 +3715,7 @@ do_create_objects (ECalBackendCalDAV *cbdav,
const GSList *in_calobjs,
GSList **uids,
GSList **new_components,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **perror)
{
ECalComponent *comp;
@@ -3814,7 +3814,7 @@ do_modify_objects (ECalBackendCalDAV *cbdav,
CalObjModType mod,
GSList **old_components,
GSList **new_components,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **error)
{
ECalComponent *comp;
@@ -3985,7 +3985,7 @@ do_remove_objects (ECalBackendCalDAV *cbdav,
CalObjModType mod,
GSList **old_components,
GSList **new_components,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **perror)
{
icalcomponent *cache_comp;
@@ -4165,7 +4165,7 @@ process_object (ECalBackendCalDAV *cbdav,
ECalComponent *ecomp,
gboolean online,
icalproperty_method method,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **error)
{
ESourceRegistry *registry;
@@ -4399,7 +4399,7 @@ caldav_busy_stub (
in_calobjs,
uids,
new_components,
- cancellable,
+ cancellable,
perror))
caldav_busy_stub (
@@ -4418,7 +4418,7 @@ caldav_busy_stub (
mod,
old_components,
new_components,
- cancellable,
+ cancellable,
perror))
caldav_busy_stub (
@@ -4437,7 +4437,7 @@ caldav_busy_stub (
mod,
old_components,
new_components,
- cancellable,
+ cancellable,
perror))
caldav_busy_stub (
@@ -5046,7 +5046,8 @@ e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav)
{
cbdav->priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav);
cbdav->priv->session = soup_session_sync_new ();
- g_object_set (cbdav->priv->session,
+ g_object_set (
+ cbdav->priv->session,
SOUP_SESSION_TIMEOUT, 90,
SOUP_SESSION_SSL_STRICT, TRUE,
SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,
diff --git a/calendar/backends/contacts/e-cal-backend-contacts.c b/calendar/backends/contacts/e-cal-backend-contacts.c
index 8ec35b8..07e87e1 100644
--- a/calendar/backends/contacts/e-cal-backend-contacts.c
+++ b/calendar/backends/contacts/e-cal-backend-contacts.c
@@ -508,7 +508,7 @@ contact_record_cb_new (ECalBackendContacts *cbc,
static void
contact_record_cb_free (ContactRecordCB *cb_data,
- gboolean can_free_result)
+ gboolean can_free_result)
{
if (can_free_result) {
if (cb_data->as_string)
diff --git a/calendar/backends/contacts/e-source-contacts.c b/calendar/backends/contacts/e-source-contacts.c
index c19cc66..8d9364d 100644
--- a/calendar/backends/contacts/e-source-contacts.c
+++ b/calendar/backends/contacts/e-source-contacts.c
@@ -163,7 +163,7 @@ e_source_contacts_set_include_me (ESourceContacts *extension,
{
g_return_if_fail (E_IS_SOURCE_CONTACTS (extension));
- if ((extension->priv->include_me ? 1 : 0) == (include_me ? 1 : 0))
+ if (extension->priv->include_me == include_me)
return;
extension->priv->include_me = include_me;
diff --git a/calendar/backends/http/e-cal-backend-http.c b/calendar/backends/http/e-cal-backend-http.c
index dad22eb..e0b000c 100644
--- a/calendar/backends/http/e-cal-backend-http.c
+++ b/calendar/backends/http/e-cal-backend-http.c
@@ -167,7 +167,8 @@ e_cal_backend_http_constructed (GObject *object)
G_OBJECT_CLASS (e_cal_backend_http_parent_class)->constructed (object);
soup_session = soup_session_sync_new ();
- g_object_set (soup_session,
+ g_object_set (
+ soup_session,
SOUP_SESSION_TIMEOUT, 90,
SOUP_SESSION_SSL_STRICT, TRUE,
SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,
diff --git a/camel/camel-db.c b/camel/camel-db.c
index 779766b..4e53686 100644
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -119,7 +119,7 @@ sync_push_request (CamelSqlite3File *cFile,
if (!cFile->flags) {
/* nothing to sync, might be when xClose is called
- without any pending xSync request */
+ * without any pending xSync request */
g_rec_mutex_unlock (&cFile->sync_mutex);
return;
}
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index d16be54..02c01a0 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -1736,7 +1736,8 @@ camel_filter_driver_filter_message (CamelFilterDriver *driver,
switch (result) {
case CAMEL_SEARCH_ERROR:
- g_prefix_error (&driver->priv->error,
+ g_prefix_error (
+ &driver->priv->error,
_("Execution of filter '%s' failed: "),
rule->name);
goto error;
@@ -1769,7 +1770,8 @@ camel_filter_driver_filter_message (CamelFilterDriver *driver,
}
r = camel_sexp_eval (driver->priv->eval);
if (driver->priv->error != NULL) {
- g_prefix_error (&driver->priv->error,
+ g_prefix_error (
+ &driver->priv->error,
_("Execution of filter '%s' failed: "),
rule->name);
goto error;
diff --git a/camel/camel-imapx-utils.h b/camel/camel-imapx-utils.h
index 80fcfb6..714f6d9 100644
--- a/camel/camel-imapx-utils.h
+++ b/camel/camel-imapx-utils.h
@@ -344,18 +344,18 @@ extern guchar imapx_specials[256];
guchar imapx_is_mask (const gchar *p);
#define imapx_is_text_char(c) \
- ((imapx_specials[((guchar)(c))&0xff] & IMAPX_TYPE_TEXT_CHAR) != 0)
+ ((imapx_specials[((guchar)(c)) & 0xff] & IMAPX_TYPE_TEXT_CHAR) != 0)
#define imapx_is_quoted_char(c) \
- ((imapx_specials[((guchar)(c))&0xff] & IMAPX_TYPE_QUOTED_CHAR) != 0)
+ ((imapx_specials[((guchar)(c)) & 0xff] & IMAPX_TYPE_QUOTED_CHAR) != 0)
#define imapx_is_atom_char(c) \
- ((imapx_specials[((guchar)(c))&0xff] & IMAPX_TYPE_ATOM_CHAR) != 0)
+ ((imapx_specials[((guchar)(c)) & 0xff] & IMAPX_TYPE_ATOM_CHAR) != 0)
#define imapx_is_token_char(c) \
- ((imapx_specials[((guchar)(c))&0xff] & IMAPX_TYPE_TOKEN_CHAR) != 0)
+ ((imapx_specials[((guchar)(c)) & 0xff] & IMAPX_TYPE_TOKEN_CHAR) != 0)
#define imapx_is_notid_char(c) \
- ((imapx_specials[((guchar)(c))&0xff] & IMAPX_TYPE_NOTID_CHAR) != 0)
+ ((imapx_specials[((guchar)(c)) & 0xff] & IMAPX_TYPE_NOTID_CHAR) != 0)
#define imapx_is_atom(s) \
- (imapx_is_mask(s) & IMAPX_TYPE_ATOM_CHAR)
+ (imapx_is_mask (s) & IMAPX_TYPE_ATOM_CHAR)
extern gint camel_imapx_debug_flags;
#define CAMEL_IMAPX_DEBUG_command (1 << 0)
diff --git a/camel/camel-session.c b/camel/camel-session.c
index 302f14e..ebfffff 100644
--- a/camel/camel-session.c
+++ b/camel/camel-session.c
@@ -1291,7 +1291,7 @@ camel_session_alert_user (CamelSession *session,
CamelSessionAlertType type,
const gchar *prompt,
GSList *button_captions,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
CamelSessionClass *class;
@@ -1326,11 +1326,11 @@ camel_session_alert_user (CamelSession *session,
**/
CamelCertTrust
camel_session_trust_prompt (CamelSession *session,
- const gchar *host,
- const gchar *certificate,
- guint32 certificate_errors,
- const GSList *issuers,
- GCancellable *cancellable)
+ const gchar *host,
+ const gchar *certificate,
+ guint32 certificate_errors,
+ const GSList *issuers,
+ GCancellable *cancellable)
{
CamelSessionClass *class;
diff --git a/camel/providers/sendmail/camel-sendmail-settings.c b/camel/providers/sendmail/camel-sendmail-settings.c
index e5221d3..95d377f 100644
--- a/camel/providers/sendmail/camel-sendmail-settings.c
+++ b/camel/providers/sendmail/camel-sendmail-settings.c
@@ -232,7 +232,7 @@ camel_sendmail_settings_set_use_custom_binary (CamelSendmailSettings *settings,
{
g_return_if_fail (CAMEL_IS_SENDMAIL_SETTINGS (settings));
- if ((settings->priv->use_custom_binary ? 1 : 0) == (use_custom_binary ? 1 : 0))
+ if (settings->priv->use_custom_binary == use_custom_binary)
return;
settings->priv->use_custom_binary = use_custom_binary;
@@ -273,7 +273,7 @@ camel_sendmail_settings_set_use_custom_args (CamelSendmailSettings *settings,
{
g_return_if_fail (CAMEL_IS_SENDMAIL_SETTINGS (settings));
- if ((settings->priv->use_custom_args ? 1 : 0) == (use_custom_args ? 1 : 0))
+ if (settings->priv->use_custom_args == use_custom_args)
return;
settings->priv->use_custom_args = use_custom_args;
diff --git a/libebackend/e-backend.c b/libebackend/e-backend.c
index 494100f..89a0818 100644
--- a/libebackend/e-backend.c
+++ b/libebackend/e-backend.c
@@ -354,7 +354,7 @@ e_backend_set_online (EBackend *backend,
g_return_if_fail (E_IS_BACKEND (backend));
/* Avoid unnecessary "notify" signals. */
- if ((online ? 1 : 0) == (backend->priv->online ? 1 : 0))
+ if (backend->priv->online == online)
return;
backend->priv->online = online;
@@ -529,46 +529,57 @@ e_backend_get_user_prompter (EBackend *backend)
**/
ETrustPromptResponse
e_backend_trust_prompt_sync (EBackend *backend,
- const ENamedParameters *parameters,
- GCancellable *cancellable,
- GError **error)
+ const ENamedParameters *parameters,
+ GCancellable *cancellable,
+ GError **error)
{
EUserPrompter *prompter;
gint response;
- g_return_val_if_fail (E_IS_BACKEND (backend), E_TRUST_PROMPT_RESPONSE_UNKNOWN);
- g_return_val_if_fail (parameters != NULL, E_TRUST_PROMPT_RESPONSE_UNKNOWN);
+ g_return_val_if_fail (
+ E_IS_BACKEND (backend), E_TRUST_PROMPT_RESPONSE_UNKNOWN);
+ g_return_val_if_fail (
+ parameters != NULL, E_TRUST_PROMPT_RESPONSE_UNKNOWN);
prompter = e_backend_get_user_prompter (backend);
- g_return_val_if_fail (prompter != NULL, E_TRUST_PROMPT_RESPONSE_UNKNOWN);
-
- /* Just a workaround for libsoup bug about not providing connection certificate
- on failed requests. This is fixed in libsoup since 2.41.3, but let's have this
- for now. I wrote it here to avoid code duplication, and once the libsoup 2.42.0
- will be out all this code, together with other SOUP_CHECK_VERSION usages also
- in evolution, will be removed.
- */
+ g_return_val_if_fail (
+ prompter != NULL, E_TRUST_PROMPT_RESPONSE_UNKNOWN);
+
+ /* Just a workaround for libsoup bug about not providing connection
+ * certificate on failed requests. This is fixed in libsoup since
+ * 2.41.3, but let's have this for now. I wrote it here to avoid
+ * code duplication, and once the libsoup 2.42.0 will be out all
+ * this code, together with other SOUP_CHECK_VERSION usages also
+ * in evolution, will be removed. */
if (!e_named_parameters_get (parameters, "cert")) {
GSList *button_captions = NULL;
const gchar *markup;
gchar *tmp = NULL;
- button_captions = g_slist_append (button_captions, _("_Reject"));
- button_captions = g_slist_append (button_captions, _("Accept _Temporarily"));
- button_captions = g_slist_append (button_captions, _("_Accept Permanently"));
+ button_captions = g_slist_append (
+ button_captions, _("_Reject"));
+ button_captions = g_slist_append (
+ button_captions, _("Accept _Temporarily"));
+ button_captions = g_slist_append (
+ button_captions, _("_Accept Permanently"));
markup = e_named_parameters_get (parameters, "markup");
if (!markup) {
+ const gchar *host;
gchar *bhost;
- bhost = g_strconcat ("<b>", e_named_parameters_get (parameters, "host"), "</b>", NULL);
- tmp = g_strdup_printf (_("SSL certificate for '%s' is not trusted. Do you wish to accept it?"), bhost);
+ host = e_named_parameters_get (parameters, "host");
+ bhost = g_strconcat ("<b>", host, "</b>", NULL);
+ tmp = g_strdup_printf (
+ _("SSL certificate for '%s' is not trusted. "
+ "Do you wish to accept it?"), bhost);
g_free (bhost);
markup = tmp;
}
- response = e_user_prompter_prompt_sync (prompter, "question", _("Certificate trust..."),
+ response = e_user_prompter_prompt_sync (
+ prompter, "question", _("Certificate trust..."),
markup, NULL, TRUE, button_captions, cancellable, NULL);
if (response == 1)
@@ -579,7 +590,9 @@ e_backend_trust_prompt_sync (EBackend *backend,
g_slist_free (button_captions);
g_free (tmp);
} else {
- response = e_user_prompter_extension_prompt_sync (prompter, "ETrustPrompt::trust-prompt", parameters, NULL, cancellable, error);
+ response = e_user_prompter_extension_prompt_sync (
+ prompter, "ETrustPrompt::trust-prompt",
+ parameters, NULL, cancellable, error);
}
if (response == 0)
@@ -611,10 +624,10 @@ e_backend_trust_prompt_sync (EBackend *backend,
**/
void
e_backend_trust_prompt (EBackend *backend,
- const ENamedParameters *parameters,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+ const ENamedParameters *parameters,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
EUserPrompter *prompter;
@@ -624,7 +637,9 @@ e_backend_trust_prompt (EBackend *backend,
prompter = e_backend_get_user_prompter (backend);
g_return_if_fail (prompter != NULL);
- e_user_prompter_extension_prompt (prompter, "ETrustPrompt::trust-prompt", parameters, cancellable, callback, user_data);
+ e_user_prompter_extension_prompt (
+ prompter, "ETrustPrompt::trust-prompt",
+ parameters, cancellable, callback, user_data);
}
/**
@@ -633,8 +648,9 @@ e_backend_trust_prompt (EBackend *backend,
* @result: a #GAsyncResult
* @error: return location for a #GError, or %NULL
*
- * Finishes the operation started with e_backend_trust_prompt(). If
- * an error occurred, the function will set @error and return %E_TRUST_PROMPT_RESPONSE_UNKNOWN.
+ * Finishes the operation started with e_backend_trust_prompt().
+ * If an error occurred, the function will set @error and return
+ * %E_TRUST_PROMPT_RESPONSE_UNKNOWN.
*
* Returns: an #ETrustPromptResponse what user responded
*
@@ -647,18 +663,21 @@ e_backend_trust_prompt (EBackend *backend,
**/
ETrustPromptResponse
e_backend_trust_prompt_finish (EBackend *backend,
- GAsyncResult *result,
- GError **error)
+ GAsyncResult *result,
+ GError **error)
{
EUserPrompter *prompter;
gint response;
- g_return_val_if_fail (E_IS_BACKEND (backend), E_TRUST_PROMPT_RESPONSE_UNKNOWN);
+ g_return_val_if_fail (
+ E_IS_BACKEND (backend), E_TRUST_PROMPT_RESPONSE_UNKNOWN);
prompter = e_backend_get_user_prompter (backend);
- g_return_val_if_fail (prompter != NULL, E_TRUST_PROMPT_RESPONSE_UNKNOWN);
+ g_return_val_if_fail (
+ prompter != NULL, E_TRUST_PROMPT_RESPONSE_UNKNOWN);
- response = e_user_prompter_extension_prompt_finish (prompter, result, NULL, error);
+ response = e_user_prompter_extension_prompt_finish (
+ prompter, result, NULL, error);
if (response == 0)
return E_TRUST_PROMPT_RESPONSE_REJECT;
diff --git a/libebackend/e-server-side-source.c b/libebackend/e-server-side-source.c
index 5862180..2b63346 100644
--- a/libebackend/e-server-side-source.c
+++ b/libebackend/e-server-side-source.c
@@ -1703,7 +1703,7 @@ e_server_side_source_set_allow_auth_prompt (EServerSideSource *source,
{
g_return_if_fail (E_IS_SERVER_SIDE_SOURCE (source));
- if ((source->priv->allow_auth_prompt ? 1 : 0) == (allow_auth_prompt ? 1 : 0))
+ if (source->priv->allow_auth_prompt == allow_auth_prompt)
return;
source->priv->allow_auth_prompt = allow_auth_prompt;
diff --git a/libebackend/e-user-prompter-server-extension.c b/libebackend/e-user-prompter-server-extension.c
index acaa203..b086b75 100644
--- a/libebackend/e-user-prompter-server-extension.c
+++ b/libebackend/e-user-prompter-server-extension.c
@@ -132,9 +132,9 @@ e_user_prompter_server_extension_init (EUserPrompterServerExtension *extension)
**/
gboolean
e_user_prompter_server_extension_prompt (EUserPrompterServerExtension *extension,
- gint prompt_id,
- const gchar *dialog_name,
- const ENamedParameters *parameters)
+ gint prompt_id,
+ const gchar *dialog_name,
+ const ENamedParameters *parameters)
{
EUserPrompterServerExtensionClass *klass;
@@ -163,9 +163,9 @@ e_user_prompter_server_extension_prompt (EUserPrompterServerExtension *extension
**/
void
e_user_prompter_server_extension_response (EUserPrompterServerExtension *extension,
- gint prompt_id,
- gint response,
- const ENamedParameters *values)
+ gint prompt_id,
+ gint response,
+ const ENamedParameters *values)
{
EExtensible *extensible;
EUserPrompterServer *server;
diff --git a/libebackend/e-user-prompter-server-extension.h b/libebackend/e-user-prompter-server-extension.h
index dc4568a..db0baad 100644
--- a/libebackend/e-user-prompter-server-extension.h
+++ b/libebackend/e-user-prompter-server-extension.h
@@ -66,23 +66,27 @@ struct _EUserPrompterServerExtensionClass {
EExtensionClass parent_class;
/* virtual methods */
- void (*register_dialogs) (EExtension *extension,
- struct _EUserPrompterServer *server);
- gboolean (*prompt) (EUserPrompterServerExtension *extension,
- gint prompt_id,
- const gchar *dialog_name,
- const ENamedParameters *parameters);
+ void (*register_dialogs)
+ (EExtension *extension,
+ struct _EUserPrompterServer *server);
+ gboolean (*prompt) (EUserPrompterServerExtension *extension,
+ gint prompt_id,
+ const gchar *dialog_name,
+ const ENamedParameters *parameters);
};
-GType e_user_prompter_server_extension_get_type (void);
-gboolean e_user_prompter_server_extension_prompt (EUserPrompterServerExtension *extension,
- gint prompt_id,
- const gchar *dialog_name,
- const ENamedParameters *parameters);
-void e_user_prompter_server_extension_response (EUserPrompterServerExtension *extension,
- gint prompt_id,
- gint response,
- const ENamedParameters *values);
+GType e_user_prompter_server_extension_get_type
+ (void) G_GNUC_CONST;
+gboolean e_user_prompter_server_extension_prompt
+ (EUserPrompterServerExtension *extension,
+ gint prompt_id,
+ const gchar *dialog_name,
+ const ENamedParameters *parameters);
+void e_user_prompter_server_extension_response
+ (EUserPrompterServerExtension *extension,
+ gint prompt_id,
+ gint response,
+ const ENamedParameters *values);
G_END_DECLS
diff --git a/libebackend/e-user-prompter-server.c b/libebackend/e-user-prompter-server.c
index 2ee9ff8..f4874c4 100644
--- a/libebackend/e-user-prompter-server.c
+++ b/libebackend/e-user-prompter-server.c
@@ -103,15 +103,15 @@ prompt_request_free (gpointer data)
static gint
add_prompt (EUserPrompterServer *server,
- gboolean is_extension_prompt,
- const gchar *type,
- const gchar *title,
- const gchar *primary_text,
- const gchar *secondary_text,
- gboolean use_markup,
- const gchar *const *button_captions,
- const gchar *dialog_name,
- const gchar *const *parameters)
+ gboolean is_extension_prompt,
+ const gchar *type,
+ const gchar *title,
+ const gchar *primary_text,
+ const gchar *secondary_text,
+ gboolean use_markup,
+ const gchar *const *button_captions,
+ const gchar *dialog_name,
+ const gchar *const *parameters)
{
PromptRequest *pr;
gint id;
@@ -147,8 +147,8 @@ add_prompt (EUserPrompterServer *server,
static gboolean
remove_prompt (EUserPrompterServer *server,
- gint prompt_id,
- gboolean *is_extension_prompt)
+ gint prompt_id,
+ gboolean *is_extension_prompt)
{
GSList *iter;
@@ -236,14 +236,14 @@ maybe_schedule_prompt (EUserPrompterServer *server)
static gboolean
user_prompter_server_prompt_cb (EDBusUserPrompter *dbus_prompter,
- GDBusMethodInvocation *invocation,
- const gchar *type,
- const gchar *title,
- const gchar *primary_text,
- const gchar *secondary_text,
- gboolean use_markup,
- const gchar *const *button_captions,
- EUserPrompterServer *server)
+ GDBusMethodInvocation *invocation,
+ const gchar *type,
+ const gchar *title,
+ const gchar *primary_text,
+ const gchar *secondary_text,
+ gboolean use_markup,
+ const gchar *const *button_captions,
+ EUserPrompterServer *server)
{
gint id;
@@ -262,10 +262,10 @@ user_prompter_server_prompt_cb (EDBusUserPrompter *dbus_prompter,
static gboolean
user_prompter_server_extension_prompt_cb (EDBusUserPrompter *dbus_prompter,
- GDBusMethodInvocation *invocation,
- const gchar *dialog_name,
- const gchar *const *parameters,
- EUserPrompterServer *server)
+ GDBusMethodInvocation *invocation,
+ const gchar *dialog_name,
+ const gchar *const *parameters,
+ EUserPrompterServer *server)
{
gint id;
@@ -274,7 +274,8 @@ user_prompter_server_extension_prompt_cb (EDBusUserPrompter *dbus_prompter,
if (!dialog_name || !g_hash_table_lookup (server->priv->extensions, dialog_name)) {
g_rec_mutex_unlock (&server->priv->lock);
- g_dbus_method_invocation_return_error (invocation, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
+ g_dbus_method_invocation_return_error (
+ invocation, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
_("Extension dialog '%s' not found."), dialog_name ? dialog_name : "[null]");
return TRUE;
@@ -360,7 +361,7 @@ user_prompter_server_bus_acquired (EDBusServer *server,
static void
user_prompter_server_quit_server (EDBusServer *server,
- EDBusServerExitCode code)
+ EDBusServerExitCode code)
{
EUserPrompterServerPrivate *priv;
@@ -412,10 +413,12 @@ e_user_prompter_server_init (EUserPrompterServer *server)
g_rec_mutex_init (&server->priv->lock);
- g_signal_connect (server->priv->dbus_prompter, "handle-prompt",
+ g_signal_connect (
+ server->priv->dbus_prompter, "handle-prompt",
G_CALLBACK (user_prompter_server_prompt_cb), server);
- g_signal_connect (server->priv->dbus_prompter, "handle-extension-prompt",
+ g_signal_connect (
+ server->priv->dbus_prompter, "handle-extension-prompt",
G_CALLBACK (user_prompter_server_extension_prompt_cb), server);
}
@@ -451,9 +454,9 @@ e_user_prompter_server_new (void)
**/
void
e_user_prompter_server_response (EUserPrompterServer *server,
- gint prompt_id,
- gint response,
- const ENamedParameters *extension_values)
+ gint prompt_id,
+ gint response,
+ const ENamedParameters *extension_values)
{
gboolean is_extension_prompt = FALSE;
@@ -474,7 +477,8 @@ e_user_prompter_server_response (EUserPrompterServer *server,
values = e_named_parameters_to_strv (extension_values);
- e_dbus_user_prompter_emit_extension_response (server->priv->dbus_prompter, prompt_id, response,
+ e_dbus_user_prompter_emit_extension_response (
+ server->priv->dbus_prompter, prompt_id, response,
(const gchar * const *) values);
if (values)
@@ -513,8 +517,8 @@ e_user_prompter_server_response (EUserPrompterServer *server,
**/
gboolean
e_user_prompter_server_register (EUserPrompterServer *server,
- EExtension *extension,
- const gchar *dialog_name)
+ EExtension *extension,
+ const gchar *dialog_name)
{
g_return_val_if_fail (E_IS_USER_PROMPTER_SERVER (server), FALSE);
g_return_val_if_fail (E_IS_USER_PROMPTER_SERVER_EXTENSION (extension), FALSE);
diff --git a/libebackend/e-user-prompter-server.h b/libebackend/e-user-prompter-server.h
index a48c28b..ba2dfbb 100644
--- a/libebackend/e-user-prompter-server.h
+++ b/libebackend/e-user-prompter-server.h
@@ -74,17 +74,17 @@ struct _EUserPrompterServerClass {
EDBusServerClass parent_class;
/* signals */
- void (* prompt) (EUserPrompterServer *server,
- gint id,
- const gchar *type,
- const gchar *title,
- const gchar *primary_text,
- const gchar *secondary_text,
- gboolean use_markup,
- const GSList *button_captions);
+ void (*prompt) (EUserPrompterServer *server,
+ gint id,
+ const gchar *type,
+ const gchar *title,
+ const gchar *primary_text,
+ const gchar *secondary_text,
+ gboolean use_markup,
+ const GSList *button_captions);
};
-GType e_user_prompter_server_get_type (void);
+GType e_user_prompter_server_get_type (void) G_GNUC_CONST;
EDBusServer * e_user_prompter_server_new (void);
void e_user_prompter_server_response (EUserPrompterServer *server,
gint prompt_id,
diff --git a/libebackend/e-user-prompter.c b/libebackend/e-user-prompter.c
index 2f4df0b..23da640 100644
--- a/libebackend/e-user-prompter.c
+++ b/libebackend/e-user-prompter.c
@@ -94,7 +94,7 @@ typedef struct _PrompterAsyncData {
struct _PrompterAsyncData *async_data,
GCancellable *cancellable,
GError **error);
-
+
/* Internal data */
gint prompt_id;
GMainLoop *main_loop; /* not owned by the structure */
@@ -123,9 +123,9 @@ prompter_async_data_free (PrompterAsyncData *async_data)
static void
user_prompter_response_cb (EDBusUserPrompter *dbus_prompter,
- gint prompt_id,
- gint response_button,
- PrompterAsyncData *async_data)
+ gint prompt_id,
+ gint response_button,
+ PrompterAsyncData *async_data)
{
g_return_if_fail (async_data != NULL);
@@ -137,9 +137,9 @@ user_prompter_response_cb (EDBusUserPrompter *dbus_prompter,
static gboolean
user_prompter_prompt_invoke (EDBusUserPrompter *dbus_prompter,
- struct _PrompterAsyncData *async_data,
- GCancellable *cancellable,
- GError **error)
+ struct _PrompterAsyncData *async_data,
+ GCancellable *cancellable,
+ GError **error)
{
GPtrArray *captions;
GSList *iter;
@@ -158,7 +158,8 @@ user_prompter_prompt_invoke (EDBusUserPrompter *dbus_prompter,
/* NULL-terminated array */
g_ptr_array_add (captions, NULL);
- success = e_dbus_user_prompter_call_prompt_sync (dbus_prompter,
+ success = e_dbus_user_prompter_call_prompt_sync (
+ dbus_prompter,
async_data->type ? async_data->type : "",
async_data->title ? async_data->title : "",
async_data->primary_text ? async_data->primary_text : "",
@@ -176,10 +177,10 @@ user_prompter_prompt_invoke (EDBusUserPrompter *dbus_prompter,
static void
user_prompter_extension_response_cb (EDBusUserPrompter *dbus_prompter,
- gint prompt_id,
- gint response_button,
- const gchar * const *arg_values,
- PrompterAsyncData *async_data)
+ gint prompt_id,
+ gint response_button,
+ const gchar * const *arg_values,
+ PrompterAsyncData *async_data)
{
g_return_if_fail (async_data != NULL);
@@ -193,18 +194,19 @@ user_prompter_extension_response_cb (EDBusUserPrompter *dbus_prompter,
static gboolean
user_prompter_extension_prompt_invoke (EDBusUserPrompter *dbus_prompter,
- struct _PrompterAsyncData *async_data,
- GCancellable *cancellable,
- GError **error)
+ struct _PrompterAsyncData *async_data,
+ GCancellable *cancellable,
+ GError **error)
{
gboolean success;
gchar **params;
g_return_val_if_fail (dbus_prompter != NULL, FALSE);
g_return_val_if_fail (async_data != NULL, FALSE);
-
+
params = e_named_parameters_to_strv (async_data->in_parameters);
- success = e_dbus_user_prompter_call_extension_prompt_sync (dbus_prompter,
+ success = e_dbus_user_prompter_call_extension_prompt_sync (
+ dbus_prompter,
async_data->dialog_name,
(const gchar *const *) params,
&async_data->prompt_id,
@@ -218,8 +220,8 @@ user_prompter_extension_prompt_invoke (EDBusUserPrompter *dbus_prompter,
static void
user_prompter_prompt_thread (GSimpleAsyncResult *simple,
- GObject *object,
- GCancellable *cancellable)
+ GObject *object,
+ GCancellable *cancellable)
{
EDBusUserPrompter *dbus_prompter;
PrompterAsyncData *async_data;
@@ -237,7 +239,7 @@ user_prompter_prompt_thread (GSimpleAsyncResult *simple,
main_context = g_main_context_new ();
/* this way the Response signal is delivered here, not to the main thread's context,
- which can be blocked by the e_user_prompter_prompt_sync() call anyway */
+ * which can be blocked by the e_user_prompter_prompt_sync() call anyway */
g_main_context_push_thread_default (main_context);
dbus_prompter = e_dbus_user_prompter_proxy_new_for_bus_sync (
@@ -252,7 +254,7 @@ user_prompter_prompt_thread (GSimpleAsyncResult *simple,
g_main_context_pop_thread_default (main_context);
/* Make sure the main_context doesn't have pending operations;
- workarounds https://bugzilla.gnome.org/show_bug.cgi?id=690126 */
+ * workarounds https://bugzilla.gnome.org/show_bug.cgi?id=690126 */
while (g_main_context_pending (main_context))
g_main_context_iteration (main_context, FALSE);
@@ -263,7 +265,8 @@ user_prompter_prompt_thread (GSimpleAsyncResult *simple,
return;
}
- handler_id = g_signal_connect (dbus_prompter, async_data->response_signal_name,
+ handler_id = g_signal_connect (
+ dbus_prompter, async_data->response_signal_name,
async_data->response_callback, async_data);
if (!async_data->invoke (dbus_prompter, async_data, cancellable, &local_error)) {
@@ -273,7 +276,7 @@ user_prompter_prompt_thread (GSimpleAsyncResult *simple,
g_main_context_pop_thread_default (main_context);
/* Make sure the main_context doesn't have pending operations;
- workarounds https://bugzilla.gnome.org/show_bug.cgi?id=690126 */
+ * workarounds https://bugzilla.gnome.org/show_bug.cgi?id=690126 */
while (g_main_context_pending (main_context))
g_main_context_iteration (main_context, FALSE);
@@ -297,7 +300,7 @@ user_prompter_prompt_thread (GSimpleAsyncResult *simple,
g_main_context_pop_thread_default (main_context);
/* Make sure the main_context doesn't have pending operations;
- workarounds https://bugzilla.gnome.org/show_bug.cgi?id=690126 */
+ * workarounds https://bugzilla.gnome.org/show_bug.cgi?id=690126 */
while (g_main_context_pending (main_context))
g_main_context_iteration (main_context, FALSE);
@@ -333,15 +336,15 @@ user_prompter_prompt_thread (GSimpleAsyncResult *simple,
**/
void
e_user_prompter_prompt (EUserPrompter *prompter,
- const gchar *type,
- const gchar *title,
- const gchar *primary_text,
- const gchar *secondary_text,
- gboolean use_markup,
- const GSList *button_captions,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+ const gchar *type,
+ const gchar *title,
+ const gchar *primary_text,
+ const gchar *secondary_text,
+ gboolean use_markup,
+ const GSList *button_captions,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
GSimpleAsyncResult *simple;
PrompterAsyncData *async_data;
@@ -395,8 +398,8 @@ e_user_prompter_prompt (EUserPrompter *prompter,
**/
gint
e_user_prompter_prompt_finish (EUserPrompter *prompter,
- GAsyncResult *result,
- GError **error)
+ GAsyncResult *result,
+ GError **error)
{
GSimpleAsyncResult *simple;
PrompterAsyncData *async_data;
@@ -444,14 +447,14 @@ e_user_prompter_prompt_finish (EUserPrompter *prompter,
**/
gint
e_user_prompter_prompt_sync (EUserPrompter *prompter,
- const gchar *type,
- const gchar *title,
- const gchar *primary_text,
- const gchar *secondary_text,
- gboolean use_markup,
- const GSList *button_captions,
- GCancellable *cancellable,
- GError **error)
+ const gchar *type,
+ const gchar *title,
+ const gchar *primary_text,
+ const gchar *secondary_text,
+ gboolean use_markup,
+ const GSList *button_captions,
+ GCancellable *cancellable,
+ GError **error)
{
EAsyncClosure *closure;
GAsyncResult *result;
@@ -461,12 +464,15 @@ e_user_prompter_prompt_sync (EUserPrompter *prompter,
closure = e_async_closure_new ();
- e_user_prompter_prompt (prompter, type, title, primary_text, secondary_text, use_markup, button_captions,
- cancellable, e_async_closure_callback, closure);
+ e_user_prompter_prompt (
+ prompter, type, title, primary_text, secondary_text,
+ use_markup, button_captions, cancellable,
+ e_async_closure_callback, closure);
result = e_async_closure_wait (closure);
- response_button = e_user_prompter_prompt_finish (prompter, result, error);
+ response_button = e_user_prompter_prompt_finish (
+ prompter, result, error);
e_async_closure_free (closure);
@@ -498,11 +504,11 @@ e_user_prompter_prompt_sync (EUserPrompter *prompter,
**/
void
e_user_prompter_extension_prompt (EUserPrompter *prompter,
- const gchar *dialog_name,
- const ENamedParameters *in_parameters,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
+ const gchar *dialog_name,
+ const ENamedParameters *in_parameters,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
{
GSimpleAsyncResult *simple;
PrompterAsyncData *async_data;
@@ -562,9 +568,9 @@ e_user_prompter_extension_prompt (EUserPrompter *prompter,
**/
gint
e_user_prompter_extension_prompt_finish (EUserPrompter *prompter,
- GAsyncResult *result,
- ENamedParameters *out_values,
- GError **error)
+ GAsyncResult *result,
+ ENamedParameters *out_values,
+ GError **error)
{
GSimpleAsyncResult *simple;
PrompterAsyncData *async_data;
@@ -617,11 +623,11 @@ e_user_prompter_extension_prompt_finish (EUserPrompter *prompter,
**/
gint
e_user_prompter_extension_prompt_sync (EUserPrompter *prompter,
- const gchar *dialog_name,
- const ENamedParameters *in_parameters,
- ENamedParameters *out_values,
- GCancellable *cancellable,
- GError **error)
+ const gchar *dialog_name,
+ const ENamedParameters *in_parameters,
+ ENamedParameters *out_values,
+ GCancellable *cancellable,
+ GError **error)
{
EAsyncClosure *closure;
GAsyncResult *result;
@@ -632,7 +638,8 @@ e_user_prompter_extension_prompt_sync (EUserPrompter *prompter,
closure = e_async_closure_new ();
- e_user_prompter_extension_prompt (prompter, dialog_name, in_parameters,
+ e_user_prompter_extension_prompt (
+ prompter, dialog_name, in_parameters,
cancellable, e_async_closure_callback, closure);
result = e_async_closure_wait (closure);
diff --git a/libebackend/e-user-prompter.h b/libebackend/e-user-prompter.h
index 8273b55..f572d4c 100644
--- a/libebackend/e-user-prompter.h
+++ b/libebackend/e-user-prompter.h
@@ -66,46 +66,49 @@ struct _EUserPrompterClass {
GObjectClass parent;
};
-GType e_user_prompter_get_type (void);
-EUserPrompter * e_user_prompter_new (void);
-void e_user_prompter_prompt (EUserPrompter *prompter,
- const gchar *type,
- const gchar *title,
- const gchar *primary_text,
- const gchar *secondary_text,
- gboolean use_markup,
- const GSList *button_captions,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gint e_user_prompter_prompt_finish (EUserPrompter *prompter,
- GAsyncResult *result,
- GError **error);
-gint e_user_prompter_prompt_sync (EUserPrompter *prompter,
- const gchar *type,
- const gchar *title,
- const gchar *primary_text,
- const gchar *secondary_text,
- gboolean use_markup,
- const GSList *button_captions,
- GCancellable *cancellable,
- GError **error);
-void e_user_prompter_extension_prompt (EUserPrompter *prompter,
- const gchar *dialog_name,
- const ENamedParameters *in_parameters,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gint e_user_prompter_extension_prompt_finish (EUserPrompter *prompter,
- GAsyncResult *result,
- ENamedParameters *out_values,
- GError **error);
-gint e_user_prompter_extension_prompt_sync (EUserPrompter *prompter,
- const gchar *dialog_name,
- const ENamedParameters *in_parameters,
- ENamedParameters *out_values,
- GCancellable *cancellable,
- GError **error);
+GType e_user_prompter_get_type (void) G_GNUC_CONST;
+EUserPrompter * e_user_prompter_new (void);
+void e_user_prompter_prompt (EUserPrompter *prompter,
+ const gchar *type,
+ const gchar *title,
+ const gchar *primary_text,
+ const gchar *secondary_text,
+ gboolean use_markup,
+ const GSList *button_captions,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gint e_user_prompter_prompt_finish (EUserPrompter *prompter,
+ GAsyncResult *result,
+ GError **error);
+gint e_user_prompter_prompt_sync (EUserPrompter *prompter,
+ const gchar *type,
+ const gchar *title,
+ const gchar *primary_text,
+ const gchar *secondary_text,
+ gboolean use_markup,
+ const GSList *button_captions,
+ GCancellable *cancellable,
+ GError **error);
+void e_user_prompter_extension_prompt
+ (EUserPrompter *prompter,
+ const gchar *dialog_name,
+ const ENamedParameters *in_parameters,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gint e_user_prompter_extension_prompt_finish
+ (EUserPrompter *prompter,
+ GAsyncResult *result,
+ ENamedParameters *out_values,
+ GError **error);
+gint e_user_prompter_extension_prompt_sync
+ (EUserPrompter *prompter,
+ const gchar *dialog_name,
+ const ENamedParameters *in_parameters,
+ ENamedParameters *out_values,
+ GCancellable *cancellable,
+ GError **error);
G_END_DECLS
diff --git a/libedataserver/e-cancellable-locks.c b/libedataserver/e-cancellable-locks.c
index dc8b11a..fe0f2d6 100644
--- a/libedataserver/e-cancellable-locks.c
+++ b/libedataserver/e-cancellable-locks.c
@@ -36,7 +36,7 @@
static void
cancellable_locks_cancelled_cb (GCancellable *cancellable,
- struct _ECancellableLocksBase *base)
+ struct _ECancellableLocksBase *base)
{
g_return_if_fail (base != NULL);
@@ -98,7 +98,7 @@ e_cancellable_mutex_clear (ECancellableMutex *mutex)
**/
gboolean
e_cancellable_mutex_lock (ECancellableMutex *mutex,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
gulong handler_id;
gboolean res = TRUE;
@@ -117,12 +117,14 @@ e_cancellable_mutex_lock (ECancellableMutex *mutex,
return FALSE;
}
- handler_id = g_signal_connect (cancellable, "cancelled",
+ handler_id = g_signal_connect (
+ cancellable, "cancelled",
G_CALLBACK (cancellable_locks_cancelled_cb), &mutex->base);
while (!g_mutex_trylock (&mutex->mutex)) {
/* recheck once per 10 seconds, just in case */
- g_cond_wait_until (&mutex->base.cond, &mutex->base.cond_mutex,
+ g_cond_wait_until (
+ &mutex->base.cond, &mutex->base.cond_mutex,
g_get_monotonic_time () + (10 * G_TIME_SPAN_SECOND));
if (g_cancellable_is_cancelled (cancellable)) {
@@ -233,7 +235,7 @@ e_cancellable_rec_mutex_clear (ECancellableRecMutex *rec_mutex)
**/
gboolean
e_cancellable_rec_mutex_lock (ECancellableRecMutex *rec_mutex,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
gulong handler_id;
gboolean res = TRUE;
@@ -252,12 +254,14 @@ e_cancellable_rec_mutex_lock (ECancellableRecMutex *rec_mutex,
return FALSE;
}
- handler_id = g_signal_connect (cancellable, "cancelled",
+ handler_id = g_signal_connect (
+ cancellable, "cancelled",
G_CALLBACK (cancellable_locks_cancelled_cb), &rec_mutex->base);
while (!g_rec_mutex_trylock (&rec_mutex->rec_mutex)) {
/* recheck once per 10 seconds, just in case */
- g_cond_wait_until (&rec_mutex->base.cond, &rec_mutex->base.cond_mutex,
+ g_cond_wait_until (
+ &rec_mutex->base.cond, &rec_mutex->base.cond_mutex,
g_get_monotonic_time () + (10 * G_TIME_SPAN_SECOND));
if (g_cancellable_is_cancelled (cancellable)) {
diff --git a/libedataserver/e-cancellable-locks.h b/libedataserver/e-cancellable-locks.h
index 0ccb23c..16e9e78 100644
--- a/libedataserver/e-cancellable-locks.h
+++ b/libedataserver/e-cancellable-locks.h
@@ -47,7 +47,7 @@ gboolean e_cancellable_rec_mutex_lock (ECancellableRecMutex *rec_mutex,
void e_cancellable_rec_mutex_unlock (ECancellableRecMutex *rec_mutex);
/* private structures, members should not be accessed
- otherwise than with above functions */
+ * otherwise than with above functions */
struct _ECancellableLocksBase {
GMutex cond_mutex;
diff --git a/libedataserver/e-client.c b/libedataserver/e-client.c
index eeb0589..83ee751 100644
--- a/libedataserver/e-client.c
+++ b/libedataserver/e-client.c
@@ -661,7 +661,7 @@ e_client_set_readonly (EClient *client,
g_return_if_fail (E_IS_CLIENT (client));
g_rec_mutex_lock (&client->priv->prop_mutex);
- if ((readonly ? 1 : 0) == (client->priv->readonly ? 1 : 0)) {
+ if (client->priv->readonly == readonly) {
g_rec_mutex_unlock (&client->priv->prop_mutex);
return;
}
@@ -701,7 +701,7 @@ e_client_set_online (EClient *client,
e_client_set_capabilities (client, NULL);
g_rec_mutex_lock (&client->priv->prop_mutex);
- if ((is_online ? 1: 0) == (client->priv->online ? 1 : 0)) {
+ if (client->priv->online == is_online) {
g_rec_mutex_unlock (&client->priv->prop_mutex);
return;
}
diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c
index cc19541..f907629 100644
--- a/libedataserver/e-data-server-util.c
+++ b/libedataserver/e-data-server-util.c
@@ -1341,8 +1341,8 @@ e_binding_transform_enum_nick_to_value (GBinding *binding,
*/
gboolean
e_enum_from_string (GType enum_type,
- const gchar *string,
- gint *enum_value)
+ const gchar *string,
+ gint *enum_value)
{
GEnumClass *enum_class;
GEnumValue *ev;
@@ -1387,12 +1387,12 @@ e_enum_from_string (GType enum_type,
*/
const gchar *
e_enum_to_string (GType enum_type,
- gint enum_value)
+ gint enum_value)
{
GEnumClass *enum_class;
const gchar *string = NULL;
guint i;
-
+
enum_class = g_type_class_ref (enum_type);
g_return_val_if_fail (enum_class != NULL, NULL);
@@ -1723,7 +1723,7 @@ e_data_server_util_get_dbus_call_timeout (void)
ENamedParameters *
e_named_parameters_new (void)
{
- return (ENamedParameters*) g_ptr_array_new_with_free_func (g_free);
+ return (ENamedParameters *) g_ptr_array_new_with_free_func (g_free);
}
/**
@@ -1809,7 +1809,7 @@ e_named_parameters_clear (ENamedParameters *parameters)
**/
void
e_named_parameters_assign (ENamedParameters *parameters,
- const ENamedParameters *from)
+ const ENamedParameters *from)
{
g_return_if_fail (parameters != NULL);
@@ -1820,14 +1820,16 @@ e_named_parameters_assign (ENamedParameters *parameters,
GPtrArray *from_array = (GPtrArray *) from;
for (ii = 0; ii < from_array->len; ii++) {
- g_ptr_array_add ((GPtrArray *) parameters, g_strdup (from_array->pdata[ii]));
+ g_ptr_array_add (
+ (GPtrArray *) parameters,
+ g_strdup (from_array->pdata[ii]));
}
}
}
static gint
get_parameter_index (const ENamedParameters *parameters,
- const gchar *name)
+ const gchar *name)
{
GPtrArray *array;
gint ii, name_len;
@@ -1842,8 +1844,13 @@ get_parameter_index (const ENamedParameters *parameters,
for (ii = 0; ii < array->len; ii++) {
const gchar *name_and_value = g_ptr_array_index (array, ii);
- if (name_and_value && g_ascii_strncasecmp (name_and_value, name, name_len) == 0 &&
- name_and_value[name_len] == ':')
+ if (name_and_value == NULL)
+ continue;
+
+ if (name_and_value[name_len] != ':')
+ continue;
+
+ if (g_ascii_strncasecmp (name_and_value, name, name_len) == 0)
return ii;
}
@@ -1866,8 +1873,8 @@ get_parameter_index (const ENamedParameters *parameters,
**/
void
e_named_parameters_set (ENamedParameters *parameters,
- const gchar *name,
- const gchar *value)
+ const gchar *name,
+ const gchar *value)
{
GPtrArray *array;
gint index;
@@ -1910,7 +1917,7 @@ e_named_parameters_set (ENamedParameters *parameters,
**/
const gchar *
e_named_parameters_get (const ENamedParameters *parameters,
- const gchar *name)
+ const gchar *name)
{
gint index;
const gchar *name_and_value;
@@ -1945,9 +1952,9 @@ e_named_parameters_get (const ENamedParameters *parameters,
**/
gboolean
e_named_parameters_test (const ENamedParameters *parameters,
- const gchar *name,
- const gchar *value,
- gboolean case_sensitively)
+ const gchar *name,
+ const gchar *value,
+ gboolean case_sensitively)
{
const gchar *stored_value;
@@ -2003,4 +2010,8 @@ e_named_parameters_unref (ENamedParameters *params)
g_ptr_array_unref ((GPtrArray *) params);
}
-G_DEFINE_BOXED_TYPE (ENamedParameters, e_named_parameters, e_named_parameters_ref, e_named_parameters_unref);
+G_DEFINE_BOXED_TYPE (
+ ENamedParameters,
+ e_named_parameters,
+ e_named_parameters_ref,
+ e_named_parameters_unref);
diff --git a/libedataserver/e-source-mail-submission.c b/libedataserver/e-source-mail-submission.c
index 951db19..1d530e3 100644
--- a/libedataserver/e-source-mail-submission.c
+++ b/libedataserver/e-source-mail-submission.c
@@ -189,7 +189,8 @@ e_source_mail_submission_class_init (ESourceMailSubmissionClass *class)
g_param_spec_boolean (
"replies-to-origin-folder",
"Replies to origin folder",
- "Whether to save replies to folder of the message being replied to, instead of the Sent folder",
+ "Whether to save replies to folder of the message "
+ "being replied to, instead of the Sent folder",
FALSE,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT |
@@ -406,7 +407,7 @@ e_source_mail_submission_set_replies_to_origin_folder (ESourceMailSubmission *ex
{
g_return_if_fail (E_IS_SOURCE_MAIL_SUBMISSION (extension));
- if ((extension->priv->replies_to_origin_folder ? 1 : 0) == (replies_to_origin_folder ? 1 : 0))
+ if (extension->priv->replies_to_origin_folder == replies_to_origin_folder)
return;
extension->priv->replies_to_origin_folder = replies_to_origin_folder;
diff --git a/libedataserver/e-source-registry.c b/libedataserver/e-source-registry.c
index 6503998..ab9b946 100644
--- a/libedataserver/e-source-registry.c
+++ b/libedataserver/e-source-registry.c
@@ -1774,7 +1774,7 @@ exit:
g_main_context_pop_thread_default (main_context);
/* Make sure the main_context doesn't have pending operations;
- workarounds https://bugzilla.gnome.org/show_bug.cgi?id=690126 */
+ * workarounds https://bugzilla.gnome.org/show_bug.cgi?id=690126 */
while (g_main_context_pending (main_context))
g_main_context_iteration (main_context, FALSE);
diff --git a/libedataserver/e-source-webdav.c b/libedataserver/e-source-webdav.c
index 0bbbf8f..67271c0 100644
--- a/libedataserver/e-source-webdav.c
+++ b/libedataserver/e-source-webdav.c
@@ -81,10 +81,10 @@ enum {
PROP_CALENDAR_AUTO_SCHEDULE,
PROP_DISPLAY_NAME,
PROP_EMAIL_ADDRESS,
- PROP_SSL_TRUST,
PROP_RESOURCE_PATH,
PROP_RESOURCE_QUERY,
- PROP_SOUP_URI
+ PROP_SOUP_URI,
+ PROP_SSL_TRUST
};
G_DEFINE_TYPE (
@@ -277,17 +277,17 @@ source_webdav_set_property (GObject *object,
g_value_get_string (value));
return;
- case PROP_SSL_TRUST:
- e_source_webdav_set_ssl_trust (
- E_SOURCE_WEBDAV (object),
- g_value_get_string (value));
- return;
-
case PROP_SOUP_URI:
e_source_webdav_set_soup_uri (
E_SOURCE_WEBDAV (object),
g_value_get_boxed (value));
return;
+
+ case PROP_SSL_TRUST:
+ e_source_webdav_set_ssl_trust (
+ E_SOURCE_WEBDAV (object),
+ g_value_get_string (value));
+ return;
}
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -342,17 +342,17 @@ source_webdav_get_property (GObject *object,
E_SOURCE_WEBDAV (object)));
return;
- case PROP_SSL_TRUST:
- g_value_take_string (
+ case PROP_SOUP_URI:
+ g_value_take_boxed (
value,
- e_source_webdav_dup_ssl_trust (
+ e_source_webdav_dup_soup_uri (
E_SOURCE_WEBDAV (object)));
return;
- case PROP_SOUP_URI:
- g_value_take_boxed (
+ case PROP_SSL_TRUST:
+ g_value_take_string (
value,
- e_source_webdav_dup_soup_uri (
+ e_source_webdav_dup_ssl_trust (
E_SOURCE_WEBDAV (object)));
return;
}
@@ -534,25 +534,26 @@ e_source_webdav_class_init (ESourceWebdavClass *class)
g_object_class_install_property (
object_class,
+ PROP_SOUP_URI,
+ g_param_spec_boxed (
+ "soup-uri",
+ "SoupURI",
+ "WebDAV service as a SoupURI",
+ SOUP_TYPE_URI,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (
+ object_class,
PROP_SSL_TRUST,
g_param_spec_string (
"ssl-trust",
"SSL Trust",
- "SSL certificate trust setting, for invalid server certificates",
+ "SSL certificate trust setting, "
+ "for invalid server certificates",
NULL,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT |
E_SOURCE_PARAM_SETTING));
-
- g_object_class_install_property (
- object_class,
- PROP_SOUP_URI,
- g_param_spec_boxed (
- "soup-uri",
- "SoupURI",
- "WebDAV service as a SoupURI",
- SOUP_TYPE_URI,
- G_PARAM_READWRITE));
}
static void
@@ -1087,7 +1088,7 @@ e_source_webdav_dup_ssl_trust (ESourceWebdav *extension)
**/
void
e_source_webdav_set_ssl_trust (ESourceWebdav *extension,
- const gchar *ssl_trust)
+ const gchar *ssl_trust)
{
g_return_if_fail (E_IS_SOURCE_WEBDAV (extension));
@@ -1175,9 +1176,9 @@ e_source_webdav_set_soup_uri (ESourceWebdav *extension,
static gboolean
decode_ssl_trust (ESourceWebdav *extension,
- ETrustPromptResponse *response,
- gchar **host,
- gchar **hash)
+ ETrustPromptResponse *response,
+ gchar **host,
+ gchar **hash)
{
gchar *ssl_trust, **strv;
@@ -1225,9 +1226,9 @@ decode_ssl_trust (ESourceWebdav *extension,
static gboolean
encode_ssl_trust (ESourceWebdav *extension,
- ETrustPromptResponse response,
- const gchar *host,
- const gchar *hash)
+ ETrustPromptResponse response,
+ const gchar *host,
+ const gchar *hash)
{
gchar *ssl_trust;
const gchar *resp;
@@ -1274,8 +1275,9 @@ encode_ssl_trust (ESourceWebdav *extension,
* #E_TRUST_PROMPT_RESPONSE_UNKNOWN and populates @parameters with necessary
* values for a trust prompt.
*
- * Returns: What to do with SSL connection, where #E_TRUST_PROMPT_RESPONSE_UNKNOWN
- * means 'ask a user, with populated parameters'.
+ * Returns: What to do with SSL connection, where
+ * #E_TRUST_PROMPT_RESPONSE_UNKNOWN means 'ask a user, with
+ * populated parameters'.
*
* Note: The #E_TRUST_PROMPT_RESPONSE_REJECT is returned on any errors, like
* the @message not being with the #SOUP_STATUS_SSL_FAILED status code,
@@ -1285,9 +1287,9 @@ encode_ssl_trust (ESourceWebdav *extension,
**/
ETrustPromptResponse
e_source_webdav_prepare_ssl_trust_prompt (ESourceWebdav *extension,
- SoupMessage *message,
- ESourceRegistry *registry,
- ENamedParameters *parameters)
+ SoupMessage *message,
+ ESourceRegistry *registry,
+ ENamedParameters *parameters)
{
ETrustPromptResponse response;
ESource *source;
@@ -1299,49 +1301,64 @@ e_source_webdav_prepare_ssl_trust_prompt (ESourceWebdav *extension,
gchar *base64, *old_host = NULL, *old_hash = NULL, *cert_errs_str, *markup = NULL;
gint issuer_count;
- g_return_val_if_fail (E_IS_SOURCE_WEBDAV (extension), E_TRUST_PROMPT_RESPONSE_REJECT);
- g_return_val_if_fail (SOUP_IS_MESSAGE (message), E_TRUST_PROMPT_RESPONSE_REJECT);
- g_return_val_if_fail (E_IS_SOURCE_REGISTRY (registry), E_TRUST_PROMPT_RESPONSE_REJECT);
- g_return_val_if_fail (parameters != NULL, E_TRUST_PROMPT_RESPONSE_REJECT);
+ g_return_val_if_fail (
+ E_IS_SOURCE_WEBDAV (extension),
+ E_TRUST_PROMPT_RESPONSE_REJECT);
+ g_return_val_if_fail (
+ SOUP_IS_MESSAGE (message),
+ E_TRUST_PROMPT_RESPONSE_REJECT);
+ g_return_val_if_fail (
+ E_IS_SOURCE_REGISTRY (registry),
+ E_TRUST_PROMPT_RESPONSE_REJECT);
+ g_return_val_if_fail (
+ parameters != NULL,
+ E_TRUST_PROMPT_RESPONSE_REJECT);
if (message->status_code != SOUP_STATUS_SSL_FAILED)
return E_TRUST_PROMPT_RESPONSE_REJECT;
if (!soup_message_get_https_status (message, &cert, &cert_errors) || !cert) {
- /* before libsoup 2.41.3 the certificate was not set on failed requests,
- thus workaround this and do a simple prompt later
- */
- #ifdef SOUP_CHECK_VERSION
- #if SOUP_CHECK_VERSION(2, 41, 3)
+ /* Before libsoup 2.41.3 the certificate was not set on
+ * failed requests, thus workaround this and do a simple
+ * prompt later. */
+#ifdef SOUP_CHECK_VERSION
+#if SOUP_CHECK_VERSION(2, 41, 3)
return E_TRUST_PROMPT_RESPONSE_REJECT;
- #endif
- #endif
+#endif
+#endif
}
soup_uri = soup_message_get_uri (message);
- if (!soup_uri || !soup_uri_get_host (soup_uri))
+
+ if (soup_uri == NULL)
return E_TRUST_PROMPT_RESPONSE_REJECT;
- #ifdef SOUP_CHECK_VERSION
- #if SOUP_CHECK_VERSION(2, 41, 3)
+ if (soup_uri_get_host (soup_uri) == NULL)
+ return E_TRUST_PROMPT_RESPONSE_REJECT;
+
+#ifdef SOUP_CHECK_VERSION
+#if SOUP_CHECK_VERSION(2, 41, 3)
g_return_val_if_fail (cert != NULL, E_TRUST_PROMPT_RESPONSE_REJECT);
g_object_get (cert, "certificate", &bytes, NULL);
- #else
+#else
bytes = g_byte_array_new ();
g_byte_array_append (bytes, (guint8 *) "1", 1);
- #endif
- #else
+#endif
+#else
bytes = g_byte_array_new ();
g_byte_array_append (bytes, (guint8 *) "1", 1);
- #endif
+#endif
- if (!bytes)
+ if (bytes == NULL)
return E_TRUST_PROMPT_RESPONSE_REJECT;
host = soup_uri_get_host (soup_uri);
if (decode_ssl_trust (extension, &response, &old_host, &old_hash)) {
- gchar *hash = g_compute_checksum_for_data (G_CHECKSUM_SHA1, bytes->data, bytes->len);
+ gchar *hash;
+
+ hash = g_compute_checksum_for_data (
+ G_CHECKSUM_SHA1, bytes->data, bytes->len);
if (response != E_TRUST_PROMPT_RESPONSE_UNKNOWN &&
g_strcmp0 (old_host, host) == 0 &&
@@ -1359,49 +1376,73 @@ e_source_webdav_prepare_ssl_trust_prompt (ESourceWebdav *extension,
}
source = e_source_extension_ref_source (E_SOURCE_EXTENSION (extension));
- if (source) {
+ if (source != NULL) {
+ const gchar *display_name;
+ const gchar *parent_uid;
gchar *bhost = g_strconcat ("<b>", host, "</b>", NULL);
gchar *bname = NULL;
- if (e_source_get_parent (source)) {
+ display_name = e_source_get_display_name (source);
+ parent_uid = e_source_get_parent (source);
+
+ if (parent_uid != NULL) {
ESource *parent = NULL;
- parent = e_source_registry_ref_source (registry, e_source_get_parent (source));
+ parent = e_source_registry_ref_source (
+ registry, parent_uid);
+
+ if (parent != NULL) {
+ const gchar *parent_display_name;
- if (parent) {
- bname = g_strconcat ("<b>", e_source_get_display_name (parent), ": ",
- e_source_get_display_name (source), "</b>", NULL);
+ parent_display_name =
+ e_source_get_display_name (parent);
+ bname = g_strdup_printf (
+ "<b>%s: %s</b>",
+ parent_display_name,
+ display_name);
g_object_unref (parent);
}
}
- if (!bname)
- bname = g_strconcat ("<b>", e_source_get_display_name (source), "</b>", NULL);
+ if (bname == NULL)
+ bname = g_strdup_printf ("<b>%s</b>", display_name);
if (e_source_has_extension (source, E_SOURCE_EXTENSION_ADDRESS_BOOK)) {
- /* Translators: The first %s is replaced with a host name, like "www.example.com";
- the second %s is replaced with actual source name, like "On The Web: My Work"
- */
- markup = g_strdup_printf (_("SSL certificate for host '%s', used by address book '%s', is not trusted. Do you wish to accept it?"),
- bhost, bname);
+ /* Translators: The first %s is replaced with a host
+ * name, like "www.example.com"; the second %s is
+ * replaced with actual source name, like
+ * "On The Web: My Work" */
+ markup = g_strdup_printf (
+ _("SSL certificate for host '%s', used by "
+ "address book '%s', is not trusted. Do you "
+ "wish to accept it?"), bhost, bname);
} else if (e_source_has_extension (source, E_SOURCE_EXTENSION_CALENDAR)) {
- /* Translators: The first %s is replaced with a host name, like "www.example.com";
- the second %s is replaced with actual source name, like "On The Web: My Work"
- */
- markup = g_strdup_printf (_("SSL certificate for host '%s', used by calendar '%s', is not trusted. Do you wish to accept it?"),
- bhost, bname);
+ /* Translators: The first %s is replaced with a
+ * host name, like "www.example.com"; the second %s
+ * is replaced with actual source name, like
+ * "On The Web: My Work" */
+ markup = g_strdup_printf (
+ _("SSL certificate for host '%s', used by "
+ "calendar '%s', is not trusted. Do you wish "
+ "to accept it?"), bhost, bname);
} else if (e_source_has_extension (source, E_SOURCE_EXTENSION_MEMO_LIST)) {
- /* Translators: The first %s is replaced with a host name, like "www.example.com";
- the second %s is replaced with actual source name, like "On The Web: My Work"
- */
- markup = g_strdup_printf (_("SSL certificate for host '%s', used by memo list '%s', is not trusted. Do you wish to accept it?"),
- bhost, bname);
+ /* Translators: The first %s is replaced with a
+ * host name, like "www.example.com"; the second %s
+ * is replaced with actual source name, like
+ * "On The Web: My Work" */
+ markup = g_strdup_printf (
+ _("SSL certificate for host '%s', used by "
+ "memo list '%s', is not trusted. Do you wish "
+ "to accept it?"), bhost, bname);
} else if (e_source_has_extension (source, E_SOURCE_EXTENSION_TASK_LIST)) {
- /* Translators: The first %s is replaced with a host name, like "www.example.com";
- the second %s is replaced with actual source name, like "On The Web: My Work"
- */
- markup = g_strdup_printf (_("SSL certificate for host '%s', used by task list '%s', is not trusted. Do you wish to accept it?"),
- bhost, bname);
+ /* Translators: The first %s is replaced with a
+ * host name, like "www.example.com"; the second %s
+ * is replaced with actual source name, like
+ * "On The Web: My Work" */
+ markup = g_strdup_printf (
+ _("SSL certificate for host '%s', used by "
+ "task list '%s', is not trusted. Do you wish "
+ "to accept it?"), bhost, bname);
}
g_object_unref (source);
@@ -1459,8 +1500,8 @@ e_source_webdav_prepare_ssl_trust_prompt (ESourceWebdav *extension,
static void
webdav_extension_changes_written_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
GError *error = NULL;
@@ -1486,8 +1527,8 @@ webdav_extension_changes_written_cb (GObject *source_object,
**/
void
e_source_webdav_store_ssl_trust_prompt (ESourceWebdav *extension,
- SoupMessage *message,
- ETrustPromptResponse response)
+ SoupMessage *message,
+ ETrustPromptResponse response)
{
GTlsCertificate *cert = NULL;
GByteArray *bytes = NULL;
@@ -1504,7 +1545,7 @@ e_source_webdav_store_ssl_trust_prompt (ESourceWebdav *extension,
if (!soup_message_get_https_status (message, &cert, NULL) || !cert) {
/* before libsoup 2.41.3 the certificate was not set on failed requests,
- thus workaround this and store only simple value
+ * thus workaround this and store only simple value
*/
#ifdef SOUP_CHECK_VERSION
#if SOUP_CHECK_VERSION(2, 41, 3)
diff --git a/modules/trust-prompt/certificate-viewer.c b/modules/trust-prompt/certificate-viewer.c
index ce96e50..f74d49c 100644
--- a/modules/trust-prompt/certificate-viewer.c
+++ b/modules/trust-prompt/certificate-viewer.c
@@ -83,9 +83,9 @@ free_priv_struct (gpointer ptr)
static void
begin_section (GtkGrid *add_to,
- const gchar *caption,
- gint *from_row,
- gint for_rows)
+ const gchar *caption,
+ gint *from_row,
+ gint for_rows)
{
GtkWidget *widget;
PangoAttribute *attr;
@@ -100,7 +100,8 @@ begin_section (GtkGrid *add_to,
pango_attr_list_insert (bold, attr);
widget = gtk_label_new (caption);
- g_object_set (G_OBJECT (widget),
+ g_object_set (
+ G_OBJECT (widget),
"hexpand", TRUE,
"halign", GTK_ALIGN_START,
"justify", GTK_JUSTIFY_LEFT,
@@ -121,8 +122,8 @@ begin_section (GtkGrid *add_to,
static GtkWidget *
add_info_label (GtkGrid *add_to,
- const gchar *caption,
- gint *at_row)
+ const gchar *caption,
+ gint *at_row)
{
GtkWidget *widget;
@@ -131,7 +132,8 @@ add_info_label (GtkGrid *add_to,
if (caption) {
widget = gtk_label_new (caption);
- g_object_set (G_OBJECT (widget),
+ g_object_set (
+ G_OBJECT (widget),
"hexpand", FALSE,
"halign", GTK_ALIGN_START,
"justify", GTK_JUSTIFY_LEFT,
@@ -142,7 +144,8 @@ add_info_label (GtkGrid *add_to,
}
widget = gtk_label_new ("");
- g_object_set (G_OBJECT (widget),
+ g_object_set (
+ G_OBJECT (widget),
"hexpand", TRUE,
"halign", GTK_ALIGN_START,
"justify", GTK_JUSTIFY_LEFT,
@@ -159,9 +162,9 @@ add_info_label (GtkGrid *add_to,
static GtkWidget *
add_scrolled_window (GtkGrid *add_to,
- const gchar *caption,
- gint *at_row,
- GtkWidget *add_widget)
+ const gchar *caption,
+ gint *at_row,
+ GtkWidget *add_widget)
{
GtkWidget *widget;
PangoAttribute *attr;
@@ -176,7 +179,8 @@ add_scrolled_window (GtkGrid *add_to,
pango_attr_list_insert (bold, attr);
widget = gtk_label_new (caption);
- g_object_set (G_OBJECT (widget),
+ g_object_set (
+ G_OBJECT (widget),
"hexpand", TRUE,
"halign", GTK_ALIGN_START,
"justify", GTK_JUSTIFY_LEFT,
@@ -190,7 +194,8 @@ add_scrolled_window (GtkGrid *add_to,
(*at_row)++;
widget = gtk_scrolled_window_new (NULL, NULL);
- g_object_set (G_OBJECT (widget),
+ g_object_set (
+ G_OBJECT (widget),
"hexpand", TRUE,
"halign", GTK_ALIGN_FILL,
"vexpand", TRUE,
@@ -214,9 +219,9 @@ add_scrolled_window (GtkGrid *add_to,
static void
set_label_text (GtkWidget *label,
- const gchar *not_part_markup,
- gchar *text,
- guint32 flags)
+ const gchar *not_part_markup,
+ gchar *text,
+ guint32 flags)
{
if (text) {
if ((flags & FLAG_MARKUP) != 0)
@@ -235,8 +240,8 @@ set_label_text (GtkWidget *label,
static void
get_cert_times (CERTCertificate *cert,
- gchar **issued_on,
- gchar **expires_on)
+ gchar **issued_on,
+ gchar **expires_on)
{
PRTime time_issued_on;
PRTime time_expires_on;
@@ -363,7 +368,7 @@ populate_fields_tree (CertificateViewerPriv *priv,
static void
hierarchy_selection_changed_cb (GtkTreeSelection *selection,
- CertificateViewerPriv *priv)
+ CertificateViewerPriv *priv)
{
GtkTreeIter iter;
GtkTreeModel *model;
@@ -402,7 +407,7 @@ hierarchy_selection_changed_cb (GtkTreeSelection *selection,
static void
fields_selection_changed_cb (GtkTreeSelection *selection,
- CertificateViewerPriv *priv)
+ CertificateViewerPriv *priv)
{
GtkTreeIter iter;
GtkTreeModel *model;
@@ -428,7 +433,8 @@ fields_selection_changed_cb (GtkTreeSelection *selection,
gtk_text_buffer_get_start_iter (textbuffer, &text_iter);
- gtk_text_buffer_insert_with_tags (textbuffer, &text_iter,
+ gtk_text_buffer_insert_with_tags (
+ textbuffer, &text_iter,
value, strlen (value),
priv->monospace_tag, NULL);
}
@@ -537,8 +543,8 @@ get_window_title (CERTCertificate *cert)
GtkWidget *
certificate_viewer_new (GtkWindow *parent,
- const CERTCertificate *cert,
- const GSList *issuers_chain_certs)
+ const CERTCertificate *cert,
+ const GSList *issuers_chain_certs)
{
CertificateViewerPriv *priv;
GtkWidget *dialog, *notebook, *widget;
@@ -563,7 +569,8 @@ certificate_viewer_new (GtkWindow *parent,
title = get_window_title (priv->cert);
- dialog = gtk_dialog_new_with_buttons (title, parent,
+ dialog = gtk_dialog_new_with_buttons (
+ title, parent,
GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);
@@ -579,7 +586,8 @@ certificate_viewer_new (GtkWindow *parent,
/* General page */
row = 0;
grid = GTK_GRID (gtk_grid_new ());
- g_object_set (G_OBJECT (grid),
+ g_object_set (
+ G_OBJECT (grid),
"hexpand", TRUE,
"halign", GTK_ALIGN_FILL,
"vexpand", FALSE,
@@ -612,7 +620,8 @@ certificate_viewer_new (GtkWindow *parent,
}
widget = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- g_object_set (G_OBJECT (widget),
+ g_object_set (
+ G_OBJECT (widget),
"hexpand", TRUE,
"halign", GTK_ALIGN_FILL,
"vexpand", FALSE,
@@ -647,7 +656,8 @@ certificate_viewer_new (GtkWindow *parent,
/* Details page */
row = 0;
grid = GTK_GRID (gtk_grid_new ());
- g_object_set (G_OBJECT (grid),
+ g_object_set (
+ G_OBJECT (grid),
"hexpand", TRUE,
"halign", GTK_ALIGN_FILL,
"vexpand", TRUE,
@@ -657,13 +667,16 @@ certificate_viewer_new (GtkWindow *parent,
"column-spacing", 6,
NULL);
- priv->cert_hierarchy_treeview = add_scrolled_window (grid,
+ priv->cert_hierarchy_treeview = add_scrolled_window (
+ grid,
_("Certificate Hierarchy"), &row, gtk_tree_view_new ());
- priv->cert_fields_treeview = add_scrolled_window (grid,
+ priv->cert_fields_treeview = add_scrolled_window (
+ grid,
_("Certificate Fields"), &row, gtk_tree_view_new ());
- priv->cert_field_value_textview = add_scrolled_window (grid,
+ priv->cert_field_value_textview = add_scrolled_window (
+ grid,
_("Field Value"), &row, gtk_text_view_new ());
widget = gtk_label_new (_("Details"));
diff --git a/modules/trust-prompt/e-asn1-object.c b/modules/trust-prompt/e-asn1-object.c
index 7e5f27c..c2d811b 100644
--- a/modules/trust-prompt/e-asn1-object.c
+++ b/modules/trust-prompt/e-asn1-object.c
@@ -647,8 +647,8 @@ create_tbs_certificate_asn1_struct (CERTCertificate *cert,
** }
**
** This is the ASN1 structure we should be dealing with at this point.
- ** The code in this method will assert this is the structure we're dealing
- ** and then add more user friendly text for that field.
+ ** The code in this method will assert this is the structure we're
+ ** dealing and then add more user friendly text for that field.
*/
EASN1Object *sequence = e_asn1_object_new ();
gchar *text;
@@ -669,7 +669,9 @@ create_tbs_certificate_asn1_struct (CERTCertificate *cert,
if (!process_sec_algorithm_id (&cert->signature, &subitem))
return FALSE;
- e_asn1_object_set_display_name (subitem, _("Certificate Signature Algorithm"));
+
+ e_asn1_object_set_display_name (
+ subitem, _("Certificate Signature Algorithm"));
e_asn1_object_append_child (sequence, subitem);
g_object_unref (subitem);
@@ -684,12 +686,12 @@ create_tbs_certificate_asn1_struct (CERTCertificate *cert,
#ifdef notyet
nsCOMPtr < nsIASN1Sequence> validitySequence = new nsNSSASN1Sequence ();
- nssComponent->GetPIPNSSBundleString (NS_LITERAL_STRING ("CertDumpValidity").get (),
- text);
+ nssComponent->GetPIPNSSBundleString (
+ NS_LITERAL_STRING ("CertDumpValidity").get (), text);
validitySequence->SetDisplayName (text);
asn1Objects->AppendElement (validitySequence, PR_FALSE);
- nssComponent->GetPIPNSSBundleString (NS_LITERAL_STRING ("CertDumpNotBefore").get (),
- text);
+ nssComponent->GetPIPNSSBundleString (
+ NS_LITERAL_STRING ("CertDumpNotBefore").get (), text);
nsCOMPtr < nsIX509CertValidity> validityData;
GetValidity (getter_AddRefs (validityData));
PRTime notBefore, notAfter;
@@ -701,8 +703,8 @@ create_tbs_certificate_asn1_struct (CERTCertificate *cert,
if (NS_FAILED (rv))
return rv;
- nssComponent->GetPIPNSSBundleString (NS_LITERAL_STRING ("CertDumpNotAfter").get (),
- text);
+ nssComponent->GetPIPNSSBundleString (
+ NS_LITERAL_STRING ("CertDumpNotAfter").get (), text);
rv = ProcessTime (notAfter, text.get (), validitySequence);
if (NS_FAILED (rv))
return rv;
@@ -717,7 +719,8 @@ create_tbs_certificate_asn1_struct (CERTCertificate *cert,
e_asn1_object_append_child (sequence, subitem);
g_object_unref (subitem);
- if (!process_subject_public_key_info (&cert->subjectPublicKeyInfo, sequence))
+ if (!process_subject_public_key_info (
+ &cert->subjectPublicKeyInfo, sequence))
return FALSE;
/* Is there an issuerUniqueID? */
@@ -770,7 +773,7 @@ create_tbs_certificate_asn1_struct (CERTCertificate *cert,
static gboolean
fill_asn1_from_cert (EASN1Object *asn1,
- CERTCertificate *cert)
+ CERTCertificate *cert)
{
EASN1Object *sequence;
SECItem temp;
@@ -801,8 +804,10 @@ fill_asn1_from_cert (EASN1Object *asn1,
e_asn1_object_append_child (asn1, sequence);
g_object_unref (sequence);
- if (!process_sec_algorithm_id (&cert->signatureWrap.signatureAlgorithm, &sequence))
+ if (!process_sec_algorithm_id (
+ &cert->signatureWrap.signatureAlgorithm, &sequence))
return FALSE;
+
e_asn1_object_set_display_name (
sequence, _("Certificate Signature Algorithm"));
e_asn1_object_append_child (asn1, sequence);
diff --git a/modules/trust-prompt/module-trust-prompt.c b/modules/trust-prompt/module-trust-prompt.c
index 7e2f363..2a7bfe4 100644
--- a/modules/trust-prompt/module-trust-prompt.c
+++ b/modules/trust-prompt/module-trust-prompt.c
@@ -61,7 +61,7 @@ static gboolean trust_prompt_show_trust_prompt (EUserPrompterServerExtension *ex
static void
trust_prompt_register_dialogs (EExtension *extension,
- EUserPrompterServer *server)
+ EUserPrompterServer *server)
{
ETrustPrompt *trust_prompt = E_TRUST_PROMPT (extension);
@@ -77,9 +77,9 @@ trust_prompt_register_dialogs (EExtension *extension,
static gboolean
trust_prompt_prompt (EUserPrompterServerExtension *extension,
- gint prompt_id,
- const gchar *dialog_name,
- const ENamedParameters *parameters)
+ gint prompt_id,
+ const gchar *dialog_name,
+ const ENamedParameters *parameters)
{
if (g_strcmp0 (dialog_name, TRUST_PROMPT_DIALOG) == 0)
return trust_prompt_show_trust_prompt (extension, prompt_id, parameters);
@@ -138,25 +138,25 @@ e_module_unload (GTypeModule *type_module)
/* dialog definitions */
/* ETrustPrompt::trust-prompt
- The dialog expects these parameters:
- "host" - host from which the certificate is received
- "markup" - markup for the trust prompt, if not set, then "SSL certificate for '<b>host</b>' is not trusted. Do you wish to accept it?" is used
- "certificate" - a base64-encoded DER certificate, for which ask on trust
- "certificate-errors" - a hexa-decimal integer (as string) corresponding to GTlsCertificateFlags
-
- It can contain, optionally, chain of issuers:
- "issuer" - a base64-encoded DER certificate, issuer of "certificate"
- "issuer-1" - a base64-encoded DER certificate, issuer of "issuer"
- "issuer-2" - a base64-encoded DER certificate, issuer of "issuer-1"
- and so on
-
- Result of the dialog is:
- 0 - reject
- 1 - accept permanently
- 2 - accept temporarily
- -1 - user didn't choose any of the above
-
- The dialog doesn't provide any additional values in the response.
+ * The dialog expects these parameters:
+ * "host" - host from which the certificate is received
+ * "markup" - markup for the trust prompt, if not set, then "SSL certificate for '<b>host</b>' is not trusted. Do you wish to accept it?" is used
+ * "certificate" - a base64-encoded DER certificate, for which ask on trust
+ * "certificate-errors" - a hexa-decimal integer (as string) corresponding to GTlsCertificateFlags
+ *
+ * It can contain, optionally, chain of issuers:
+ * "issuer" - a base64-encoded DER certificate, issuer of "certificate"
+ * "issuer-1" - a base64-encoded DER certificate, issuer of "issuer"
+ * "issuer-2" - a base64-encoded DER certificate, issuer of "issuer-1"
+ * and so on
+ *
+ * Result of the dialog is:
+ * 0 - reject
+ * 1 - accept permanently
+ * 2 - accept temporarily
+ * -1 - user didn't choose any of the above
+ *
+ * The dialog doesn't provide any additional values in the response.
*/
static gchar *
@@ -237,7 +237,7 @@ trust_prompt_free_certificate (gpointer cert)
static GSList *
trust_prompt_get_issuers (CERTCertDBHandle *certdb,
- const ENamedParameters *parameters)
+ const ENamedParameters *parameters)
{
GSList *issuers = NULL;
CERTCertificate *cert;
@@ -285,8 +285,8 @@ trust_prompt_get_issuers (CERTCertDBHandle *certdb,
static gboolean
trust_prompt_show_trust_prompt (EUserPrompterServerExtension *extension,
- gint prompt_id,
- const ENamedParameters *parameters)
+ gint prompt_id,
+ const ENamedParameters *parameters)
{
const gchar *host, *markup, *base64_cert, *cert_errs_str;
gchar *fingerprint, *reason;
diff --git a/modules/trust-prompt/trust-prompt-gtk.c b/modules/trust-prompt/trust-prompt-gtk.c
index d05194d..b986131 100644
--- a/modules/trust-prompt/trust-prompt-gtk.c
+++ b/modules/trust-prompt/trust-prompt-gtk.c
@@ -31,10 +31,10 @@
static void
trust_prompt_add_info_line (GtkGrid *grid,
- const gchar *label_text,
- const gchar *value_text,
- gboolean ellipsize,
- gint *at_row)
+ const gchar *label_text,
+ const gchar *value_text,
+ gboolean ellipsize,
+ gint *at_row)
{
GtkWidget *widget;
PangoAttribute *attr;
@@ -59,7 +59,8 @@ trust_prompt_add_info_line (GtkGrid *grid,
widget = gtk_label_new (value_text);
gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.0);
- g_object_set (G_OBJECT (widget),
+ g_object_set (
+ G_OBJECT (widget),
"hexpand", TRUE,
"halign", GTK_ALIGN_FILL,
"justify", GTK_JUSTIFY_LEFT,
@@ -99,15 +100,16 @@ trust_prompt_free_issuers (gpointer issuers)
static void
trust_prompt_response_cb (GtkWidget *dialog,
- gint response,
- EUserPrompterServerExtension *extension)
+ gint response,
+ EUserPrompterServerExtension *extension)
{
gint prompt_id;
if (response == GTK_RESPONSE_HELP) {
GtkWidget *viewer;
- viewer = certificate_viewer_new (GTK_WINDOW (dialog),
+ viewer = certificate_viewer_new (
+ GTK_WINDOW (dialog),
g_object_get_data (G_OBJECT (dialog), TRUST_PROMP_CERT_KEY),
g_object_get_data (G_OBJECT (dialog), TRUST_PROMP_ISSUERS_KEY));
@@ -134,13 +136,13 @@ trust_prompt_response_cb (GtkWidget *dialog,
gboolean
trust_prompt_show (EUserPrompterServerExtension *extension,
- gint prompt_id,
- const gchar *host,
- const gchar *markup,
- const CERTCertificate *pcert,
- const gchar *cert_fingerprint,
- const gchar *reason,
- const GSList *pissuers)
+ gint prompt_id,
+ const gchar *host,
+ const gchar *markup,
+ const CERTCertificate *pcert,
+ const gchar *cert_fingerprint,
+ const gchar *reason,
+ const GSList *pissuers)
{
GtkWidget *dialog, *widget;
GtkGrid *grid;
@@ -156,7 +158,8 @@ trust_prompt_show (EUserPrompterServerExtension *extension,
iter->data = CERT_DupCertificate (iter->data);
}
- dialog = gtk_dialog_new_with_buttons (_("Certificate trust..."), NULL, 0,
+ dialog = gtk_dialog_new_with_buttons (
+ _("Certificate trust..."), NULL, 0,
_("_View Certificate"), GTK_RESPONSE_HELP,
_("_Reject"), GTK_RESPONSE_REJECT,
_("Accept _Temporarily"), GTK_RESPONSE_YES,
@@ -166,7 +169,8 @@ trust_prompt_show (EUserPrompterServerExtension *extension,
gtk_window_set_icon_name (GTK_WINDOW (dialog), "evolution");
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
- grid = g_object_new (GTK_TYPE_GRID,
+ grid = g_object_new (
+ GTK_TYPE_GRID,
"orientation", GTK_ORIENTATION_HORIZONTAL,
"row-homogeneous", FALSE,
"row-spacing", 2,
@@ -183,7 +187,8 @@ trust_prompt_show (EUserPrompterServerExtension *extension,
gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (grid));
widget = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG);
- g_object_set (G_OBJECT (widget),
+ g_object_set (
+ G_OBJECT (widget),
"vexpand", FALSE,
"valign", GTK_ALIGN_START,
"xpad", 6,
diff --git a/modules/trust-prompt/trust-prompt.h b/modules/trust-prompt/trust-prompt.h
index cbcae58..c80f62c 100644
--- a/modules/trust-prompt/trust-prompt.h
+++ b/modules/trust-prompt/trust-prompt.h
@@ -23,8 +23,8 @@
#include <libebackend/libebackend.h>
/* This shows a trust-prompt. The function may not block and returns whether
- showed a dialog or not. It calls e_user_prompter_server_extension_response()
- when a user responded to the dialog with one of the TRUST_PROMPT_RESPONSE values.
+ * showed a dialog or not. It calls e_user_prompter_server_extension_response()
+ * when a user responded to the dialog with one of the TRUST_PROMPT_RESPONSE values.
*/
#define TRUST_PROMPT_RESPONSE_UNKNOWN -1
@@ -42,4 +42,4 @@ trust_prompt_show (EUserPrompterServerExtension *extension,
const gchar *reason,
const GSList *pissuers);
-#endif /* TRUST_PROMPT_H */
\ No newline at end of file
+#endif /* TRUST_PROMPT_H */
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 9f3f677..deadcdf 100644
--- a/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
+++ b/services/evolution-source-registry/evolution-source-registry-migrate-sources.c
@@ -1049,13 +1049,15 @@ migrate_parse_url_rename_params (CamelURL *url)
g_datalist_set_data_full (&url->params, key, value, g_free);
}
- /* missing "security-method" means STARTTLS, as it was the default value in 3.4- */
+ /* Missing "security-method" means STARTTLS,
+ * as it was the default value prior to 3.6. */
if (!g_datalist_get_data (&url->params, "security-method")) {
GEnumClass *enum_class;
GEnumValue *enum_value;
gchar *value = NULL;
- enum_class = g_type_class_ref (CAMEL_TYPE_NETWORK_SECURITY_METHOD);
+ enum_class = g_type_class_ref (
+ CAMEL_TYPE_NETWORK_SECURITY_METHOD);
enum_value = g_enum_get_value (
enum_class,
CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT);
@@ -1065,7 +1067,8 @@ migrate_parse_url_rename_params (CamelURL *url)
g_warn_if_reached ();
g_type_class_unref (enum_class);
- g_datalist_set_data_full (&url->params, "security-method", value, g_free);
+ g_datalist_set_data_full (
+ &url->params, "security-method", value, g_free);
}
/* A few more adjustments...
diff --git a/services/evolution-source-registry/evolution-source-registry.c b/services/evolution-source-registry/evolution-source-registry.c
index 9c60ad8..567052c 100644
--- a/services/evolution-source-registry/evolution-source-registry.c
+++ b/services/evolution-source-registry/evolution-source-registry.c
@@ -104,9 +104,9 @@ reload:
g_print ("Reloading...\n");
/* It's possible the Reload is called after restore, where
- the ~/.config/evolution/sources directory can be missing,
- thus create it, because e_server_side_source_get_user_dir()
- may have its static variable already set to non-NULL value.
+ * the ~/.config/evolution/sources directory can be missing,
+ * thus create it, because e_server_side_source_get_user_dir()
+ * may have its static variable already set to non-NULL value.
*/
config_dir = e_get_user_config_dir ();
dirname = g_build_filename (config_dir, "sources", NULL);
diff --git a/services/evolution-user-prompter/evolution-user-prompter.c b/services/evolution-user-prompter/evolution-user-prompter.c
index 8a35c3d..64c64b8 100644
--- a/services/evolution-user-prompter/evolution-user-prompter.c
+++ b/services/evolution-user-prompter/evolution-user-prompter.c
@@ -40,7 +40,9 @@ main (gint argc,
e_gdbus_templates_init_main_thread ();
server = e_user_prompter_server_new ();
- g_signal_connect (server, "prompt", G_CALLBACK (prompt_user_show), NULL);
+ g_signal_connect (
+ server, "prompt",
+ G_CALLBACK (prompt_user_show), NULL);
g_print ("Prompter is up and running...\n");
diff --git a/services/evolution-user-prompter/prompt-user-gtk.c b/services/evolution-user-prompter/prompt-user-gtk.c
index 257a73b..7094731 100644
--- a/services/evolution-user-prompter/prompt-user-gtk.c
+++ b/services/evolution-user-prompter/prompt-user-gtk.c
@@ -31,19 +31,20 @@
void
prompt_user_init (gint *argc,
- gchar ***argv)
+ gchar ***argv)
{
gtk_init (argc, argv);
}
static void
message_response_cb (GtkWidget *dialog,
- gint button,
- EUserPrompterServer *server)
+ gint button,
+ EUserPrompterServer *server)
{
gint prompt_id;
- prompt_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (dialog), E_USER_PROMPTER_ID_KEY));
+ prompt_id = GPOINTER_TO_INT (g_object_get_data (
+ G_OBJECT (dialog), E_USER_PROMPTER_ID_KEY));
gtk_widget_destroy (dialog);
@@ -54,20 +55,23 @@ message_response_cb (GtkWidget *dialog,
void
prompt_user_show (EUserPrompterServer *server,
- gint id,
- const gchar *type,
- const gchar *title,
- const gchar *primary_text,
- const gchar *secondary_text,
- gboolean use_markup,
- const GSList *button_captions)
+ gint id,
+ const gchar *type,
+ const gchar *title,
+ const gchar *primary_text,
+ const gchar *secondary_text,
+ gboolean use_markup,
+ const GSList *button_captions)
{
GtkMessageType ntype = GTK_MESSAGE_OTHER;
GtkWidget *message;
- gint index;
+ gint index = 0;
const GSList *iter;
- g_return_if_fail (server != NULL);
+ g_return_if_fail (E_IS_USER_PROMPTER_SERVER (server));
+
+ if (primary_text == NULL)
+ primary_text = "";
if (type) {
if (g_ascii_strcasecmp (type, "info") == 0)
@@ -81,11 +85,14 @@ prompt_user_show (EUserPrompterServer *server,
}
if (use_markup) {
- message = gtk_message_dialog_new_with_markup (NULL, 0, ntype, GTK_BUTTONS_NONE, "%s", "");
- gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (message), primary_text ? primary_text : "");
- } else
- message = gtk_message_dialog_new (NULL, 0, ntype, GTK_BUTTONS_NONE,
- "%s", primary_text ? primary_text : "");
+ message = gtk_message_dialog_new_with_markup (
+ NULL, 0, ntype, GTK_BUTTONS_NONE, "%s", "");
+ gtk_message_dialog_set_markup (
+ GTK_MESSAGE_DIALOG (message), primary_text);
+ } else {
+ message = gtk_message_dialog_new (
+ NULL, 0, ntype, GTK_BUTTONS_NONE, "%s", primary_text);
+ }
/* To show dialog on a taskbar */
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (message), FALSE);
@@ -94,25 +101,34 @@ prompt_user_show (EUserPrompterServer *server,
if (secondary_text && *secondary_text) {
if (use_markup)
- gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (message),
+ gtk_message_dialog_format_secondary_markup (
+ GTK_MESSAGE_DIALOG (message),
"%s", secondary_text);
else
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
+ gtk_message_dialog_format_secondary_text (
+ GTK_MESSAGE_DIALOG (message),
"%s", secondary_text);
}
g_object_set (message, "resizable", TRUE, NULL);
- for (index = 0, iter = button_captions; iter; index++, iter = iter->next) {
- gtk_dialog_add_button (GTK_DIALOG (message), iter->data, index);
+ for (iter = button_captions; iter != NULL; iter = iter->next) {
+ gtk_dialog_add_button (
+ GTK_DIALOG (message), iter->data, index++);
}
if (index == 0)
- gtk_dialog_add_button (GTK_DIALOG (message), _("_Dismiss"), index);
+ gtk_dialog_add_button (
+ GTK_DIALOG (message), _("_Dismiss"), index);
- g_object_set_data (G_OBJECT (message), E_USER_PROMPTER_ID_KEY, GINT_TO_POINTER (id));
+ g_object_set_data (
+ G_OBJECT (message),
+ E_USER_PROMPTER_ID_KEY,
+ GINT_TO_POINTER (id));
- g_signal_connect (message, "response", G_CALLBACK (message_response_cb), server);
+ g_signal_connect (
+ message, "response",
+ G_CALLBACK (message_response_cb), server);
gtk_widget_show (message);
}
diff --git a/services/evolution-user-prompter/prompt-user.h b/services/evolution-user-prompter/prompt-user.h
index 23a840d..c0c58fd 100644
--- a/services/evolution-user-prompter/prompt-user.h
+++ b/services/evolution-user-prompter/prompt-user.h
@@ -27,7 +27,7 @@ prompt_user_init (gint *argc,
gchar ***argv);
/* This is called when a request is initiated. The callback should not block,
- and when a user responds, the e_user_prompter_server_response() should be called.
+ * and when a user responds, the e_user_prompter_server_response() should be called.
*/
void
diff --git a/tests/libebook/client/test-client-add-contact.c b/tests/libebook/client/test-client-add-contact.c
index 1a07fbc..88015a2 100644
--- a/tests/libebook/client/test-client-add-contact.c
+++ b/tests/libebook/client/test-client-add-contact.c
@@ -10,7 +10,7 @@ static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 }
static void
test_add_contact_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EContact *contact;
@@ -28,7 +28,7 @@ add_contact_cb (GObject *source_object,
GAsyncResult *result,
gpointer user_data)
{
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
GError *error = NULL;
gchar *uid;
@@ -43,7 +43,7 @@ add_contact_cb (GObject *source_object,
static void
test_add_contact_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EContact *contact;
@@ -51,7 +51,6 @@ test_add_contact_async (ETestServerFixture *fixture,
book_client = E_TEST_SERVER_UTILS_SERVICE (fixture, EBookClient);
-
vcard = new_vcard_from_test_case ("simple-1");
contact = e_contact_new_from_vcard (vcard);
g_free (vcard);
@@ -71,10 +70,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBookClient/AddContact/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_add_contact_sync, e_test_server_utils_teardown);
- g_test_add ("/EBookClient/AddContact/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_add_contact_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/AddContact/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_add_contact_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/AddContact/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_add_contact_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/client/test-client-async.c b/tests/libebook/client/test-client-async.c
index 0568517..25d11c9 100644
--- a/tests/libebook/client/test-client-async.c
+++ b/tests/libebook/client/test-client-async.c
@@ -16,7 +16,7 @@ print_all_uids_cb (GObject *source_object,
EBookClient *book_client;
GSList *uids = NULL, *u;
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
book_client = E_BOOK_CLIENT (source_object);
g_return_if_fail (book_client != NULL);
@@ -46,7 +46,7 @@ print_all_emails_cb (GObject *source_object,
gchar *sexp;
GSList *contacts = NULL, *c;
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
book_client = E_BOOK_CLIENT (source_object);
g_return_if_fail (book_client != NULL);
@@ -74,7 +74,7 @@ print_all_emails_cb (GObject *source_object,
static void
print_all_emails (EBookClient *book_client,
- GMainLoop *loop)
+ GMainLoop *loop)
{
EBookQuery *query;
gchar *sexp;
@@ -96,7 +96,7 @@ print_email_cb (GObject *source_object,
EBookClient *book_client;
EContact *contact = NULL;
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
book_client = E_BOOK_CLIENT (source_object);
g_return_if_fail (book_client != NULL);
@@ -113,7 +113,9 @@ print_email_cb (GObject *source_object,
}
static void
-print_one_email (EBookClient *book_client, GSList *uids, GMainLoop *loop)
+print_one_email (EBookClient *book_client,
+ GSList *uids,
+ GMainLoop *loop)
{
const gchar *uid = uids->data;
@@ -124,13 +126,13 @@ print_one_email (EBookClient *book_client, GSList *uids, GMainLoop *loop)
static void
contacts_added_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
EBookClient *book_client;
GError *error = NULL;
GSList *uids = NULL, *l;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
book_client = E_BOOK_CLIENT (source_object);
@@ -151,7 +153,7 @@ contacts_added_cb (GObject *source_object,
static void
add_contacts (EBookClient *book_client,
- GMainLoop *loop)
+ GMainLoop *loop)
{
GSList *contacts = NULL;
EContact *contact;
@@ -189,7 +191,7 @@ add_contacts (EBookClient *book_client,
static void
test_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
@@ -209,8 +211,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBookClient/AsyncTest", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/AsyncTest", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/client/test-client-custom-summary.c b/tests/libebook/client/test-client-custom-summary.c
index dc0abd0..d0e856a 100644
--- a/tests/libebook/client/test-client-custom-summary.c
+++ b/tests/libebook/client/test-client-custom-summary.c
@@ -26,7 +26,6 @@
#include "client-test-utils.h"
#include "e-test-server-utils.h"
-
typedef struct {
ETestServerClosure closure;
EBookQuery *query;
@@ -39,7 +38,7 @@ static GList *closures = NULL;
static void
client_test_data_free (gpointer p)
{
- ClientTestData *data = (ClientTestData *)p;
+ ClientTestData *data = (ClientTestData *) p;
if (data->query)
e_book_query_unref (data->query);
@@ -47,27 +46,29 @@ client_test_data_free (gpointer p)
}
static void
-setup_custom_book (ESource *scratch,
- ETestServerClosure *closure)
+setup_custom_book (ESource *scratch,
+ ETestServerClosure *closure)
{
ESourceBackendSummarySetup *setup;
g_type_ensure (E_TYPE_SOURCE_BACKEND_SUMMARY_SETUP);
setup = e_source_get_extension (scratch, E_SOURCE_EXTENSION_BACKEND_SUMMARY_SETUP);
- e_source_backend_summary_setup_set_summary_fields (setup,
- E_CONTACT_FULL_NAME,
- E_CONTACT_FAMILY_NAME,
- E_CONTACT_EMAIL_1,
- E_CONTACT_TEL,
- E_CONTACT_EMAIL,
- 0);
- e_source_backend_summary_setup_set_indexed_fields (setup,
- E_CONTACT_TEL, E_BOOK_INDEX_SUFFIX,
- E_CONTACT_FULL_NAME, E_BOOK_INDEX_PREFIX,
- E_CONTACT_FULL_NAME, E_BOOK_INDEX_SUFFIX,
- E_CONTACT_FAMILY_NAME, E_BOOK_INDEX_PREFIX,
- E_CONTACT_FAMILY_NAME, E_BOOK_INDEX_SUFFIX,
- 0);
+ e_source_backend_summary_setup_set_summary_fields (
+ setup,
+ E_CONTACT_FULL_NAME,
+ E_CONTACT_FAMILY_NAME,
+ E_CONTACT_EMAIL_1,
+ E_CONTACT_TEL,
+ E_CONTACT_EMAIL,
+ 0);
+ e_source_backend_summary_setup_set_indexed_fields (
+ setup,
+ E_CONTACT_TEL, E_BOOK_INDEX_SUFFIX,
+ E_CONTACT_FULL_NAME, E_BOOK_INDEX_PREFIX,
+ E_CONTACT_FULL_NAME, E_BOOK_INDEX_SUFFIX,
+ E_CONTACT_FAMILY_NAME, E_BOOK_INDEX_PREFIX,
+ E_CONTACT_FAMILY_NAME, E_BOOK_INDEX_SUFFIX,
+ 0);
}
static void
@@ -103,7 +104,7 @@ setup_book (EBookClient *book_client)
static void
search_test (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
GSList *results = NULL;
@@ -127,7 +128,7 @@ search_test (ETestServerFixture *fixture,
static void
uid_test (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
GSList *results = NULL;
@@ -160,46 +161,57 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
-
/* Add search tests that fetch contacts */
- add_client_test ("/client/search/exact/fn", search_test,
- e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_IS, "James Brown"),
- 1);
- add_client_test ("/client/search/exact/name", search_test,
- e_book_query_vcard_field_test(EVC_N, E_BOOK_QUERY_IS, "Janet"),
- 1);
- add_client_test ("/client/search/prefix/fn", search_test,
- e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_BEGINS_WITH, "B"),
- 2);
- add_client_test ("/client/search/prefix/fn/percent", search_test,
- e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_BEGINS_WITH, "%"),
- 1);
- add_client_test ("/client/search/suffix/phone", search_test,
- e_book_query_field_test (E_CONTACT_TEL, E_BOOK_QUERY_ENDS_WITH, "999"),
- 2);
- add_client_test ("/client/search/suffix/email", search_test,
- e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_ENDS_WITH, "jackson.com"),
- 2);
+ add_client_test (
+ "/client/search/exact/fn", search_test,
+ e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_IS, "James Brown"),
+ 1);
+ add_client_test (
+ "/client/search/exact/name", search_test,
+ e_book_query_vcard_field_test (EVC_N, E_BOOK_QUERY_IS, "Janet"),
+ 1);
+ add_client_test (
+ "/client/search/prefix/fn", search_test,
+ e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_BEGINS_WITH, "B"),
+ 2);
+ add_client_test (
+ "/client/search/prefix/fn/percent", search_test,
+ e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_BEGINS_WITH, "%"),
+ 1);
+ add_client_test (
+ "/client/search/suffix/phone", search_test,
+ e_book_query_field_test (E_CONTACT_TEL, E_BOOK_QUERY_ENDS_WITH, "999"),
+ 2);
+ add_client_test (
+ "/client/search/suffix/email", search_test,
+ e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_ENDS_WITH, "jackson.com"),
+ 2);
/* Add search tests that fetch uids */
- add_client_test ("/client/search-uid/exact/fn", uid_test,
- e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_IS, "James Brown"),
- 1);
- add_client_test ("/client/search-uid/exact/name", uid_test,
- e_book_query_vcard_field_test(EVC_N, E_BOOK_QUERY_IS, "Janet"),
- 1);
- add_client_test ("/client/search-uid/prefix/fn", uid_test,
- e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_BEGINS_WITH, "B"),
- 2);
- add_client_test ("/client/search-uid/prefix/fn/percent", uid_test,
- e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_BEGINS_WITH, "%"),
- 1);
- add_client_test ("/client/search-uid/suffix/phone", uid_test,
- e_book_query_field_test (E_CONTACT_TEL, E_BOOK_QUERY_ENDS_WITH, "999"),
- 2);
- add_client_test ("/client/search-uid/suffix/email", uid_test,
- e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_ENDS_WITH, "jackson.com"),
- 2);
+ add_client_test (
+ "/client/search-uid/exact/fn", uid_test,
+ e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_IS, "James Brown"),
+ 1);
+ add_client_test (
+ "/client/search-uid/exact/name", uid_test,
+ e_book_query_vcard_field_test (EVC_N, E_BOOK_QUERY_IS, "Janet"),
+ 1);
+ add_client_test (
+ "/client/search-uid/prefix/fn", uid_test,
+ e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_BEGINS_WITH, "B"),
+ 2);
+ add_client_test (
+ "/client/search-uid/prefix/fn/percent", uid_test,
+ e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_BEGINS_WITH, "%"),
+ 1);
+ add_client_test (
+ "/client/search-uid/suffix/phone", uid_test,
+ e_book_query_field_test (E_CONTACT_TEL, E_BOOK_QUERY_ENDS_WITH, "999"),
+ 2);
+ add_client_test (
+ "/client/search-uid/suffix/email", uid_test,
+ e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_ENDS_WITH, "jackson.com"),
+ 2);
ret = e_test_server_utils_run ();
diff --git a/tests/libebook/client/test-client-get-contact-uids.c b/tests/libebook/client/test-client-get-contact-uids.c
index 51bfd1c..42411cd 100644
--- a/tests/libebook/client/test-client-get-contact-uids.c
+++ b/tests/libebook/client/test-client-get-contact-uids.c
@@ -8,10 +8,9 @@
static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
-
static void
test_get_contact_uids_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EContact *contact = NULL;
@@ -44,10 +43,10 @@ test_get_contact_uids_sync (ETestServerFixture *fixture,
static void
contacts_ready_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
GError *error = NULL;
GSList *contacts = NULL;
@@ -65,7 +64,7 @@ contacts_ready_cb (GObject *source_object,
static void
test_get_contact_uids_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EContact *contact = NULL;
@@ -99,10 +98,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBookClient/GetContactUids/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_contact_uids_sync, e_test_server_utils_teardown);
- g_test_add ("/EBookClient/GetContactUids/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_contact_uids_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/GetContactUids/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_contact_uids_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/GetContactUids/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_contact_uids_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/client/test-client-get-contact.c b/tests/libebook/client/test-client-get-contact.c
index e19ff94..e1ec210 100644
--- a/tests/libebook/client/test-client-get-contact.c
+++ b/tests/libebook/client/test-client-get-contact.c
@@ -8,10 +8,9 @@
static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 };
-
static void
test_get_contact_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EContact *contact = NULL;
@@ -31,13 +30,13 @@ contact_ready_cb (GObject *source_object,
GAsyncResult *result,
gpointer user_data)
{
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
EContact *contact;
GError *error = NULL;
if (!e_book_client_get_contact_finish (E_BOOK_CLIENT (source_object), result, &contact, &error)) {
g_error ("get contact finish: %s", error->message);
- }
+ }
g_object_unref (contact);
g_main_loop_quit (loop);
@@ -45,7 +44,7 @@ contact_ready_cb (GObject *source_object,
static void
test_get_contact_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EContact *contact = NULL;
@@ -56,14 +55,14 @@ test_get_contact_async (ETestServerFixture *fixture,
g_error ("Failed to get contact");
}
- e_book_client_get_contact (book_client,
- e_contact_get_const (contact, E_CONTACT_UID),
- NULL, contact_ready_cb, fixture->loop);
+ e_book_client_get_contact (
+ book_client,
+ e_contact_get_const (contact, E_CONTACT_UID),
+ NULL, contact_ready_cb, fixture->loop);
g_object_unref (contact);
g_main_loop_run (fixture->loop);
}
-
gint
main (gint argc,
gchar **argv)
@@ -73,10 +72,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBookClient/GetContact/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_contact_sync, e_test_server_utils_teardown);
- g_test_add ("/EBookClient/GetContact/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_contact_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/GetContact/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_contact_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/GetContact/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_contact_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/client/test-client-get-revision.c b/tests/libebook/client/test-client-get-revision.c
index 6bc2970..5a2d8f1 100644
--- a/tests/libebook/client/test-client-get-revision.c
+++ b/tests/libebook/client/test-client-get-revision.c
@@ -47,7 +47,7 @@ get_revision_compare_cycle (EBookClient *client)
static void
test_get_revision (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
gint i;
@@ -68,8 +68,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBookClient/GetRevision", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_revision, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/GetRevision", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_revision, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/client/test-client-get-view.c b/tests/libebook/client/test-client-get-view.c
index e4c9f3a..a3a25d6 100644
--- a/tests/libebook/client/test-client-get-view.c
+++ b/tests/libebook/client/test-client-get-view.c
@@ -33,9 +33,9 @@ objects_removed (EBookClientView *view,
static void
complete (EBookClientView *view,
const GError *error,
- gpointer user_data)
+ gpointer user_data)
{
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
e_book_client_view_stop (view, NULL);
g_object_unref (view);
@@ -45,7 +45,7 @@ complete (EBookClientView *view,
static void
setup_and_start_view (EBookClientView *view,
- GMainLoop *loop)
+ GMainLoop *loop)
{
GError *error = NULL;
@@ -67,7 +67,7 @@ get_view_cb (GObject *source_object,
GAsyncResult *result,
gpointer user_data)
{
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
EBookClientView *view;
GError *error = NULL;
@@ -90,7 +90,7 @@ setup_book (EBookClient *book_client)
static void
test_get_view_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookQuery *query;
@@ -119,7 +119,7 @@ test_get_view_sync (ETestServerFixture *fixture,
static void
test_get_view_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookQuery *query;
@@ -147,10 +147,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBookClient/GetBookClientView/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_view_sync, e_test_server_utils_teardown);
- g_test_add ("/EBookClient/GetBookClientView/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_view_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/GetBookClientView/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_view_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/GetBookClientView/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_view_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/client/test-client-modify-contact.c b/tests/libebook/client/test-client-modify-contact.c
index 10817d4..4a9a95b 100644
--- a/tests/libebook/client/test-client-modify-contact.c
+++ b/tests/libebook/client/test-client-modify-contact.c
@@ -36,7 +36,7 @@ verify_modify (EContact *contact)
static void
test_modify_contact_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
GError *error = NULL;
@@ -61,13 +61,11 @@ test_modify_contact_sync (ETestServerFixture *fixture,
g_object_unref (contact);
}
-
typedef struct {
EContact *contact;
GMainLoop *loop;
} ModifyData;
-
static void
contact_ready_cb (GObject *source_object,
GAsyncResult *result,
@@ -75,7 +73,7 @@ contact_ready_cb (GObject *source_object,
{
EContact *contact;
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
if (!e_book_client_get_contact_finish (E_BOOK_CLIENT (source_object), result, &contact, &error))
g_error ("get contact finish: %s", error->message);
@@ -91,20 +89,21 @@ contact_modified_cb (GObject *source_object,
GAsyncResult *result,
gpointer user_data)
{
- ModifyData *data = (ModifyData *)user_data;
+ ModifyData *data = (ModifyData *) user_data;
GError *error = NULL;
if (!e_book_client_modify_contact_finish (E_BOOK_CLIENT (source_object), result, &error))
g_error ("modify contact finish: %s", error->message);
- e_book_client_get_contact (E_BOOK_CLIENT (source_object),
- e_contact_get_const (data->contact, E_CONTACT_UID),
- NULL, contact_ready_cb, data->loop);
+ e_book_client_get_contact (
+ E_BOOK_CLIENT (source_object),
+ e_contact_get_const (data->contact, E_CONTACT_UID),
+ NULL, contact_ready_cb, data->loop);
}
static void
test_modify_contact_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EContact *contact;
@@ -135,10 +134,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBookClient/ModifyContact/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_modify_contact_sync, e_test_server_utils_teardown);
- g_test_add ("/EBookClient/ModifyContact/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_modify_contact_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/ModifyContact/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_modify_contact_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/ModifyContact/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_modify_contact_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/client/test-client-photo-is-uri.c b/tests/libebook/client/test-client-photo-is-uri.c
index 1621e26..a310b2b 100644
--- a/tests/libebook/client/test-client-photo-is-uri.c
+++ b/tests/libebook/client/test-client-photo-is-uri.c
@@ -300,7 +300,7 @@ add_contact_uri (EBookClient *book)
static void
test_photo_is_uri (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookClientView *view;
@@ -336,8 +336,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBookClient/PhotoIsUri", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_photo_is_uri, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/PhotoIsUri", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_photo_is_uri, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/client/test-client-refresh.c b/tests/libebook/client/test-client-refresh.c
index 8ef2385..397ed1f 100644
--- a/tests/libebook/client/test-client-refresh.c
+++ b/tests/libebook/client/test-client-refresh.c
@@ -17,7 +17,7 @@ async_refresh_result_ready (GObject *source_object,
{
EBookClient *book_client;
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
book_client = E_BOOK_CLIENT (source_object);
@@ -26,12 +26,12 @@ async_refresh_result_ready (GObject *source_object,
return;
}
- g_main_loop_quit (loop);
+ g_main_loop_quit (loop);
}
static void
test_refresh_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
GError *error = NULL;
@@ -56,7 +56,7 @@ main_loop_fail_timeout (gpointer unused)
static void
test_refresh_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
@@ -67,7 +67,7 @@ test_refresh_async (ETestServerFixture *fixture,
return;
e_client_refresh (E_CLIENT (book_client), NULL, async_refresh_result_ready, fixture->loop);
- g_timeout_add (5 * 1000, (GSourceFunc)main_loop_fail_timeout, NULL);
+ g_timeout_add (5 * 1000, (GSourceFunc) main_loop_fail_timeout, NULL);
g_main_loop_run (fixture->loop);
}
@@ -80,10 +80,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBookClient/Refresh/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_refresh_sync, e_test_server_utils_teardown);
- g_test_add ("/EBookClient/Refresh/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_refresh_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/Refresh/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_refresh_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/Refresh/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_refresh_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/client/test-client-remove-contact-by-uid.c b/tests/libebook/client/test-client-remove-contact-by-uid.c
index a9dd9cc..7bfcac4 100644
--- a/tests/libebook/client/test-client-remove-contact-by-uid.c
+++ b/tests/libebook/client/test-client-remove-contact-by-uid.c
@@ -9,7 +9,7 @@ static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 }
static void
test_remove_contact_by_uid_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
GError *error = NULL;
@@ -45,7 +45,7 @@ remove_contact_by_uid_cb (GObject *source_object,
GAsyncResult *result,
gpointer user_data)
{
- RemoveData *data = (RemoveData *)user_data;
+ RemoveData *data = (RemoveData *) user_data;
GError *error = NULL;
EContact *contact = NULL;
@@ -63,7 +63,7 @@ remove_contact_by_uid_cb (GObject *source_object,
static void
test_remove_contact_by_uid_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EContact *contact = NULL;
@@ -96,10 +96,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBookClient/RemoveContactByUid/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_remove_contact_by_uid_sync, e_test_server_utils_teardown);
- g_test_add ("/EBookClient/RemoveContactByUid/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_remove_contact_by_uid_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/RemoveContactByUid/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_remove_contact_by_uid_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/RemoveContactByUid/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_remove_contact_by_uid_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/client/test-client-remove-contact.c b/tests/libebook/client/test-client-remove-contact.c
index 23bd215..2649f09 100644
--- a/tests/libebook/client/test-client-remove-contact.c
+++ b/tests/libebook/client/test-client-remove-contact.c
@@ -9,7 +9,7 @@ static ETestServerClosure book_closure = { E_TEST_SERVER_ADDRESS_BOOK, NULL, 0 }
static void
test_remove_contact_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
GError *error = NULL;
@@ -47,7 +47,7 @@ remove_contact_cb (GObject *source_object,
GAsyncResult *result,
gpointer user_data)
{
- RemoveData *data = (RemoveData *)user_data;
+ RemoveData *data = (RemoveData *) user_data;
GError *error = NULL;
EContact *contact = NULL;
@@ -65,7 +65,7 @@ remove_contact_cb (GObject *source_object,
static void
test_remove_contact_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EContact *contact = NULL;
@@ -89,7 +89,6 @@ test_remove_contact_async (ETestServerFixture *fixture,
g_free (uid);
}
-
gint
main (gint argc,
gchar **argv)
@@ -99,10 +98,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBookClient/RemoveContact/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_remove_contact_sync, e_test_server_utils_teardown);
- g_test_add ("/EBookClient/RemoveContact/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_remove_contact_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/RemoveContact/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_remove_contact_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/RemoveContact/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_remove_contact_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/client/test-client-remove-contacts.c b/tests/libebook/client/test-client-remove-contacts.c
index bc9a3be..1520fd0 100644
--- a/tests/libebook/client/test-client-remove-contacts.c
+++ b/tests/libebook/client/test-client-remove-contacts.c
@@ -56,7 +56,7 @@ fill_book_client (EBookClient *book_client,
static void
test_remove_contacts_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
GError *error = NULL;
@@ -87,7 +87,7 @@ remove_contacts_cb (GObject *source_object,
gpointer user_data)
{
GError *error = NULL;
- RemoveData *data = (RemoveData *)user_data;
+ RemoveData *data = (RemoveData *) user_data;
if (!e_book_client_remove_contacts_finish (E_BOOK_CLIENT (source_object), result, &error))
g_error ("remove contacts finish: %s", error->message);
@@ -98,7 +98,7 @@ remove_contacts_cb (GObject *source_object,
static void
test_remove_contacts_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
GSList *uids = NULL;
@@ -128,10 +128,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBookClient/RemoveContacts/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_remove_contacts_sync, e_test_server_utils_teardown);
- g_test_add ("/EBookClient/RemoveContacts/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_remove_contacts_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/RemoveContacts/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_remove_contacts_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/RemoveContacts/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_remove_contacts_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/client/test-client-revision-view.c b/tests/libebook/client/test-client-revision-view.c
index 2301a69..f99a5b1 100644
--- a/tests/libebook/client/test-client-revision-view.c
+++ b/tests/libebook/client/test-client-revision-view.c
@@ -64,7 +64,7 @@ print_contact (EContact *contact)
static void
finish_test (EBookClientView *view,
- GMainLoop *loop)
+ GMainLoop *loop)
{
e_book_client_view_stop (view, NULL);
g_object_unref (view);
@@ -75,9 +75,9 @@ finish_test (EBookClientView *view,
static void
objects_added (EBookClientView *view,
const GSList *contacts,
- gpointer user_data)
+ gpointer user_data)
{
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
const GSList *l;
for (l = contacts; l; l = l->next) {
@@ -118,7 +118,7 @@ complete (EBookClientView *view,
static void
setup_and_start_view (EBookClientView *view,
- GMainLoop *loop)
+ GMainLoop *loop)
{
GError *error = NULL;
GSList *field_list;
@@ -151,7 +151,7 @@ get_view_cb (GObject *source_object,
{
EBookClientView *view;
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
if (!e_book_client_get_view_finish (E_BOOK_CLIENT (source_object), result, &view, &error))
g_error ("get view finish: %s", error->message);
@@ -161,7 +161,7 @@ get_view_cb (GObject *source_object,
static void
test_revision_view_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookQuery *query;
@@ -190,7 +190,7 @@ test_revision_view_sync (ETestServerFixture *fixture,
static void
test_revision_view_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookQuery *query;
@@ -218,10 +218,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBookClient/RevisionView/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_revision_view_sync, e_test_server_utils_teardown);
- g_test_add ("/EBookClient/RevisionView/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_revision_view_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/RevisionView/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_revision_view_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/RevisionView/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_revision_view_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/client/test-client-suppress-notifications.c b/tests/libebook/client/test-client-suppress-notifications.c
index 1bae38b..86aeb02 100644
--- a/tests/libebook/client/test-client-suppress-notifications.c
+++ b/tests/libebook/client/test-client-suppress-notifications.c
@@ -28,7 +28,7 @@ setup_book (EBookClient *book_client)
static void
finish_test (EBookClientView *view,
- GMainLoop *loop)
+ GMainLoop *loop)
{
e_book_client_view_stop (view, NULL);
g_object_unref (view);
@@ -39,10 +39,10 @@ finish_test (EBookClientView *view,
static void
objects_added (EBookClientView *view,
const GSList *contacts,
- gpointer user_data)
+ gpointer user_data)
{
const GSList *l;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
/* We quit the mainloop and the test succeeds if we get the notification
* for the contact we add after loading the view completes */
@@ -83,7 +83,7 @@ complete (EBookClientView *view,
static void
setup_and_start_view (EBookClientView *view,
- GMainLoop *loop)
+ GMainLoop *loop)
{
GError *error = NULL;
@@ -112,7 +112,7 @@ get_view_cb (GObject *source_object,
GAsyncResult *result,
gpointer user_data)
{
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
EBookClientView *view;
GError *error = NULL;
@@ -125,7 +125,7 @@ get_view_cb (GObject *source_object,
static void
test_suppress_notifications_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookQuery *query;
@@ -154,7 +154,7 @@ test_suppress_notifications_sync (ETestServerFixture *fixture,
static void
test_suppress_notifications_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookQuery *query;
@@ -182,10 +182,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBookClient/SuppressNotifications/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_suppress_notifications_sync, e_test_server_utils_teardown);
- g_test_add ("/EBookClient/SuppressNotifications/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_suppress_notifications_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/SuppressNotifications/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_suppress_notifications_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/SuppressNotifications/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_suppress_notifications_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/client/test-client-uid-only-view.c b/tests/libebook/client/test-client-uid-only-view.c
index 0332740..2f83fb2 100644
--- a/tests/libebook/client/test-client-uid-only-view.c
+++ b/tests/libebook/client/test-client-uid-only-view.c
@@ -136,7 +136,7 @@ print_contact (EContact *contact)
static void
finish_test (EBookClientView *view,
- GMainLoop *loop)
+ GMainLoop *loop)
{
e_book_client_view_stop (view, NULL);
g_object_unref (view);
@@ -147,10 +147,10 @@ finish_test (EBookClientView *view,
static void
objects_added (EBookClientView *view,
const GSList *contacts,
- gpointer user_data)
+ gpointer user_data)
{
const GSList *l;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
for (l = contacts; l; l = l->next) {
EContact *contact = l->data;
@@ -194,7 +194,7 @@ complete (EBookClientView *view,
static void
setup_and_start_view (EBookClientView *view,
- GMainLoop *loop)
+ GMainLoop *loop)
{
GError *error = NULL;
GSList uid_field_list = { 0, };
@@ -228,7 +228,7 @@ get_view_cb (GObject *source_object,
{
EBookClientView *view;
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
if (!e_book_client_get_view_finish (E_BOOK_CLIENT (source_object), result, &view, &error)) {
g_error ("get view finish: %s", error->message);
@@ -239,14 +239,14 @@ get_view_cb (GObject *source_object,
static void
test_get_view_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookQuery *query;
EBookClientView *view;
gchar *sexp;
GError *error = NULL;
- UIDOnlyClosure *closure = (UIDOnlyClosure *)user_data;
+ UIDOnlyClosure *closure = (UIDOnlyClosure *) user_data;
uids_only = closure->uids_only;
@@ -271,12 +271,12 @@ test_get_view_sync (ETestServerFixture *fixture,
static void
test_get_view_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookQuery *query;
gchar *sexp;
- UIDOnlyClosure *closure = (UIDOnlyClosure *)user_data;
+ UIDOnlyClosure *closure = (UIDOnlyClosure *) user_data;
uids_only = closure->uids_only;
@@ -293,7 +293,6 @@ test_get_view_async (ETestServerFixture *fixture,
g_main_loop_run (fixture->loop);
}
-
gint
main (gint argc,
gchar **argv)
@@ -303,15 +302,19 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBookClient/UidOnlyView/Sync/AllData", ETestServerFixture, &book_closure_all_data,
- e_test_server_utils_setup, test_get_view_sync, e_test_server_utils_teardown);
- g_test_add ("/EBookClient/UidOnlyView/Sync/UidsOnly", ETestServerFixture, &book_closure_uids_only,
- e_test_server_utils_setup, test_get_view_sync, e_test_server_utils_teardown);
-
- g_test_add ("/EBookClient/UidOnlyView/Async/AllData", ETestServerFixture, &book_closure_all_data,
- e_test_server_utils_setup, test_get_view_async, e_test_server_utils_teardown);
- g_test_add ("/EBookClient/UidOnlyView/Async/UidsOnly", ETestServerFixture, &book_closure_uids_only,
- e_test_server_utils_setup, test_get_view_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/UidOnlyView/Sync/AllData", ETestServerFixture, &book_closure_all_data,
+ e_test_server_utils_setup, test_get_view_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/UidOnlyView/Sync/UidsOnly", ETestServerFixture, &book_closure_uids_only,
+ e_test_server_utils_setup, test_get_view_sync, e_test_server_utils_teardown);
+
+ g_test_add (
+ "/EBookClient/UidOnlyView/Async/AllData", ETestServerFixture, &book_closure_all_data,
+ e_test_server_utils_setup, test_get_view_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/UidOnlyView/Async/UidsOnly", ETestServerFixture, &book_closure_uids_only,
+ e_test_server_utils_setup, test_get_view_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/client/test-client.c b/tests/libebook/client/test-client.c
index 69e2a03..06e4298 100644
--- a/tests/libebook/client/test-client.c
+++ b/tests/libebook/client/test-client.c
@@ -79,7 +79,7 @@ print_all_emails (EBookClient *book)
static void
test_client (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
@@ -103,7 +103,6 @@ test_client (ETestServerFixture *fixture,
print_all_uids (book_client);
}
-
gint
main (gint argc,
gchar **argv)
@@ -113,8 +112,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBookClient/BasicTest", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_client, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBookClient/BasicTest", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_client, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/test-ebook-add-contact.c b/tests/libebook/test-ebook-add-contact.c
index 2921d1c..f2bb534 100644
--- a/tests/libebook/test-ebook-add-contact.c
+++ b/tests/libebook/test-ebook-add-contact.c
@@ -10,7 +10,7 @@ static ETestServerClosure book_closure =
static void
test_add_contact_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
EContact *contact;
@@ -26,7 +26,7 @@ test_add_contact_sync (ETestServerFixture *fixture,
static void
test_add_contact_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
gchar *vcard;
@@ -53,10 +53,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBook/AddContact/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_add_contact_sync, e_test_server_utils_teardown);
- g_test_add ("/EBook/AddContact/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_add_contact_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/AddContact/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_add_contact_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/AddContact/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_add_contact_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/test-ebook-commit-contact.c b/tests/libebook/test-ebook-commit-contact.c
index 1d5f9b1..83aadaa 100644
--- a/tests/libebook/test-ebook-commit-contact.c
+++ b/tests/libebook/test-ebook-commit-contact.c
@@ -11,7 +11,6 @@ static ETestServerClosure book_closure =
#define EMAIL_ADD "foo bar com"
-
/* Global data */
static EBook *book = NULL;
static gchar *uid = NULL;
@@ -54,7 +53,7 @@ commit_verify_cb (EBookTestClosure *closure)
static void
test_commit_contact_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EContact *contact;
@@ -75,7 +74,7 @@ test_commit_contact_sync (ETestServerFixture *fixture,
static void
test_commit_contact_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EContact *contact;
@@ -104,10 +103,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBook/CommitContact/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_commit_contact_sync, e_test_server_utils_teardown);
- g_test_add ("/EBook/CommitContact/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_commit_contact_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/CommitContact/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_commit_contact_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/CommitContact/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_commit_contact_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/test-ebook-get-book-view.c b/tests/libebook/test-ebook-get-book-view.c
index 4ae4ed9..0fb728b 100644
--- a/tests/libebook/test-ebook-get-book-view.c
+++ b/tests/libebook/test-ebook-get-book-view.c
@@ -54,7 +54,7 @@ static void
view_complete (EBookView *book_view,
EBookViewStatus status,
const gchar *error_msg,
- GMainLoop *loop)
+ GMainLoop *loop)
{
e_book_view_stop (book_view);
g_object_unref (book_view);
@@ -63,7 +63,7 @@ view_complete (EBookView *book_view,
static void
setup_and_start_view (EBookView *view,
- GMainLoop *loop)
+ GMainLoop *loop)
{
g_signal_connect (view, "contacts_added", G_CALLBACK (contacts_added), NULL);
g_signal_connect (view, "contacts_removed", G_CALLBACK (contacts_removed), NULL);
@@ -91,7 +91,7 @@ setup_book (EBook *book)
static void
test_get_book_view_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
EBookQuery *query;
@@ -120,7 +120,7 @@ main_loop_fail_timeout (gpointer unused)
static void
test_get_book_view_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
EBookQuery *query;
@@ -134,7 +134,7 @@ test_get_book_view_async (ETestServerFixture *fixture,
book, query,
(GSourceFunc) get_book_view_cb, fixture->loop);
- g_timeout_add (5 * 1000, (GSourceFunc)main_loop_fail_timeout, NULL);
+ g_timeout_add (5 * 1000, (GSourceFunc) main_loop_fail_timeout, NULL);
g_main_loop_run (fixture->loop);
e_book_query_unref (query);
}
@@ -148,10 +148,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBook/GetBookView/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_book_view_sync, e_test_server_utils_teardown);
- g_test_add ("/EBook/GetBookView/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_book_view_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/GetBookView/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_book_view_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/GetBookView/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_book_view_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/test-ebook-get-contact.c b/tests/libebook/test-ebook-get-contact.c
index e8e8dfc..5f19d37 100644
--- a/tests/libebook/test-ebook-get-contact.c
+++ b/tests/libebook/test-ebook-get-contact.c
@@ -11,7 +11,7 @@ static ETestServerClosure book_closure =
static void
test_get_contact_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
gchar *uid;
@@ -26,7 +26,7 @@ test_get_contact_sync (ETestServerFixture *fixture,
static void
test_get_contact_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
gchar *uid;
@@ -42,7 +42,6 @@ test_get_contact_async (ETestServerFixture *fixture,
g_main_loop_run (fixture->loop);
}
-
gint
main (gint argc,
gchar **argv)
@@ -52,10 +51,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBook/GetContact/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_contact_sync, e_test_server_utils_teardown);
- g_test_add ("/EBook/GetContact/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_contact_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/GetContact/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_contact_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/GetContact/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_contact_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/test-ebook-get-required-fields.c b/tests/libebook/test-ebook-get-required-fields.c
index 9ed46f5..a6abf77 100644
--- a/tests/libebook/test-ebook-get-required-fields.c
+++ b/tests/libebook/test-ebook-get-required-fields.c
@@ -40,10 +40,9 @@ get_required_fields_cb (EBookTestClosure *closure)
g_main_loop_quit ((GMainLoop *) (closure->user_data));
}
-
static void
test_get_required_fields_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
GList *fields;
@@ -59,7 +58,7 @@ test_get_required_fields_sync (ETestServerFixture *fixture,
static void
test_get_required_fields_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
@@ -78,10 +77,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBook/GetRequiredFields/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_required_fields_sync, e_test_server_utils_teardown);
- g_test_add ("/EBook/GetRequiredFields/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_required_fields_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/GetRequiredFields/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_required_fields_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/GetRequiredFields/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_required_fields_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/test-ebook-get-static-capabilities.c b/tests/libebook/test-ebook-get-static-capabilities.c
index dd39d73..0c6ca1e 100644
--- a/tests/libebook/test-ebook-get-static-capabilities.c
+++ b/tests/libebook/test-ebook-get-static-capabilities.c
@@ -11,7 +11,7 @@ static ETestServerClosure book_closure =
static void
test_get_static_capabilities_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
const gchar *caps;
@@ -31,8 +31,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBook/GetStaticCapabilities/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_static_capabilities_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/GetStaticCapabilities/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_static_capabilities_sync, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/test-ebook-get-supported-auth-methods.c b/tests/libebook/test-ebook-get-supported-auth-methods.c
index 82f708b..bfb8436 100644
--- a/tests/libebook/test-ebook-get-supported-auth-methods.c
+++ b/tests/libebook/test-ebook-get-supported-auth-methods.c
@@ -40,10 +40,9 @@ get_supported_auth_methods_cb (EBookTestClosure *closure)
g_main_loop_quit ((GMainLoop *) (closure->user_data));
}
-
static void
test_get_supported_auth_methods_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
GList *auth_methods;
@@ -67,7 +66,7 @@ main_loop_fail_timeout (gpointer unused)
static void
test_get_supported_auth_methods_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
@@ -76,7 +75,7 @@ test_get_supported_auth_methods_async (ETestServerFixture *fixture,
ebook_test_utils_book_async_get_supported_auth_methods (
book, (GSourceFunc) get_supported_auth_methods_cb, fixture->loop);
- g_timeout_add (5 * 1000, (GSourceFunc)main_loop_fail_timeout, NULL);
+ g_timeout_add (5 * 1000, (GSourceFunc) main_loop_fail_timeout, NULL);
g_main_loop_run (fixture->loop);
}
@@ -89,10 +88,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBook/GetSupportedAuthMethods/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_supported_auth_methods_sync, e_test_server_utils_teardown);
- g_test_add ("/EBook/GetSupportedAuthMethods/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_supported_auth_methods_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/GetSupportedAuthMethods/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_supported_auth_methods_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/GetSupportedAuthMethods/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_supported_auth_methods_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/test-ebook-get-supported-fields.c b/tests/libebook/test-ebook-get-supported-fields.c
index 7e10d1b..5c2e042 100644
--- a/tests/libebook/test-ebook-get-supported-fields.c
+++ b/tests/libebook/test-ebook-get-supported-fields.c
@@ -42,7 +42,7 @@ get_supported_fields_cb (EBookTestClosure *closure)
static void
test_get_supported_fields_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
GList *fields;
@@ -59,7 +59,7 @@ test_get_supported_fields_sync (ETestServerFixture *fixture,
static void
test_get_supported_fields_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
@@ -79,10 +79,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBook/GetSupportedFields/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_supported_fields_sync, e_test_server_utils_teardown);
- g_test_add ("/EBook/GetSupportedFields/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_get_supported_fields_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/GetSupportedFields/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_supported_fields_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/GetSupportedFields/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_get_supported_fields_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/test-ebook-remove-contact-by-id.c b/tests/libebook/test-ebook-remove-contact-by-id.c
index c76a498..a0091f9 100644
--- a/tests/libebook/test-ebook-remove-contact-by-id.c
+++ b/tests/libebook/test-ebook-remove-contact-by-id.c
@@ -10,7 +10,7 @@ static ETestServerClosure book_closure =
static void
test_remove_contact_by_id_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
gchar *uid;
@@ -34,8 +34,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBook/RemoveContactById/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_remove_contact_by_id_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/RemoveContactById/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_remove_contact_by_id_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/test-ebook-remove-contact.c b/tests/libebook/test-ebook-remove-contact.c
index 609a9b3..566b9df 100644
--- a/tests/libebook/test-ebook-remove-contact.c
+++ b/tests/libebook/test-ebook-remove-contact.c
@@ -10,7 +10,7 @@ static ETestServerClosure book_closure =
static void
test_remove_contact_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
EContact *contact_final = NULL;
@@ -30,7 +30,7 @@ test_remove_contact_sync (ETestServerFixture *fixture,
static void
test_remove_contact_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
EContact *contact_final = NULL;
@@ -59,10 +59,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBook/RemoveContact/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_remove_contact_sync, e_test_server_utils_teardown);
- g_test_add ("/EBook/RemoveContact/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_remove_contact_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/RemoveContact/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_remove_contact_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/RemoveContact/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_remove_contact_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libebook/test-ebook-remove-contacts.c b/tests/libebook/test-ebook-remove-contacts.c
index c34d452..fb35bb8 100644
--- a/tests/libebook/test-ebook-remove-contacts.c
+++ b/tests/libebook/test-ebook-remove-contacts.c
@@ -10,7 +10,7 @@ static ETestServerClosure book_closure =
static void
test_remove_contacts_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
EContact *contact_final = NULL;
@@ -41,7 +41,7 @@ test_remove_contacts_sync (ETestServerFixture *fixture,
static void
test_remove_contacts_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
gchar *uid_1, *uid_2;
@@ -75,10 +75,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/EBook/RemoveContacts/Sync", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_remove_contacts_sync, e_test_server_utils_teardown);
- g_test_add ("/EBook/RemoveContacts/Async", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, test_remove_contacts_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/RemoveContacts/Sync", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_remove_contacts_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/EBook/RemoveContacts/Async", ETestServerFixture, &book_closure,
+ e_test_server_utils_setup, test_remove_contacts_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/client/test-client-add-timezone.c b/tests/libecal/client/test-client-add-timezone.c
index 6325d92..2e42876 100644
--- a/tests/libecal/client/test-client-add-timezone.c
+++ b/tests/libecal/client/test-client-add-timezone.c
@@ -15,7 +15,7 @@ static ETestServerClosure cal_closure =
static void
test_add_timezone_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
icalproperty *property;
@@ -62,7 +62,7 @@ async_read_result_ready (GObject *source_object,
{
ECalClient *cal_client;
GError *error = NULL;
- AsyncData *data = (AsyncData *)user_data;
+ AsyncData *data = (AsyncData *) user_data;
icaltimezone *zone1 = data->zone, *zone2 = NULL;
cal_client = E_CAL_CLIENT (source_object);
@@ -98,7 +98,7 @@ async_write_result_ready (GObject *source_object,
static void
test_add_timezone_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
icalproperty *property;
@@ -134,10 +134,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECalClient/AddTimezone/Sync", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_add_timezone_sync, e_test_server_utils_teardown);
- g_test_add ("/ECalClient/AddTimezone/Async", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_add_timezone_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/AddTimezone/Sync", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_add_timezone_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/AddTimezone/Async", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_add_timezone_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/client/test-client-bulk-methods.c b/tests/libecal/client/test-client-bulk-methods.c
index 4cc67ab..69ccf26 100644
--- a/tests/libecal/client/test-client-bulk-methods.c
+++ b/tests/libecal/client/test-client-bulk-methods.c
@@ -13,13 +13,13 @@ static ETestServerClosure cal_closure =
static void
test_icalcomps (icalcomponent *icalcomp1,
- icalcomponent *icalcomp2)
+ icalcomponent *icalcomp2)
{
struct icaltimetype t1, t2;
if (!icalcomp2)
g_error ("Failure: get object returned NULL");
-
+
g_assert_cmpstr (icalcomponent_get_uid (icalcomp1), ==, icalcomponent_get_uid (icalcomp2));
g_assert_cmpstr (icalcomponent_get_summary (icalcomp1), ==, icalcomponent_get_summary (icalcomp2));
@@ -27,20 +27,22 @@ test_icalcomps (icalcomponent *icalcomp1,
t2 = icalcomponent_get_dtstart (icalcomp2);
if (icaltime_compare (t1, t2) != 0)
- g_error ("Failure: dtend doesn't match, expected '%s', got '%s'\n",
- icaltime_as_ical_string (t1), icaltime_as_ical_string (t2));
+ g_error (
+ "Failure: dtend doesn't match, expected '%s', got '%s'\n",
+ icaltime_as_ical_string (t1), icaltime_as_ical_string (t2));
t1 = icalcomponent_get_dtend (icalcomp1);
t2 = icalcomponent_get_dtend (icalcomp2);
if (icaltime_compare (t1, t2) != 0)
- g_error ("Failure: dtend doesn't match, expected '%s', got '%s'\n",
- icaltime_as_ical_string (t1), icaltime_as_ical_string (t2));
+ g_error (
+ "Failure: dtend doesn't match, expected '%s', got '%s'\n",
+ icaltime_as_ical_string (t1), icaltime_as_ical_string (t2));
}
static void
check_removed (ECalClient *cal_client,
- const GSList *uids)
+ const GSList *uids)
{
g_assert (cal_client != NULL);
g_assert (uids != NULL);
@@ -76,7 +78,7 @@ uid_slist_to_ecalcomponentid_slist (GSList *uids)
static void
check_icalcomps_exist (ECalClient *cal_client,
- GSList *icalcomps)
+ GSList *icalcomps)
{
const GSList *l;
@@ -98,7 +100,7 @@ check_icalcomps_exist (ECalClient *cal_client,
static void
test_bulk_methods (ECalClient *cal_client,
- GSList *icalcomps)
+ GSList *icalcomps)
{
GError *error = NULL;
GSList *uids = NULL, *ids = NULL;
@@ -161,7 +163,7 @@ test_bulk_methods (ECalClient *cal_client,
static void
run_test_bulk_methods (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GSList *icalcomps = NULL;
@@ -202,8 +204,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECalClient/BulkMethods", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, run_test_bulk_methods, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/BulkMethods", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, run_test_bulk_methods, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/client/test-client-create-object.c b/tests/libecal/client/test-client-create-object.c
index ea642af..25e24c0 100644
--- a/tests/libecal/client/test-client-create-object.c
+++ b/tests/libecal/client/test-client-create-object.c
@@ -25,20 +25,22 @@ test_icalcomps (icalcomponent *icalcomp1,
t2 = icalcomponent_get_dtstart (icalcomp2);
if (icaltime_compare (t1, t2) != 0)
- g_error ("Failure: dtend doesn't match, expected '%s', got '%s'\n",
- icaltime_as_ical_string (t1), icaltime_as_ical_string (t2));
+ g_error (
+ "Failure: dtend doesn't match, expected '%s', got '%s'\n",
+ icaltime_as_ical_string (t1), icaltime_as_ical_string (t2));
t1 = icalcomponent_get_dtend (icalcomp1);
t2 = icalcomponent_get_dtend (icalcomp2);
if (icaltime_compare (t1, t2) != 0)
- g_error ("Failure: dtend doesn't match, expected '%s', got '%s'\n",
- icaltime_as_ical_string (t1), icaltime_as_ical_string (t2));
+ g_error (
+ "Failure: dtend doesn't match, expected '%s', got '%s'\n",
+ icaltime_as_ical_string (t1), icaltime_as_ical_string (t2));
}
static void
test_create_object_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
icalcomponent *icalcomp;
@@ -87,7 +89,6 @@ test_create_object_sync (ETestServerFixture *fixture,
icalcomponent_free (icalcomp);
}
-
typedef struct {
icalcomponent *icalcomp;
icalcomponent *clone;
@@ -101,7 +102,7 @@ async_read2_result_ready (GObject *source_object,
{
ECalClient *cal_client;
GError *error = NULL;
- AsyncData *data = (AsyncData *)user_data;
+ AsyncData *data = (AsyncData *) user_data;
icalcomponent *icalcomp1 = data->clone;
GSList *ecalcomps = NULL;
@@ -125,7 +126,6 @@ async_read2_result_ready (GObject *source_object,
g_main_loop_quit (data->loop);
}
-
static void
async_read_result_ready (GObject *source_object,
GAsyncResult *result,
@@ -133,7 +133,7 @@ async_read_result_ready (GObject *source_object,
{
ECalClient *cal_client;
GError *error = NULL;
- AsyncData *data = (AsyncData *)user_data;
+ AsyncData *data = (AsyncData *) user_data;
icalcomponent *icalcomp1 = data->clone, *icalcomp2 = NULL;
g_return_if_fail (icalcomp1 != NULL);
@@ -158,7 +158,7 @@ async_write_result_ready (GObject *source_object,
ECalClient *cal_client;
GError *error = NULL;
gchar *uid = NULL;
- AsyncData *data = (AsyncData *)user_data;
+ AsyncData *data = (AsyncData *) user_data;
icalcomponent *clone, *icalcomp = data->icalcomp;
g_return_if_fail (icalcomp != NULL);
@@ -178,7 +178,7 @@ async_write_result_ready (GObject *source_object,
static void
test_create_object_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
icalcomponent *icalcomp;
@@ -211,10 +211,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECalClient/CreateObject/Sync", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_create_object_sync, e_test_server_utils_teardown);
- g_test_add ("/ECalClient/CreateObject/Async", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_create_object_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/CreateObject/Sync", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_create_object_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/CreateObject/Async", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_create_object_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/client/test-client-get-attachment-uris.c b/tests/libecal/client/test-client-get-attachment-uris.c
index 3f28627..327389e 100644
--- a/tests/libecal/client/test-client-get-attachment-uris.c
+++ b/tests/libecal/client/test-client-get-attachment-uris.c
@@ -89,7 +89,7 @@ manage_result (GSList *attachment_uris)
static void
test_get_attachment_uris_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
@@ -113,7 +113,7 @@ async_attachment_uris_result_ready (GObject *source_object,
ECalClient *cal_client;
GError *error = NULL;
GSList *attachment_uris = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
cal_client = E_CAL_CLIENT (source_object);
@@ -127,7 +127,7 @@ async_attachment_uris_result_ready (GObject *source_object,
static void
test_get_attachment_uris_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
const gchar *uid;
@@ -148,10 +148,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECalClient/GetAttachmentUris/Sync", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_attachment_uris_sync, e_test_server_utils_teardown);
- g_test_add ("/ECalClient/GetAttachmentUris/Async", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_attachment_uris_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/GetAttachmentUris/Sync", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_attachment_uris_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/GetAttachmentUris/Async", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_attachment_uris_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/client/test-client-get-free-busy.c b/tests/libecal/client/test-client-get-free-busy.c
index 6f9badd..8aac997 100644
--- a/tests/libecal/client/test-client-get-free-busy.c
+++ b/tests/libecal/client/test-client-get-free-busy.c
@@ -22,7 +22,7 @@ free_busy_data_cb (ECalClient *client,
static void
test_get_free_busy_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
@@ -55,7 +55,7 @@ async_get_free_busy_result_ready (GObject *source_object,
{
ECalClient *cal_client;
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
cal_client = E_CAL_CLIENT (source_object);
@@ -70,7 +70,7 @@ async_get_free_busy_result_ready (GObject *source_object,
static void
test_get_free_busy_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
icaltimezone *utc;
@@ -102,10 +102,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECalClient/GetFreeBusy/Sync", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_free_busy_sync, e_test_server_utils_teardown);
- g_test_add ("/ECalClient/GetFreeBusy/Async", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_free_busy_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/GetFreeBusy/Sync", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_free_busy_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/GetFreeBusy/Async", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_free_busy_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/client/test-client-get-object-list.c b/tests/libecal/client/test-client-get-object-list.c
index 750cb85..81a60cf 100644
--- a/tests/libecal/client/test-client-get-object-list.c
+++ b/tests/libecal/client/test-client-get-object-list.c
@@ -12,7 +12,6 @@
static ETestServerClosure cal_closure =
{ E_TEST_SERVER_CALENDAR, NULL, E_CAL_CLIENT_SOURCE_TYPE_EVENTS };
-
static void
setup_cal (ECalClient *cal_client)
{
@@ -43,7 +42,7 @@ test_result (icalcomponent *icalcomp)
static void
test_get_object_list_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GSList *icalcomps = NULL, *ecalcomps = NULL;
@@ -75,7 +74,7 @@ async_get_object_list_as_comps_result_ready (GObject *source_object,
gpointer user_data)
{
ECalClient *cal_client;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
GError *error = NULL;
GSList *ecalcomps = NULL;
@@ -109,13 +108,14 @@ async_get_object_list_result_ready (GObject *source_object,
test_result (icalcomps->data);
e_cal_client_free_icalcomp_slist (icalcomps);
- e_cal_client_get_object_list_as_comps (cal_client, EVENT_QUERY, NULL,
- async_get_object_list_as_comps_result_ready, user_data);
+ e_cal_client_get_object_list_as_comps (
+ cal_client, EVENT_QUERY, NULL,
+ async_get_object_list_as_comps_result_ready, user_data);
}
static void
test_get_object_list_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
@@ -135,10 +135,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECalClient/GetObjectList/Sync", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_object_list_sync, e_test_server_utils_teardown);
- g_test_add ("/ECalClient/GetObjectList/Async", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_object_list_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/GetObjectList/Sync", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_object_list_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/GetObjectList/Async", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_object_list_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/client/test-client-get-revision.c b/tests/libecal/client/test-client-get-revision.c
index ef1e796..65861b2 100644
--- a/tests/libecal/client/test-client-get-revision.c
+++ b/tests/libecal/client/test-client-get-revision.c
@@ -53,7 +53,7 @@ get_revision_compare_cycle (ECalClient *client)
static void
test_get_revision (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
gint i;
@@ -74,8 +74,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECalClient/GetRevision", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_revision, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/GetRevision", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_revision, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/client/test-client-get-view.c b/tests/libecal/client/test-client-get-view.c
index 596cc4f..29c18b1 100644
--- a/tests/libecal/client/test-client-get-view.c
+++ b/tests/libecal/client/test-client-get-view.c
@@ -20,7 +20,7 @@ typedef enum {
static void
subtest_passed (SubTestId id,
- GMainLoop *loop)
+ GMainLoop *loop)
{
static guint subtests_complete = 0;
@@ -40,7 +40,7 @@ objects_added_cb (GObject *object,
const GSList *objects,
gpointer data)
{
- GMainLoop *loop = (GMainLoop *)data;
+ GMainLoop *loop = (GMainLoop *) data;
const GSList *l;
for (l = objects; l; l = l->next)
@@ -54,7 +54,7 @@ objects_modified_cb (GObject *object,
const GSList *objects,
gpointer data)
{
- GMainLoop *loop = (GMainLoop *)data;
+ GMainLoop *loop = (GMainLoop *) data;
const GSList *l;
for (l = objects; l; l = l->next)
@@ -68,7 +68,7 @@ objects_removed_cb (GObject *object,
const GSList *objects,
gpointer data)
{
- GMainLoop *loop = (GMainLoop *)data;
+ GMainLoop *loop = (GMainLoop *) data;
const GSList *l;
for (l = objects; l; l = l->next) {
@@ -85,7 +85,7 @@ complete_cb (GObject *object,
const GError *error,
gpointer data)
{
- GMainLoop *loop = (GMainLoop *)data;
+ GMainLoop *loop = (GMainLoop *) data;
g_print ("View complete (status: %d, error_msg:%s)\n", error ? error->code : 0, error ? error->message : "NULL");
@@ -135,7 +135,7 @@ async_get_view_ready (GObject *source_object,
ECalClient *cal_client = E_CAL_CLIENT (source_object);
ECalClientView *view = NULL;
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
g_return_if_fail (cal_client != NULL);
@@ -160,7 +160,7 @@ async_get_view_ready (GObject *source_object,
static void
test_get_view_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
@@ -172,7 +172,7 @@ test_get_view_async (ETestServerFixture *fixture,
static void
test_get_view_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
@@ -194,7 +194,7 @@ test_get_view_sync (ETestServerFixture *fixture,
g_error ("set fields of interest: %s", error->message);
e_cal_client_view_start (view, NULL);
- g_idle_add ((GSourceFunc)alter_cal_client, cal_client);
+ g_idle_add ((GSourceFunc) alter_cal_client, cal_client);
g_main_loop_run (fixture->loop);
g_object_unref (view);
@@ -209,10 +209,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECalClient/GetView/Sync", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_view_sync, e_test_server_utils_teardown);
- g_test_add ("/ECalClient/GetView/Async", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_view_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/GetView/Sync", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_view_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/GetView/Async", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_view_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/client/test-client-modify-object.c b/tests/libecal/client/test-client-modify-object.c
index 7eb2ff0..05b595c 100644
--- a/tests/libecal/client/test-client-modify-object.c
+++ b/tests/libecal/client/test-client-modify-object.c
@@ -41,7 +41,7 @@ test_result (icalcomponent *icalcomp)
static void
test_modify_object_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
@@ -80,7 +80,7 @@ async_modify_result_ready (GObject *source_object,
GError *error = NULL;
icalcomponent *icalcomp = NULL;
const gchar *uid;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
cal_client = E_CAL_CLIENT (source_object);
uid = g_object_get_data (G_OBJECT (cal_client), "use-uid");
@@ -99,7 +99,7 @@ async_modify_result_ready (GObject *source_object,
static void
test_modify_object_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
@@ -132,10 +132,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECalClient/ModifyObject/Sync", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_modify_object_sync, e_test_server_utils_teardown);
- g_test_add ("/ECalClient/ModifyObject/Async", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_modify_object_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/ModifyObject/Sync", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_modify_object_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/ModifyObject/Async", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_modify_object_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/client/test-client-receive-objects.c b/tests/libecal/client/test-client-receive-objects.c
index 6aaea97..bb40c1b 100644
--- a/tests/libecal/client/test-client-receive-objects.c
+++ b/tests/libecal/client/test-client-receive-objects.c
@@ -26,7 +26,7 @@ create_object (void)
static void
test_receive_objects_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
@@ -50,7 +50,7 @@ async_receive_result_ready (GObject *source_object,
{
ECalClient *cal_client;
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
cal_client = E_CAL_CLIENT (source_object);
@@ -62,7 +62,7 @@ async_receive_result_ready (GObject *source_object,
static void
test_receive_objects_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
icalcomponent *icalcomp;
@@ -87,10 +87,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECalClient/ReceiveObjects/Sync", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_receive_objects_sync, e_test_server_utils_teardown);
- g_test_add ("/ECalClient/ReceiveObjects/Async", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_receive_objects_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/ReceiveObjects/Sync", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_receive_objects_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/ReceiveObjects/Async", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_receive_objects_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/client/test-client-refresh.c b/tests/libecal/client/test-client-refresh.c
index 3586822..b712e46 100644
--- a/tests/libecal/client/test-client-refresh.c
+++ b/tests/libecal/client/test-client-refresh.c
@@ -11,7 +11,6 @@
static ETestServerClosure cal_closure =
{ E_TEST_SERVER_CALENDAR, NULL, E_CAL_CLIENT_SOURCE_TYPE_EVENTS };
-
static void
setup_cal (ECalClient *cal_client)
{
@@ -35,7 +34,7 @@ setup_cal (ECalClient *cal_client)
static void
test_refresh_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal;
GError *error = NULL;
@@ -57,7 +56,7 @@ async_refresh_result_ready (GObject *source_object,
{
ECalClient *cal_client;
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
cal_client = E_CAL_CLIENT (source_object);
@@ -69,7 +68,7 @@ async_refresh_result_ready (GObject *source_object,
static void
test_refresh_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal;
@@ -90,10 +89,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECalClient/Refresh/Sync", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_refresh_sync, e_test_server_utils_teardown);
- g_test_add ("/ECalClient/Refresh/Async", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_refresh_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/Refresh/Sync", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_refresh_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/Refresh/Async", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_refresh_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/client/test-client-remove-object.c b/tests/libecal/client/test-client-remove-object.c
index 1f389b4..84b0475 100644
--- a/tests/libecal/client/test-client-remove-object.c
+++ b/tests/libecal/client/test-client-remove-object.c
@@ -35,7 +35,7 @@ create_object (ECalClient *cal_client)
static void
test_remove_object_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
@@ -58,7 +58,7 @@ async_remove_result_ready (GObject *source_object,
gpointer user_data)
{
ECalClient *cal_client;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
GError *error = NULL;
cal_client = E_CAL_CLIENT (source_object);
@@ -71,7 +71,7 @@ async_remove_result_ready (GObject *source_object,
static void
test_remove_object_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
gchar *uid;
@@ -95,10 +95,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECalClient/RemoveObject/Sync", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_remove_object_sync, e_test_server_utils_teardown);
- g_test_add ("/ECalClient/RemoveObject/Async", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_remove_object_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/RemoveObject/Sync", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_remove_object_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/RemoveObject/Async", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_remove_object_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/client/test-client-revision-view.c b/tests/libecal/client/test-client-revision-view.c
index 2851f59..c589b39 100644
--- a/tests/libecal/client/test-client-revision-view.c
+++ b/tests/libecal/client/test-client-revision-view.c
@@ -20,7 +20,7 @@ typedef enum {
static void
subtest_passed (SubTestId id,
- GMainLoop *loop)
+ GMainLoop *loop)
{
static guint subtests_complete = 0;
@@ -56,7 +56,7 @@ objects_added_cb (GObject *object,
gpointer data)
{
const GSList *l;
- GMainLoop *loop = (GMainLoop *)data;
+ GMainLoop *loop = (GMainLoop *) data;
for (l = objects; l; l = l->next) {
icalcomponent *component = l->data;
@@ -81,7 +81,7 @@ objects_modified_cb (GObject *object,
gpointer data)
{
const GSList *l;
- GMainLoop *loop = (GMainLoop *)data;
+ GMainLoop *loop = (GMainLoop *) data;
for (l = objects; l; l = l->next) {
icalcomponent *component = l->data;
@@ -105,7 +105,7 @@ objects_removed_cb (GObject *object,
const GSList *objects,
gpointer data)
{
- GMainLoop *loop = (GMainLoop *)data;
+ GMainLoop *loop = (GMainLoop *) data;
const GSList *l;
for (l = objects; l; l = l->next) {
@@ -122,7 +122,7 @@ complete_cb (GObject *object,
const GError *error,
gpointer data)
{
- GMainLoop *loop = (GMainLoop *)data;
+ GMainLoop *loop = (GMainLoop *) data;
g_print ("View complete (status: %d, error_msg:%s)\n", error ? error->code : 0, error ? error->message : "NULL");
@@ -172,7 +172,7 @@ async_get_view_ready (GObject *source_object,
ECalClient *cal_client = E_CAL_CLIENT (source_object);
ECalClientView *view = NULL;
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
GSList *field_list = NULL;
g_return_if_fail (cal_client != NULL);
@@ -203,7 +203,7 @@ async_get_view_ready (GObject *source_object,
static void
test_get_revision_view_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
@@ -215,7 +215,7 @@ test_get_revision_view_async (ETestServerFixture *fixture,
static void
test_get_revision_view_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
@@ -244,7 +244,7 @@ test_get_revision_view_sync (ETestServerFixture *fixture,
e_cal_client_view_start (view, NULL);
- g_idle_add ((GSourceFunc)alter_cal_client, cal_client);
+ g_idle_add ((GSourceFunc) alter_cal_client, cal_client);
g_main_loop_run (fixture->loop);
g_object_unref (view);
@@ -259,10 +259,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECalClient/GetRevisionView/Sync", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_revision_view_sync, e_test_server_utils_teardown);
- g_test_add ("/ECalClient/GetRevisionView/Async", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_revision_view_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/GetRevisionView/Sync", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_revision_view_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/GetRevisionView/Async", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_revision_view_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/client/test-client-send-objects.c b/tests/libecal/client/test-client-send-objects.c
index b50127a..e30e162 100644
--- a/tests/libecal/client/test-client-send-objects.c
+++ b/tests/libecal/client/test-client-send-objects.c
@@ -52,7 +52,7 @@ manage_result (GSList *users,
static void
test_send_objects_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
@@ -78,7 +78,7 @@ async_send_result_ready (GObject *source_object,
GError *error = NULL;
GSList *users = NULL;
icalcomponent *modified_icalcomp = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
cal_client = E_CAL_CLIENT (source_object);
@@ -91,7 +91,7 @@ async_send_result_ready (GObject *source_object,
static void
test_send_objects_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
icalcomponent *icalcomp;
@@ -116,10 +116,12 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECalClient/SendObjects/Sync", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_send_objects_sync, e_test_server_utils_teardown);
- g_test_add ("/ECalClient/SendObjects/Async", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_send_objects_async, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/SendObjects/Sync", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_send_objects_sync, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECalClient/SendObjects/Async", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_send_objects_async, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-add-timezone.c b/tests/libecal/test-ecal-add-timezone.c
index a8380ae..eabb36d 100644
--- a/tests/libecal/test-ecal-add-timezone.c
+++ b/tests/libecal/test-ecal-add-timezone.c
@@ -15,7 +15,7 @@ static ETestServerClosure cal_closure =
static void
test_add_timezone (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
icalproperty *property;
@@ -54,8 +54,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/AddTimezone", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_add_timezone, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/AddTimezone", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_add_timezone, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-create-object--2.c b/tests/libecal/test-ecal-create-object--2.c
index 31ecb65..1d0b9f1 100644
--- a/tests/libecal/test-ecal-create-object--2.c
+++ b/tests/libecal/test-ecal-create-object--2.c
@@ -14,7 +14,7 @@ static ETestServerClosure cal_closure =
static void
test_create_object_2 (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
ECalComponent *e_component, *e_component_final;
@@ -50,8 +50,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/CreateObject2", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_create_object_2, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/CreateObject2", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_create_object_2, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-create-object.c b/tests/libecal/test-ecal-create-object.c
index 94c2d35..4bd4c2c 100644
--- a/tests/libecal/test-ecal-create-object.c
+++ b/tests/libecal/test-ecal-create-object.c
@@ -12,7 +12,7 @@ static ETestServerClosure cal_closure =
static void
test_create_object (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
icalcomponent *component;
@@ -45,8 +45,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/CreateObject", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_create_object, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/CreateObject", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_create_object, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-get-alarm-email-address.c b/tests/libecal/test-ecal-get-alarm-email-address.c
index e9833ce..0dc20eb 100644
--- a/tests/libecal/test-ecal-get-alarm-email-address.c
+++ b/tests/libecal/test-ecal-get-alarm-email-address.c
@@ -11,7 +11,7 @@ static ETestServerClosure cal_closure =
static void
test_get_alarm_email_address (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
gchar *address;
@@ -32,8 +32,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/GetAlarmEmailAddress", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_alarm_email_address, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/GetAlarmEmailAddress", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_alarm_email_address, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-get-cal-address.c b/tests/libecal/test-ecal-get-cal-address.c
index 060adee..8d9b6ff 100644
--- a/tests/libecal/test-ecal-get-cal-address.c
+++ b/tests/libecal/test-ecal-get-cal-address.c
@@ -11,7 +11,7 @@ static ETestServerClosure cal_closure =
static void
test_get_cal_address (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
gchar *address;
@@ -32,8 +32,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/GetCalAddress", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_cal_address, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/GetCalAddress", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_cal_address, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-get-capabilities.c b/tests/libecal/test-ecal-get-capabilities.c
index fb22674..e15f763 100644
--- a/tests/libecal/test-ecal-get-capabilities.c
+++ b/tests/libecal/test-ecal-get-capabilities.c
@@ -11,7 +11,7 @@ static ETestServerClosure cal_closure =
static void
test_get_capabilities (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
@@ -28,8 +28,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/GetCapabilities", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_capabilities, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/GetCapabilities", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_capabilities, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-get-default-object.c b/tests/libecal/test-ecal-get-default-object.c
index 94710a7..24f25c1 100644
--- a/tests/libecal/test-ecal-get-default-object.c
+++ b/tests/libecal/test-ecal-get-default-object.c
@@ -12,7 +12,7 @@ static ETestServerClosure cal_closure =
static void
test_get_default_object (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
icalcomponent *component;
@@ -36,8 +36,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/GetDefaultObject", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_default_object, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/GetDefaultObject", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_default_object, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-get-free-busy.c b/tests/libecal/test-ecal-get-free-busy.c
index 050c47b..5125ce7 100644
--- a/tests/libecal/test-ecal-get-free-busy.c
+++ b/tests/libecal/test-ecal-get-free-busy.c
@@ -10,10 +10,9 @@
static ETestServerClosure cal_closure =
{ E_TEST_SERVER_DEPRECATED_CALENDAR, NULL, E_CAL_SOURCE_TYPE_EVENT };
-
static void
test_get_free_busy (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
GList *users = NULL;
@@ -43,8 +42,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/GetFreeBusy", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_free_busy, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/GetFreeBusy", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_free_busy, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-get-ldap-attribute.c b/tests/libecal/test-ecal-get-ldap-attribute.c
index 570bb1b..2984528 100644
--- a/tests/libecal/test-ecal-get-ldap-attribute.c
+++ b/tests/libecal/test-ecal-get-ldap-attribute.c
@@ -11,7 +11,7 @@ static ETestServerClosure cal_closure =
static void
test_get_ldap_attribute (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
gchar *attr;
@@ -32,8 +32,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/GetLdapAttribute", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_ldap_attribute, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/GetLdapAttribute", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_ldap_attribute, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-get-object-list.c b/tests/libecal/test-ecal-get-object-list.c
index b9fcae0..edf6a06 100644
--- a/tests/libecal/test-ecal-get-object-list.c
+++ b/tests/libecal/test-ecal-get-object-list.c
@@ -14,7 +14,7 @@ static ETestServerClosure cal_closure =
static void
test_get_object_list (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
ECalComponent *e_component;
@@ -50,7 +50,6 @@ test_get_object_list (ETestServerFixture *fixture,
icalcomponent_free (component);
}
-
gint
main (gint argc,
gchar **argv)
@@ -60,8 +59,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/GetObjectList", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_object_list, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/GetObjectList", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_object_list, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-get-objects-for-uid.c b/tests/libecal/test-ecal-get-objects-for-uid.c
index 7287195..f7b4cd9 100644
--- a/tests/libecal/test-ecal-get-objects-for-uid.c
+++ b/tests/libecal/test-ecal-get-objects-for-uid.c
@@ -12,7 +12,7 @@ static ETestServerClosure cal_closure =
static void
test_get_objects_for_uid (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
icalcomponent *component;
@@ -56,8 +56,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/GetObjectsForUid", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_objects_for_uid, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/GetObjectsForUid", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_objects_for_uid, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-get-query.c b/tests/libecal/test-ecal-get-query.c
index a6572d4a..58703fb 100644
--- a/tests/libecal/test-ecal-get-query.c
+++ b/tests/libecal/test-ecal-get-query.c
@@ -7,7 +7,6 @@
#include "ecal-test-utils.h"
#include "e-test-server-utils.h"
-
#define COMPLETE_TIMEOUT 30
#define EVENT_SUMMARY "Creation of the initial test event"
@@ -31,7 +30,7 @@ typedef enum {
static void
subtest_passed (SubTestId id,
- GMainLoop *loop)
+ GMainLoop *loop)
{
static guint subtests_complete = 0;
@@ -154,7 +153,7 @@ alter_cal_cb (ECal *cal)
static void
test_get_query (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
ECalView *view = NULL;
@@ -196,8 +195,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/GetQuery", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_query, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/GetQuery", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_query, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-get-timezone.c b/tests/libecal/test-ecal-get-timezone.c
index 567444e..09ff91a 100644
--- a/tests/libecal/test-ecal-get-timezone.c
+++ b/tests/libecal/test-ecal-get-timezone.c
@@ -12,7 +12,7 @@ static ETestServerClosure cal_closure =
static void
test_get_timezone (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
icaltimezone *zone;
@@ -35,8 +35,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/GetTimezone", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_get_timezone, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/GetTimezone", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_get_timezone, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-modify-object.c b/tests/libecal/test-ecal-modify-object.c
index ec08508..39576ca 100644
--- a/tests/libecal/test-ecal-modify-object.c
+++ b/tests/libecal/test-ecal-modify-object.c
@@ -20,7 +20,7 @@ static ETestServerClosure cal_closure =
static void
test_modify_object (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
ECalComponent *e_component;
@@ -74,8 +74,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/ModifyObject", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_modify_object, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/ModifyObject", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_modify_object, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-receive-objects.c b/tests/libecal/test-ecal-receive-objects.c
index 9c67ce4..8c9320f 100644
--- a/tests/libecal/test-ecal-receive-objects.c
+++ b/tests/libecal/test-ecal-receive-objects.c
@@ -12,7 +12,7 @@ static ETestServerClosure cal_closure =
static void
test_receive_objects (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
ECalComponent *e_component = NULL;
@@ -43,8 +43,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/ReceiveObjects", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_receive_objects, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/ReceiveObjects", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_receive_objects, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-remove-object.c b/tests/libecal/test-ecal-remove-object.c
index c01bff7..5420503 100644
--- a/tests/libecal/test-ecal-remove-object.c
+++ b/tests/libecal/test-ecal-remove-object.c
@@ -12,7 +12,7 @@ static ETestServerClosure cal_closure =
static void
test_remove_object (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
icalcomponent *component;
@@ -46,8 +46,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/RemoveObject", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_remove_object, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/RemoveObject", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_remove_object, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-send-objects.c b/tests/libecal/test-ecal-send-objects.c
index 5ffaeb8..bb84600 100644
--- a/tests/libecal/test-ecal-send-objects.c
+++ b/tests/libecal/test-ecal-send-objects.c
@@ -12,7 +12,7 @@ static ETestServerClosure cal_closure =
static void
test_send_objects (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
GList *users = NULL;
@@ -52,8 +52,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/SendObjects", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_send_objects, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/SendObjects", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_send_objects, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-set-default-timezone.c b/tests/libecal/test-ecal-set-default-timezone.c
index 3c66b62..7297e87 100644
--- a/tests/libecal/test-ecal-set-default-timezone.c
+++ b/tests/libecal/test-ecal-set-default-timezone.c
@@ -16,7 +16,7 @@ static ETestServerClosure cal_closure =
static void
test_set_default_timezone (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
icalproperty *property;
@@ -59,8 +59,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/SetDefaultTimezone", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_set_default_timezone, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/SetDefaultTimezone", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_set_default_timezone, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libecal/test-ecal-set-mode.c b/tests/libecal/test-ecal-set-mode.c
index 018bfd7..2df79ec 100644
--- a/tests/libecal/test-ecal-set-mode.c
+++ b/tests/libecal/test-ecal-set-mode.c
@@ -35,7 +35,7 @@ cal_set_mode_timeout_cb (gpointer user_data)
static void
test_set_mode (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
@@ -57,8 +57,9 @@ main (gint argc,
#endif
g_test_init (&argc, &argv, NULL);
- g_test_add ("/ECal/SetMode", ETestServerFixture, &cal_closure,
- e_test_server_utils_setup, test_set_mode, e_test_server_utils_teardown);
+ g_test_add (
+ "/ECal/SetMode", ETestServerFixture, &cal_closure,
+ e_test_server_utils_setup, test_set_mode, e_test_server_utils_teardown);
return e_test_server_utils_run ();
}
diff --git a/tests/libedataserver/e-user-prompter-test.c b/tests/libedataserver/e-user-prompter-test.c
index aabb2c3..72944f0 100644
--- a/tests/libedataserver/e-user-prompter-test.c
+++ b/tests/libedataserver/e-user-prompter-test.c
@@ -139,11 +139,11 @@ test_trust_prompt (EUserPrompter *prompter)
result = e_user_prompter_extension_prompt_sync (prompter, "ETrustPrompt::trust-prompt", parameters, NULL, NULL, &error);
g_print ("Trust prompt result: %s (%d)%s%s\n", result == 0 ? "Reject" :
- result == 1 ? "Accept permanently" :
- result == 2 ? "Accept temporarily" : "Unknown",
- result,
- error ? ", error: " : "",
- error ? error->message : "");
+ result == 1 ? "Accept permanently" :
+ result == 2 ? "Accept temporarily" : "Unknown",
+ result,
+ error ? ", error: " : "",
+ error ? error->message : "");
g_assert_no_error (error);
e_named_parameters_free (parameters);
@@ -172,26 +172,27 @@ struct _Prompts {
{ "error", "%d) error primary text", "error <i>secondary</i> text\nmarkup", TRUE, NULL },
{ "other", "%d) other primary text", "other <i>secondary</i> text\nmarkup", TRUE, NULL },
{ "#$% $#%", "%d) totally unknown type primary text", "totally unknown type secondary text\nmarkup without markup texts", TRUE, NULL },
- { "", NULL, "%d) a very long secondary text, with no primary text and no icon,"
+ { "", NULL, "%d) a very long secondary text, with no primary text and no icon,"
" which should wrap ideally, and be on multiple lines, like one may"
" expect for such long messages, even without markup", FALSE, NULL },
- { "", "%d) a very long primary text, with no secondary text and no icon,"
+ { "", "%d) a very long primary text, with no secondary text and no icon,"
" which should wrap ideally, and be on multiple lines, like one may"
" expect for such long messages, even without markup", NULL, FALSE, NULL },
- { "", "%d) This one has primary text...", "...and secondary text, and 5 buttons", FALSE, "1st button:2nd button:3rd button:4th button:5th button" }
+ { "", "%d) This one has primary text...", "...and secondary text, and 5 buttons", FALSE, "1st button:2nd button:3rd button:4th button:5th button" }
};
static void
user_prompt_respond_cb (GObject *source,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
gint result_button;
GError *error = NULL;
result_button = e_user_prompter_prompt_finish (E_USER_PROMPTER (source), result, &error);
- g_print (" Prompt [%d] returned %d%s%s\n", GPOINTER_TO_INT (user_data), result_button,
+ g_print (
+ " Prompt [%d] returned %d%s%s\n", GPOINTER_TO_INT (user_data), result_button,
error ? ", error: " : "", error ? error->message : "");
g_assert_no_error (error);
@@ -214,8 +215,8 @@ test_user_prompts_idle_cb (gpointer user_data)
GError *error = NULL;
/* all but the last run asynchronously, to test they will come
- in the right order and only one at a time, and then run
- the last synchronously, to wait for the result */
+ * in the right order and only one at a time, and then run
+ * the last synchronously, to wait for the result */
sz = G_N_ELEMENTS (prompts);
for (ii = 0; !fixture->only_certificate && ii < sz && !error; ii++) {
gchar *title, *primary, *secondary, **buttons = NULL;
@@ -230,19 +231,22 @@ test_user_prompts_idle_cb (gpointer user_data)
buttons = g_strsplit (prompts[ii].buttons, ":", -1);
for (jj = 0; buttons[jj]; jj++) {
captions = g_slist_append (captions, buttons[jj]);
- }
+ }
}
if (ii + 1 == sz) {
gint result_button;
- result_button = e_user_prompter_prompt_sync (fixture->prompter,
+ result_button = e_user_prompter_prompt_sync (
+ fixture->prompter,
prompts[ii].type, title, primary, secondary, prompts[ii].use_markup, captions,
NULL, &error);
- g_print (" Prompt [%d] (sync) returned %d%s%s\n", ii, result_button,
+ g_print (
+ " Prompt [%d] (sync) returned %d%s%s\n", ii, result_button,
error ? ", error: " : "", error ? error->message : "");
} else {
- e_user_prompter_prompt (fixture->prompter,
+ e_user_prompter_prompt (
+ fixture->prompter,
prompts[ii].type, title, primary, secondary, prompts[ii].use_markup, captions,
NULL, user_prompt_respond_cb, GINT_TO_POINTER (ii));
@@ -273,7 +277,7 @@ test_user_prompts_idle_cb (gpointer user_data)
static void
test_user_prompts (TestFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
const TestClosure *closure = user_data;
diff --git a/tests/test-server-utils/e-test-server-utils.c b/tests/test-server-utils/e-test-server-utils.c
index 8456131..dc6a3cb 100644
--- a/tests/test-server-utils/e-test-server-utils.c
+++ b/tests/test-server-utils/e-test-server-utils.c
@@ -71,8 +71,9 @@ delete_work_directory (void)
gboolean spawn_succeeded;
gint exit_status;
- spawn_succeeded = g_spawn_sync (NULL, (char **) argv, NULL, 0, NULL, NULL,
- NULL, NULL, &exit_status, NULL);
+ spawn_succeeded = g_spawn_sync (
+ NULL, (gchar **) argv, NULL, 0, NULL, NULL,
+ NULL, NULL, &exit_status, NULL);
g_assert (spawn_succeeded);
g_assert (WIFEXITED (exit_status));
@@ -119,9 +120,9 @@ e_test_server_utils_bootstrap_timeout (FixturePair *pair)
if (!source)
g_error ("Unable to fetch newly created addressbook source from the registry");
- pair->fixture->service.calendar_client = e_cal_client_new (source,
- pair->closure->calendar_source_type,
- &error);
+ pair->fixture->service.calendar_client = e_cal_client_new (source,
+ pair->closure->calendar_source_type,
+ &error);
if (!pair->fixture->service.calendar_client)
g_error ("Unable to create the test calendar: %s", error->message);
@@ -206,12 +207,11 @@ e_test_server_utils_bootstrap_idle (FixturePair *pair)
if (!e_source_registry_commit_source_sync (pair->fixture->registry, scratch, NULL, &error))
g_error ("Unable to add new addressbook source to the registry: %s", error->message);
-
g_object_unref (scratch);
}
if (pair->closure->type != E_TEST_SERVER_NONE)
- g_timeout_add (20, (GSourceFunc)e_test_server_utils_bootstrap_timeout, pair);
+ g_timeout_add (20, (GSourceFunc) e_test_server_utils_bootstrap_timeout, pair);
else
g_main_loop_quit (pair->fixture->loop);
@@ -227,9 +227,9 @@ e_test_server_utils_bootstrap_idle (FixturePair *pair)
*/
void
e_test_server_utils_setup (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
- ETestServerClosure *closure = (ETestServerClosure *)user_data;
+ ETestServerClosure *closure = (ETestServerClosure *) user_data;
FixturePair pair = { fixture, closure };
/* Create work directory */
@@ -250,7 +250,7 @@ e_test_server_utils_setup (ETestServerFixture *fixture,
fixture->dbus = global_test_dbus;
#endif
- g_idle_add ((GSourceFunc)e_test_server_utils_bootstrap_idle, &pair);
+ g_idle_add ((GSourceFunc) e_test_server_utils_bootstrap_idle, &pair);
g_main_loop_run (fixture->loop);
}
@@ -263,9 +263,9 @@ e_test_server_utils_setup (ETestServerFixture *fixture,
*/
void
e_test_server_utils_teardown (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
- ETestServerClosure *closure = (ETestServerClosure *)user_data;
+ ETestServerClosure *closure = (ETestServerClosure *) user_data;
GError *error = NULL;
switch (closure->type) {
@@ -369,6 +369,6 @@ e_test_server_utils_run (void)
/* g_object_unref (global_test_dbus); */
global_test_dbus = NULL;
#endif
-
+
return tests_ret;
}
diff --git a/tests/test-server-utils/e-test-server-utils.h b/tests/test-server-utils/e-test-server-utils.h
index 41dafdc..380cf97 100644
--- a/tests/test-server-utils/e-test-server-utils.h
+++ b/tests/test-server-utils/e-test-server-utils.h
@@ -30,7 +30,6 @@
typedef struct _ETestServerFixture ETestServerFixture;
typedef struct _ETestServerClosure ETestServerClosure;
-
/**
* E_TEST_SERVER_UTILS_SERVICE:
* @fixture: An #ETestServerFixture
@@ -44,7 +43,7 @@ typedef struct _ETestServerClosure ETestServerClosure;
*
*/
#define E_TEST_SERVER_UTILS_SERVICE(fixture, service_type) \
- ((service_type *)((ETestServerFixture *)fixture)->service.generic)
+ ((service_type *)((ETestServerFixture *) fixture)->service.generic)
/**
* ETestSourceCustomizeFunc:
@@ -126,7 +125,6 @@ struct _ETestServerFixture {
ETestService service;
};
-
void e_test_server_utils_setup (ETestServerFixture *fixture,
gconstpointer user_data);
@@ -135,5 +133,4 @@ void e_test_server_utils_teardown (ETestServerFixture *fixture,
gint e_test_server_utils_run (void);
-
#endif /* E_TEST_UTILS_H */
diff --git a/tests/test-server-utils/test-fixture.c b/tests/test-server-utils/test-fixture.c
index 64235a5..682db0b 100644
--- a/tests/test-server-utils/test-fixture.c
+++ b/tests/test-server-utils/test-fixture.c
@@ -30,14 +30,14 @@ static ETestServerClosure deprecated_calendar_closure = { E_TEST_SERVER_DEPRECAT
static void
empty_test (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
/* Basic Empty case just to run the fixture */
}
-int
-main (int argc,
- char *argv[])
+gint
+main (gint argc,
+ gchar *argv[])
{
#if !GLIB_CHECK_VERSION (2, 35, 1)
g_type_init ();
@@ -46,49 +46,49 @@ main (int argc,
/* Test that internal implementations can return all kinds of type through its api */
g_test_add ("/Fixture/Registry1", ETestServerFixture, ®istry_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Registry2", ETestServerFixture, ®istry_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Registry3", ETestServerFixture, ®istry_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Registry4", ETestServerFixture, ®istry_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Book1", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Book2", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Book3", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Book4", ETestServerFixture, &book_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Calendar1", ETestServerFixture, &calendar_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Calendar2", ETestServerFixture, &calendar_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Calendar3", ETestServerFixture, &calendar_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Calendar4", ETestServerFixture, &calendar_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Deprecated/Book1", ETestServerFixture, &deprecated_book_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Deprecated/Book2", ETestServerFixture, &deprecated_book_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Deprecated/Book3", ETestServerFixture, &deprecated_book_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Deprecated/Book4", ETestServerFixture, &deprecated_book_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Deprecated/Calendar1", ETestServerFixture, &deprecated_calendar_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Deprecated/Calendar2", ETestServerFixture, &deprecated_calendar_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Deprecated/Calendar3", ETestServerFixture, &deprecated_calendar_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
g_test_add ("/Fixture/Deprecated/Calendar4", ETestServerFixture, &deprecated_calendar_closure,
- e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
-
+ e_test_server_utils_setup, empty_test, e_test_server_utils_teardown);
+
return e_test_server_utils_run ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
