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,
g_free (dirname);
g_free (filename);
g_free (backup);
-
+
g_object_unref (bf->priv->sqlitedb);
bf->priv->sqlitedb = NULL;
return;
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,
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 (
{
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;
static guint
send_and_handle_ssl (EBookBackendWebdav *webdav,
- SoupMessage *message,
- GCancellable *cancellable)
+ SoupMessage *message,
+ GCancellable *cancellable)
{
guint status_code;
static EContact *
download_contact (EBookBackendWebdav *webdav,
const gchar *uri,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
SoupMessage *message;
const gchar *etag;
upload_contact (EBookBackendWebdav *webdav,
EContact *contact,
gchar **reason,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
ESource *source;
ESourceWebdav *webdav_extension;
static guint
delete_contact (EBookBackendWebdav *webdav,
const gchar *uri,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
SoupMessage *message;
guint status;
static SoupMessage *
send_propfind (EBookBackendWebdav *webdav,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
SoupMessage *message;
EBookBackendWebdavPrivate *priv = webdav->priv;
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>";
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;
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);
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,
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;
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);
e_contact_class_init (EContactClass *class)
{
GObjectClass *object_class;
- gint i;
+ gint ii;
g_type_class_add_private (class, sizeof (EContactPrivate));
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);
}
}
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;
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);
E_CONTACT_DEFINE_BOXED_TYPE (e_contact_cert, "EContactCert")
-
/**
* e_contact_attr_list_copy:
* @list: A #GList of strings
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);
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);
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;
}
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;
}
}
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,
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
}
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;
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;
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;
* 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);
*/
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);
*/
void
e_source_backend_summary_setup_set_summary_fields (ESourceBackendSummarySetup *extension,
- ...)
+ ...)
{
va_list var_args;
* 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;
* 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;
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]);
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);
}
}
* 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;
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;
}
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;
static const gchar *
summary_dbname_from_field (EBookBackendSqliteDB *ebsdb,
- EContactField field)
+ EContactField field)
{
gint i;
static gint
summary_index_from_field_name (EBookBackendSqliteDB *ebsdb,
- const gchar *field_name)
+ const gchar *field_name)
{
gint i;
EContactField field;
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;
return FALSE;
}
-
static gchar *
format_multivalues (EBookBackendSqliteDB *ebsdb,
- gboolean *reverse_multivalues)
+ gboolean *reverse_multivalues)
{
gint i;
GString *string;
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++) {
static gboolean
introspect_summary (EBookBackendSqliteDB *ebsdb,
- const gchar *folderid,
- GError **error)
+ const gchar *folderid,
+ GError **error)
{
gboolean success;
gchar *stmt;
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);
}
return success;
}
-
/* The column names match the fields used in book-backend-sexp */
static gboolean
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);
(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);
/* 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");
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;
}
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;
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;
}
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;
}
}
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;
}
}
-
/**
* e_book_backend_sqlitedb_new_full:
* @path: location where the db would be created
**/
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;
g_free (fields);
g_free (index_types);
g_free (indexed_fields);
-
+
return ebsdb;
}
}
/* 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);
return ebsdb;
}
-
-
/**
* e_book_backend_sqlitedb_new
* @path: location where the db would be created
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;
/* 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)
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;
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) {
return success;
}
-
/**
* e_book_backend_sqlitedb_add_contact
* @ebsdb:
}
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;
g_free (tmp);
g_string_append_c (str, ')');
- return g_string_free (str, FALSE);
+ return g_string_free (str, FALSE);
}
/**
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);
**/
gboolean
e_book_backend_sqlitedb_check_summary_fields (EBookBackendSqliteDB *ebsdb,
- GHashTable *fields_of_interest)
+ GHashTable *fields_of_interest)
{
gboolean summary_fields = TRUE;
GHashTableIter iter;
/* free return value with g_free */
static gchar *
summary_select_stmt (GHashTable *fields_of_interest,
- gboolean distinct)
+ gboolean distinct)
{
GString *string;
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);
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."));
}
return vcard_str;
}
-
enum {
CHECK_IS_SUMMARY = (1 << 0),
CHECK_IS_LIST_ATTR = (1 << 1),
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;
**/
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;
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 (
return retval;
}
-
/**
* e_book_backend_sqlitedb_is_summary_query:
*
static gchar *
convert_string_value (const gchar *value,
- gboolean normalize,
- gboolean reverse,
+ gboolean normalize,
+ gboolean reverse,
match_type match)
{
GString *str;
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;
/* 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;
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)
gpointer data,
match_type match)
{
- BuildQueryData *qdata = (BuildQueryData *)data;
+ BuildQueryData *qdata = (BuildQueryData *) data;
EBookBackendSqliteDB *ebsdb = qdata->ebsdb;
ESExpResult *r;
gchar *str = NULL;
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);
}
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);
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;
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 (
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;
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);
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);
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);
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)
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);
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)
(G_TYPE_INSTANCE_GET_CLASS \
((obj), E_TYPE_DATA_BOOK_FACTORY, EDataBookFactoryClass))
-
/**
* EDS_ADDRESS_BOOK_MODULES:
*
send_and_handle_redirection (ECalBackendCalDAV *cbdav,
SoupMessage *msg,
gchar **new_location,
- GCancellable *cancellable,
- GError **error)
+ GCancellable *cancellable,
+ GError **error)
{
gchar *old_uri = NULL;
static gboolean
caldav_server_open_calendar (ECalBackendCalDAV *cbdav,
gboolean *server_unreachable,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **perror)
{
SoupMessage *message;
static gboolean
caldav_server_get_object (ECalBackendCalDAV *cbdav,
CalDAVObject *object,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **perror)
{
SoupMessage *message;
caldav_post_freebusy (ECalBackendCalDAV *cbdav,
const gchar *url,
gchar **post_fb,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **error)
{
SoupMessage *message;
caldav_server_put_object (ECalBackendCalDAV *cbdav,
CalDAVObject *object,
icalcomponent *icalcomp,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **perror)
{
SoupMessage *message;
static void
caldav_server_delete_object (ECalBackendCalDAV *cbdav,
CalDAVObject *object,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **perror)
{
SoupMessage *message;
static gboolean
caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav,
- GCancellable *cancellable,
- GError **error)
+ GCancellable *cancellable,
+ GError **error)
{
SoupMessage *message;
xmlOutputBufferPtr buf;
static gboolean
open_calendar (ECalBackendCalDAV *cbdav,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **error)
{
gboolean server_unreachable = FALSE;
const GSList *in_calobjs,
GSList **uids,
GSList **new_components,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **perror)
{
ECalComponent *comp;
CalObjModType mod,
GSList **old_components,
GSList **new_components,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **error)
{
ECalComponent *comp;
CalObjModType mod,
GSList **old_components,
GSList **new_components,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **perror)
{
icalcomponent *cache_comp;
ECalComponent *ecomp,
gboolean online,
icalproperty_method method,
- GCancellable *cancellable,
+ GCancellable *cancellable,
GError **error)
{
ESourceRegistry *registry;
in_calobjs,
uids,
new_components,
- cancellable,
+ cancellable,
perror))
caldav_busy_stub (
mod,
old_components,
new_components,
- cancellable,
+ cancellable,
perror))
caldav_busy_stub (
mod,
old_components,
new_components,
- cancellable,
+ cancellable,
perror))
caldav_busy_stub (
{
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,
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)
{
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;
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,
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;
}
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;
}
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;
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)
CamelSessionAlertType type,
const gchar *prompt,
GSList *button_captions,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
CamelSessionClass *class;
**/
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;
{
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;
{
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;
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;
**/
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)
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)
**/
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;
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);
}
/**
* @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
*
**/
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;
{
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;
**/
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;
**/
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;
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
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;
static gboolean
remove_prompt (EUserPrompterServer *server,
- gint prompt_id,
- gboolean *is_extension_prompt)
+ gint prompt_id,
+ gboolean *is_extension_prompt)
{
GSList *iter;
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;
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;
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;
static void
user_prompter_server_quit_server (EDBusServer *server,
- EDBusServerExitCode code)
+ EDBusServerExitCode code)
{
EUserPrompterServerPrivate *priv;
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);
}
**/
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;
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)
**/
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);
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,
struct _PrompterAsyncData *async_data,
GCancellable *cancellable,
GError **error);
-
+
/* Internal data */
gint prompt_id;
GMainLoop *main_loop; /* not owned by the structure */
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);
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;
/* 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 : "",
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);
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,
static void
user_prompter_prompt_thread (GSimpleAsyncResult *simple,
- GObject *object,
- GCancellable *cancellable)
+ GObject *object,
+ GCancellable *cancellable)
{
EDBusUserPrompter *dbus_prompter;
PrompterAsyncData *async_data;
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 (
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);
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)) {
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);
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);
**/
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;
**/
gint
e_user_prompter_prompt_finish (EUserPrompter *prompter,
- GAsyncResult *result,
- GError **error)
+ GAsyncResult *result,
+ GError **error)
{
GSimpleAsyncResult *simple;
PrompterAsyncData *async_data;
**/
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;
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);
**/
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;
**/
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;
**/
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;
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);
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
static void
cancellable_locks_cancelled_cb (GCancellable *cancellable,
- struct _ECancellableLocksBase *base)
+ struct _ECancellableLocksBase *base)
{
g_return_if_fail (base != NULL);
**/
gboolean
e_cancellable_mutex_lock (ECancellableMutex *mutex,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
gulong handler_id;
gboolean res = TRUE;
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)) {
**/
gboolean
e_cancellable_rec_mutex_lock (ECancellableRecMutex *rec_mutex,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
gulong handler_id;
gboolean res = TRUE;
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)) {
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;
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;
}
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;
}
*/
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;
*/
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);
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);
}
/**
**/
void
e_named_parameters_assign (ENamedParameters *parameters,
- const ENamedParameters *from)
+ const ENamedParameters *from)
{
g_return_if_fail (parameters != NULL);
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;
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;
}
**/
void
e_named_parameters_set (ENamedParameters *parameters,
- const gchar *name,
- const gchar *value)
+ const gchar *name,
+ const gchar *value)
{
GPtrArray *array;
gint index;
**/
const gchar *
e_named_parameters_get (const ENamedParameters *parameters,
- const gchar *name)
+ const gchar *name)
{
gint index;
const gchar *name_and_value;
**/
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;
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);
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 |
{
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;
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);
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 (
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);
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;
}
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
**/
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));
static gboolean
decode_ssl_trust (ESourceWebdav *extension,
- ETrustPromptResponse *response,
- gchar **host,
- gchar **hash)
+ ETrustPromptResponse *response,
+ gchar **host,
+ gchar **hash)
{
gchar *ssl_trust, **strv;
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;
* #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,
**/
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;
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 &&
}
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);
static void
webdav_extension_changes_written_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
GError *error = NULL;
**/
void
e_source_webdav_store_ssl_trust_prompt (ESourceWebdav *extension,
- SoupMessage *message,
- ETrustPromptResponse response)
+ SoupMessage *message,
+ ETrustPromptResponse response)
{
GTlsCertificate *cert = NULL;
GByteArray *bytes = NULL;
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)
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;
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,
static GtkWidget *
add_info_label (GtkGrid *add_to,
- const gchar *caption,
- gint *at_row)
+ const gchar *caption,
+ gint *at_row)
{
GtkWidget *widget;
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,
}
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,
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;
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,
(*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,
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)
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;
static void
hierarchy_selection_changed_cb (GtkTreeSelection *selection,
- CertificateViewerPriv *priv)
+ CertificateViewerPriv *priv)
{
GtkTreeIter iter;
GtkTreeModel *model;
static void
fields_selection_changed_cb (GtkTreeSelection *selection,
- CertificateViewerPriv *priv)
+ CertificateViewerPriv *priv)
{
GtkTreeIter iter;
GtkTreeModel *model;
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);
}
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;
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);
/* 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,
}
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,
/* 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,
"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"));
** }
**
** 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;
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);
#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;
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;
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? */
static gboolean
fill_asn1_from_cert (EASN1Object *asn1,
- CERTCertificate *cert)
+ CERTCertificate *cert)
{
EASN1Object *sequence;
SECItem temp;
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);
static void
trust_prompt_register_dialogs (EExtension *extension,
- EUserPrompterServer *server)
+ EUserPrompterServer *server)
{
ETrustPrompt *trust_prompt = E_TRUST_PROMPT (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);
/* 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 *
static GSList *
trust_prompt_get_issuers (CERTCertDBHandle *certdb,
- const ENamedParameters *parameters)
+ const ENamedParameters *parameters)
{
GSList *issuers = NULL;
CERTCertificate *cert;
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;
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;
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,
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));
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;
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,
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,
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,
#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
const gchar *reason,
const GSList *pissuers);
-#endif /* TRUST_PROMPT_H */
\ No newline at end of file
+#endif /* TRUST_PROMPT_H */
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);
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...
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);
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");
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);
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)
}
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);
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);
}
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
static void
test_add_contact_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EContact *contact;
GAsyncResult *result,
gpointer user_data)
{
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
GError *error = NULL;
gchar *uid;
static void
test_add_contact_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EContact *contact;
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);
#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 ();
}
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);
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);
static void
print_all_emails (EBookClient *book_client,
- GMainLoop *loop)
+ GMainLoop *loop)
{
EBookQuery *query;
gchar *sexp;
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);
}
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;
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);
static void
add_contacts (EBookClient *book_client,
- GMainLoop *loop)
+ GMainLoop *loop)
{
GSList *contacts = NULL;
EContact *contact;
static void
test_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
#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 ();
}
#include "client-test-utils.h"
#include "e-test-server-utils.h"
-
typedef struct {
ETestServerClosure closure;
EBookQuery *query;
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);
}
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
static void
search_test (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
GSList *results = NULL;
static void
uid_test (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
GSList *results = NULL;
#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 ();
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;
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;
static void
test_get_contact_uids_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EContact *contact = NULL;
#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 ();
}
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;
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);
static void
test_get_contact_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EContact *contact = NULL;
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)
#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 ();
}
static void
test_get_revision (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
gint i;
#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 ();
}
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);
static void
setup_and_start_view (EBookClientView *view,
- GMainLoop *loop)
+ GMainLoop *loop)
{
GError *error = NULL;
GAsyncResult *result,
gpointer user_data)
{
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
EBookClientView *view;
GError *error = NULL;
static void
test_get_view_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookQuery *query;
static void
test_get_view_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookQuery *query;
#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 ();
}
static void
test_modify_contact_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
GError *error = NULL;
g_object_unref (contact);
}
-
typedef struct {
EContact *contact;
GMainLoop *loop;
} ModifyData;
-
static void
contact_ready_cb (GObject *source_object,
GAsyncResult *result,
{
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);
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;
#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 ();
}
static void
test_photo_is_uri (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookClientView *view;
#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 ();
}
{
EBookClient *book_client;
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
book_client = E_BOOK_CLIENT (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;
static void
test_refresh_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
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);
}
#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 ();
}
static void
test_remove_contact_by_uid_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
GError *error = NULL;
GAsyncResult *result,
gpointer user_data)
{
- RemoveData *data = (RemoveData *)user_data;
+ RemoveData *data = (RemoveData *) user_data;
GError *error = NULL;
EContact *contact = NULL;
static void
test_remove_contact_by_uid_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EContact *contact = NULL;
#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 ();
}
static void
test_remove_contact_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
GError *error = NULL;
GAsyncResult *result,
gpointer user_data)
{
- RemoveData *data = (RemoveData *)user_data;
+ RemoveData *data = (RemoveData *) user_data;
GError *error = NULL;
EContact *contact = NULL;
static void
test_remove_contact_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EContact *contact = NULL;
g_free (uid);
}
-
gint
main (gint argc,
gchar **argv)
#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 ();
}
static void
test_remove_contacts_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
GError *error = NULL;
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);
static void
test_remove_contacts_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
GSList *uids = NULL;
#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 ();
}
static void
finish_test (EBookClientView *view,
- GMainLoop *loop)
+ GMainLoop *loop)
{
e_book_client_view_stop (view, NULL);
g_object_unref (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) {
static void
setup_and_start_view (EBookClientView *view,
- GMainLoop *loop)
+ GMainLoop *loop)
{
GError *error = NULL;
GSList *field_list;
{
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);
static void
test_revision_view_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookQuery *query;
static void
test_revision_view_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookQuery *query;
#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 ();
}
static void
finish_test (EBookClientView *view,
- GMainLoop *loop)
+ GMainLoop *loop)
{
e_book_client_view_stop (view, NULL);
g_object_unref (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 */
static void
setup_and_start_view (EBookClientView *view,
- GMainLoop *loop)
+ GMainLoop *loop)
{
GError *error = NULL;
GAsyncResult *result,
gpointer user_data)
{
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
EBookClientView *view;
GError *error = NULL;
static void
test_suppress_notifications_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookQuery *query;
static void
test_suppress_notifications_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
EBookQuery *query;
#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 ();
}
static void
finish_test (EBookClientView *view,
- GMainLoop *loop)
+ GMainLoop *loop)
{
e_book_client_view_stop (view, NULL);
g_object_unref (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;
static void
setup_and_start_view (EBookClientView *view,
- GMainLoop *loop)
+ GMainLoop *loop)
{
GError *error = NULL;
GSList uid_field_list = { 0, };
{
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);
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;
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;
g_main_loop_run (fixture->loop);
}
-
gint
main (gint argc,
gchar **argv)
#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 ();
}
static void
test_client (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBookClient *book_client;
print_all_uids (book_client);
}
-
gint
main (gint argc,
gchar **argv)
#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 ();
}
static void
test_add_contact_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
EContact *contact;
static void
test_add_contact_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
gchar *vcard;
#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 ();
}
#define EMAIL_ADD "foo@bar.com"
-
/* Global data */
static EBook *book = NULL;
static gchar *uid = NULL;
static void
test_commit_contact_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EContact *contact;
static void
test_commit_contact_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EContact *contact;
#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 ();
}
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);
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);
static void
test_get_book_view_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
EBookQuery *query;
static void
test_get_book_view_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
EBookQuery *query;
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);
}
#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 ();
}
static void
test_get_contact_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
gchar *uid;
static void
test_get_contact_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
gchar *uid;
g_main_loop_run (fixture->loop);
}
-
gint
main (gint argc,
gchar **argv)
#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 ();
}
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;
static void
test_get_required_fields_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
#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 ();
}
static void
test_get_static_capabilities_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
const gchar *caps;
#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 ();
}
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;
static void
test_get_supported_auth_methods_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
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);
}
#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 ();
}
static void
test_get_supported_fields_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
GList *fields;
static void
test_get_supported_fields_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
#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 ();
}
static void
test_remove_contact_by_id_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
gchar *uid;
#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 ();
}
static void
test_remove_contact_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
EContact *contact_final = NULL;
static void
test_remove_contact_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
EContact *contact_final = NULL;
#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 ();
}
static void
test_remove_contacts_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
EContact *contact_final = NULL;
static void
test_remove_contacts_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
EBook *book;
gchar *uid_1, *uid_2;
#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 ();
}
static void
test_add_timezone_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
icalproperty *property;
{
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);
static void
test_add_timezone_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
icalproperty *property;
#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 ();
}
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));
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);
static void
check_icalcomps_exist (ECalClient *cal_client,
- GSList *icalcomps)
+ GSList *icalcomps)
{
const GSList *l;
static void
test_bulk_methods (ECalClient *cal_client,
- GSList *icalcomps)
+ GSList *icalcomps)
{
GError *error = NULL;
GSList *uids = NULL, *ids = NULL;
static void
run_test_bulk_methods (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GSList *icalcomps = NULL;
#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 ();
}
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;
icalcomponent_free (icalcomp);
}
-
typedef struct {
icalcomponent *icalcomp;
icalcomponent *clone;
{
ECalClient *cal_client;
GError *error = NULL;
- AsyncData *data = (AsyncData *)user_data;
+ AsyncData *data = (AsyncData *) user_data;
icalcomponent *icalcomp1 = data->clone;
GSList *ecalcomps = NULL;
g_main_loop_quit (data->loop);
}
-
static void
async_read_result_ready (GObject *source_object,
GAsyncResult *result,
{
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);
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);
static void
test_create_object_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
icalcomponent *icalcomp;
#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 ();
}
static void
test_get_attachment_uris_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
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);
static void
test_get_attachment_uris_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
const gchar *uid;
#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 ();
}
static void
test_get_free_busy_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
{
ECalClient *cal_client;
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
cal_client = E_CAL_CLIENT (source_object);
static void
test_get_free_busy_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
icaltimezone *utc;
#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 ();
}
static ETestServerClosure cal_closure =
{ E_TEST_SERVER_CALENDAR, NULL, E_CAL_CLIENT_SOURCE_TYPE_EVENTS };
-
static void
setup_cal (ECalClient *cal_client)
{
static void
test_get_object_list_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GSList *icalcomps = NULL, *ecalcomps = NULL;
gpointer user_data)
{
ECalClient *cal_client;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
GError *error = NULL;
GSList *ecalcomps = NULL;
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;
#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 ();
}
static void
test_get_revision (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
gint i;
#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 ();
}
static void
subtest_passed (SubTestId id,
- GMainLoop *loop)
+ GMainLoop *loop)
{
static guint subtests_complete = 0;
const GSList *objects,
gpointer data)
{
- GMainLoop *loop = (GMainLoop *)data;
+ GMainLoop *loop = (GMainLoop *) data;
const GSList *l;
for (l = objects; l; l = l->next)
const GSList *objects,
gpointer data)
{
- GMainLoop *loop = (GMainLoop *)data;
+ GMainLoop *loop = (GMainLoop *) data;
const GSList *l;
for (l = objects; l; l = l->next)
const GSList *objects,
gpointer data)
{
- GMainLoop *loop = (GMainLoop *)data;
+ GMainLoop *loop = (GMainLoop *) data;
const GSList *l;
for (l = objects; l; l = l->next) {
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");
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);
static void
test_get_view_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
static void
test_get_view_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
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);
#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 ();
}
static void
test_modify_object_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
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");
static void
test_modify_object_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
#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 ();
}
static void
test_receive_objects_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
{
ECalClient *cal_client;
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
cal_client = E_CAL_CLIENT (source_object);
static void
test_receive_objects_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
icalcomponent *icalcomp;
#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 ();
}
static ETestServerClosure cal_closure =
{ E_TEST_SERVER_CALENDAR, NULL, E_CAL_CLIENT_SOURCE_TYPE_EVENTS };
-
static void
setup_cal (ECalClient *cal_client)
{
static void
test_refresh_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal;
GError *error = NULL;
{
ECalClient *cal_client;
GError *error = NULL;
- GMainLoop *loop = (GMainLoop *)user_data;
+ GMainLoop *loop = (GMainLoop *) user_data;
cal_client = E_CAL_CLIENT (source_object);
static void
test_refresh_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal;
#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 ();
}
static void
test_remove_object_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
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);
static void
test_remove_object_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
gchar *uid;
#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 ();
}
static void
subtest_passed (SubTestId id,
- GMainLoop *loop)
+ GMainLoop *loop)
{
static guint subtests_complete = 0;
gpointer data)
{
const GSList *l;
- GMainLoop *loop = (GMainLoop *)data;
+ GMainLoop *loop = (GMainLoop *) data;
for (l = objects; l; l = l->next) {
icalcomponent *component = l->data;
gpointer data)
{
const GSList *l;
- GMainLoop *loop = (GMainLoop *)data;
+ GMainLoop *loop = (GMainLoop *) data;
for (l = objects; l; l = l->next) {
icalcomponent *component = l->data;
const GSList *objects,
gpointer data)
{
- GMainLoop *loop = (GMainLoop *)data;
+ GMainLoop *loop = (GMainLoop *) data;
const GSList *l;
for (l = objects; l; l = l->next) {
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");
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);
static void
test_get_revision_view_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
static void
test_get_revision_view_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
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);
#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 ();
}
static void
test_send_objects_sync (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
GError *error = NULL;
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);
static void
test_send_objects_async (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECalClient *cal_client;
icalcomponent *icalcomp;
#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 ();
}
static void
test_add_timezone (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
icalproperty *property;
#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 ();
}
static void
test_create_object_2 (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
ECalComponent *e_component, *e_component_final;
#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 ();
}
static void
test_create_object (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
icalcomponent *component;
#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 ();
}
static void
test_get_alarm_email_address (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
gchar *address;
#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 ();
}
static void
test_get_cal_address (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
gchar *address;
#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 ();
}
static void
test_get_capabilities (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
#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 ();
}
static void
test_get_default_object (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
icalcomponent *component;
#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 ();
}
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;
#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 ();
}
static void
test_get_ldap_attribute (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
gchar *attr;
#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 ();
}
static void
test_get_object_list (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
ECalComponent *e_component;
icalcomponent_free (component);
}
-
gint
main (gint argc,
gchar **argv)
#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 ();
}
static void
test_get_objects_for_uid (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
icalcomponent *component;
#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 ();
}
#include "ecal-test-utils.h"
#include "e-test-server-utils.h"
-
#define COMPLETE_TIMEOUT 30
#define EVENT_SUMMARY "Creation of the initial test event"
static void
subtest_passed (SubTestId id,
- GMainLoop *loop)
+ GMainLoop *loop)
{
static guint subtests_complete = 0;
static void
test_get_query (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
ECalView *view = NULL;
#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 ();
}
static void
test_get_timezone (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
icaltimezone *zone;
#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 ();
}
static void
test_modify_object (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
ECalComponent *e_component;
#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 ();
}
static void
test_receive_objects (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
ECalComponent *e_component = NULL;
#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 ();
}
static void
test_remove_object (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
icalcomponent *component;
#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 ();
}
static void
test_send_objects (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
GList *users = NULL;
#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 ();
}
static void
test_set_default_timezone (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
icalproperty *property;
#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 ();
}
static void
test_set_mode (ETestServerFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
ECal *cal;
#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 ();
}
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);
{ "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);
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;
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));
static void
test_user_prompts (TestFixture *fixture,
- gconstpointer user_data)
+ gconstpointer user_data)
{
const TestClosure *closure = user_data;
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));
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);
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);
*/
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 */
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);
}
*/
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) {
/* g_object_unref (global_test_dbus); */
global_test_dbus = NULL;
#endif
-
+
return tests_ret;
}
typedef struct _ETestServerFixture ETestServerFixture;
typedef struct _ETestServerClosure ETestServerClosure;
-
/**
* E_TEST_SERVER_UTILS_SERVICE:
* @fixture: An #ETestServerFixture
*
*/
#define E_TEST_SERVER_UTILS_SERVICE(fixture, service_type) \
- ((service_type *)((ETestServerFixture *)fixture)->service.generic)
+ ((service_type *)((ETestServerFixture *) fixture)->service.generic)
/**
* ETestSourceCustomizeFunc:
ETestService service;
};
-
void e_test_server_utils_setup (ETestServerFixture *fixture,
gconstpointer user_data);
gint e_test_server_utils_run (void);
-
#endif /* E_TEST_UTILS_H */
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 ();
/* 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 ();
}
projects / platform / upstream / evolution-data-server.git / commitdiff