From: Matthew Barnes Date: Mon, 14 Nov 2011 21:15:34 +0000 (-0500) Subject: Update API docs. X-Git-Tag: upstream/3.7.4~1398 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa2a887c2d029a590189b6c5847ff5dc66355a97;p=platform%2Fupstream%2Fevolution-data-server.git Update API docs. --- diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c index 886a652..b73ebef 100644 --- a/addressbook/backends/file/e-book-backend-file.c +++ b/addressbook/backends/file/e-book-backend-file.c @@ -214,8 +214,8 @@ load_vcard (EBookBackendFile *bf, static EContact * load_contact (EBookBackendFile *bf, - const gchar *uid, - GError **error) + const gchar *uid, + GError **error) { EContact *contact = NULL; gchar *vcard; @@ -229,9 +229,9 @@ load_contact (EBookBackendFile *bf, } static gchar * -check_remove_uri_for_field (EContact *old_contact, - EContact *new_contact, - EContactField field) +check_remove_uri_for_field (EContact *old_contact, + EContact *new_contact, + EContactField field) { EContactPhoto *old_photo = NULL, *new_photo = NULL; gchar *uri = NULL; @@ -258,7 +258,7 @@ check_remove_uri_for_field (EContact *old_contact, static void maybe_delete_uri (EBookBackendFile *bf, - const gchar *uri) + const gchar *uri) { GError *error = NULL; gchar *filename; @@ -289,9 +289,9 @@ maybe_delete_uri (EBookBackendFile *bf, static void maybe_delete_unused_uris (EBookBackendFile *bf, - const gchar *id, - EContact *old_contact, - EContact *new_contact) + const gchar *id, + EContact *old_contact, + EContact *new_contact) { GError *error = NULL; gchar *uri_photo, *uri_logo; @@ -329,8 +329,8 @@ maybe_delete_unused_uris (EBookBackendFile *bf, } static gchar * -e_book_backend_file_extract_path_from_source (ESource *source, - GetPathType path_type) +e_book_backend_file_extract_path_from_source (ESource *source, + GetPathType path_type) { const gchar *user_data_dir; const gchar *source_dir; @@ -348,11 +348,11 @@ e_book_backend_file_extract_path_from_source (ESource *source, switch (path_type) { case GET_PATH_DB_DIR: - filename = g_build_filename + filename = g_build_filename (user_data_dir, "addressbook", mangled_source_dir, NULL); break; case GET_PATH_PHOTO_DIR: - filename = g_build_filename + filename = g_build_filename (user_data_dir, "addressbook", mangled_source_dir, "photos", NULL); break; default: @@ -365,9 +365,9 @@ e_book_backend_file_extract_path_from_source (ESource *source, static gchar * safe_name_for_photo (EBookBackendFile *bf, - EContact *contact, - EContactPhoto *photo, - EContactField field) + EContact *contact, + EContactPhoto *photo, + EContactField field) { gchar *fullname = NULL, *name, *str; gchar *suffix = NULL; @@ -376,14 +376,14 @@ safe_name_for_photo (EBookBackendFile *bf, g_assert (photo->type == E_CONTACT_PHOTO_TYPE_INLINED); /* Get a suitable filename extension */ - if (photo->data.inlined.mime_type != NULL && + if (photo->data.inlined.mime_type != NULL && photo->data.inlined.mime_type[0] != '\0') { suffix = g_uri_escape_string (photo->data.inlined.mime_type, NULL, TRUE); } else { gchar *mime_type = NULL; gchar *content_type = NULL; - + content_type = g_content_type_guess (NULL, photo->data.inlined.data, photo->data.inlined.length, @@ -424,10 +424,10 @@ safe_name_for_photo (EBookBackendFile *bf, static gchar * hard_link_photo (EBookBackendFile *bf, - EContact *contact, - EContactField field, - const gchar *src_filename, - GError **error) + EContact *contact, + EContactField field, + const gchar *src_filename, + GError **error) { gchar *fullname = NULL, *name, *str; gint i = 0, ret; @@ -464,7 +464,7 @@ hard_link_photo (EBookBackendFile *bf, g_propagate_error (error, EDB_ERROR (PERMISSION_DENIED)); } else { g_propagate_error (error, e_data_book_create_error_fmt - (E_DATA_BOOK_STATUS_OTHER_ERROR, + (E_DATA_BOOK_STATUS_OTHER_ERROR, _("Failed to create hardlink for resource '%s': %s"), src_filename, g_strerror (errno))); } @@ -477,10 +477,9 @@ hard_link_photo (EBookBackendFile *bf, return fullname; } - -static gboolean -is_backend_owned_uri (EBookBackendFile *bf, - const gchar *uri) +static gboolean +is_backend_owned_uri (EBookBackendFile *bf, + const gchar *uri) { gchar *filename; gchar *dirname; @@ -502,13 +501,12 @@ is_backend_owned_uri (EBookBackendFile *bf, return owned_uri; } - static PhotoModifiedStatus maybe_transform_vcard_field_for_photo (EBookBackendFile *bf, - EContact *old_contact, - EContact *contact, - EContactField field, - GError **error) + EContact *old_contact, + EContact *contact, + EContactField field, + GError **error) { PhotoModifiedStatus status = STATUS_NORMAL; EContactPhoto *photo; @@ -528,12 +526,12 @@ maybe_transform_vcard_field_for_photo (EBookBackendFile *bf, /* Create a unique filename with an extension (hopefully) based on the mime type */ new_photo_path = safe_name_for_photo (bf, contact, photo, field); - if ((uri = + if ((uri = g_filename_to_uri (new_photo_path, NULL, error)) == NULL) { status = STATUS_ERROR; } else if (!g_file_set_contents (new_photo_path, - (const gchar *)photo->data.inlined.data, + (const gchar *) photo->data.inlined.data, photo->data.inlined.length, error)) { @@ -597,7 +595,7 @@ maybe_transform_vcard_field_for_photo (EBookBackendFile *bf, * logic to the file-system. */ filename = g_filename_from_uri (photo->data.uri, NULL, NULL); - g_assert (filename); /* we already checked this with 'is_backend_owned_uri()' */ + g_assert (filename); /* we already checked this with 'is_backend_owned_uri ()' */ new_filename = hard_link_photo (bf, contact, field, filename, error); @@ -649,10 +647,10 @@ maybe_transform_vcard_field_for_photo (EBookBackendFile *bf, */ static PhotoModifiedStatus maybe_transform_vcard_for_photo (EBookBackendFile *bf, - EContact *old_contact, - EContact *contact, - gchar **vcard_ret, - GError **error) + EContact *old_contact, + EContact *contact, + gchar **vcard_ret, + GError **error) { PhotoModifiedStatus status; gboolean modified = FALSE; @@ -876,7 +874,7 @@ do_create (EBookBackendFile *bf, } /* Begin transaction */ - db_error = env->txn_begin(env, NULL, &txn, 0); + db_error = env->txn_begin (env, NULL, &txn, 0); if (db_error != 0) { g_warning (G_STRLOC ": env->txn_begin failed with %s", db_strerror (db_error)); db_error_to_gerror (db_error, perror); @@ -891,7 +889,7 @@ do_create (EBookBackendFile *bf, const gchar *vcard_req; EContact *contact; - vcard_req = (const gchar*) l->data; + vcard_req = (const gchar *) l->data; id = e_book_backend_file_create_unique_id (); contact = e_contact_new_from_vcard_with_uid (vcard_req, id); @@ -1017,7 +1015,7 @@ e_book_backend_file_remove_contacts (EBookBackendSync *backend, } /* Begin transaction */ - db_error = env->txn_begin(env, NULL, &txn, 0); + db_error = env->txn_begin (env, NULL, &txn, 0); if (db_error != 0) { g_warning (G_STRLOC ": env->txn_begin failed with %s", db_strerror (db_error)); db_error_to_gerror (db_error, perror); @@ -1107,7 +1105,7 @@ e_book_backend_file_modify_contacts (EBookBackendSync *backend, } /* Begin transaction */ - db_error = env->txn_begin(env, NULL, &txn, 0); + db_error = env->txn_begin (env, NULL, &txn, 0); if (db_error != 0) { g_warning (G_STRLOC ": env->txn_begin failed with %s", db_strerror (db_error)); db_error_to_gerror (db_error, perror); @@ -1212,7 +1210,7 @@ e_book_backend_file_modify_contacts (EBookBackendSync *backend, GError *error = NULL; /* Update summary as well */ if (!e_book_backend_sqlitedb_remove_contacts (bf->priv->sqlitedb, - SQLITEDB_FOLDER_ID, + SQLITEDB_FOLDER_ID, ids, &error)) { g_warning ("Failed to remove contacts from the summary: %s", error->message); g_error_free (error); @@ -1626,7 +1624,7 @@ book_view_thread (gpointer data) /* don't include the version in the list of cards */ if (strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_VERSION_NAME) && strcmp (id_dbt.data, E_BOOK_BACKEND_FILE_REVISION_NAME)) { - notify_update_vcard (book_view, allcontacts, + notify_update_vcard (book_view, allcontacts, id_dbt.data, vcard_dbt.data); } @@ -1918,7 +1916,7 @@ e_book_backend_file_open (EBookBackendSync *backend, g_free); /* Make sure the database directory is created - or env->open will fail */ + * or env->open will fail */ if (!only_if_exists) { if (!create_directory (dirname, perror)) { g_warning ("failed to create directory at %s", dirname); diff --git a/addressbook/backends/google/e-book-backend-google.c b/addressbook/backends/google/e-book-backend-google.c index f565ab8..1369e06 100644 --- a/addressbook/backends/google/e-book-backend-google.c +++ b/addressbook/backends/google/e-book-backend-google.c @@ -1358,9 +1358,9 @@ e_book_backend_google_create_contacts (EBookBackend *backend, * in our static capability list. This simplifies a lot of the logic, especially around asynchronous results. */ if (vcards->next != NULL) { e_data_book_respond_create_contacts (book, opid, - EDB_ERROR_EX (NOT_SUPPORTED, + EDB_ERROR_EX (NOT_SUPPORTED, _("The backend does not support bulk additions")), - NULL); + NULL); return; } @@ -1472,9 +1472,9 @@ e_book_backend_google_remove_contacts (EBookBackend *backend, * in our static capability list. This simplifies a lot of the logic, especially around asynchronous results. */ if (id_list->next != NULL) { e_data_book_respond_remove_contacts (book, opid, - EDB_ERROR_EX (NOT_SUPPORTED, + EDB_ERROR_EX (NOT_SUPPORTED, _("The backend does not support bulk removals")), - NULL); + NULL); return; } g_return_if_fail (!id_list->next); @@ -1745,9 +1745,9 @@ e_book_backend_google_modify_contacts (EBookBackend *backend, * in our static capability list. This is because there is no clean way to roll back changes in case of an error. */ if (vcards->next != NULL) { e_data_book_respond_modify_contacts (book, opid, - EDB_ERROR_EX (NOT_SUPPORTED, + EDB_ERROR_EX (NOT_SUPPORTED, _("The backend does not support bulk modifications")), - NULL); + NULL); return; } @@ -3376,7 +3376,7 @@ add_type_param_from_google_rel_im (EVCardAttribute *attr, static gboolean add_type_param_from_google_rel_uris (EVCardAttribute *attr, - const gchar *rel) + const gchar *rel) { return _add_type_param_from_google_rel (attr, rel_type_map_uris, G_N_ELEMENTS (rel_type_map_uris), rel); } @@ -3403,7 +3403,7 @@ static gchar * _google_rel_from_types (GList *types, const struct RelTypeMap rel_type_map[], guint map_len, - gboolean use_prefix) + gboolean use_prefix) { const gchar *format = "http://schemas.google.com/g/2005#%s"; guint i; @@ -3702,7 +3702,7 @@ add_attribute_from_gdata_gd_organization (EVCard *vcard, static void add_attribute_from_gc_contact_website (EVCard *vcard, - GDataGContactWebsite *website) + GDataGContactWebsite *website) { EVCardAttribute *attr; gboolean has_type; @@ -3939,7 +3939,7 @@ gdata_gd_organization_from_attribute (EVCardAttribute *attr, static GDataGContactWebsite * gdata_gc_contact_website_from_attribute (EVCardAttribute *attr, - gboolean *have_primary) + gboolean *have_primary) { GDataGContactWebsite *website = NULL; GList *values; diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c index 09b4c69..38f2cfe 100644 --- a/addressbook/backends/ldap/e-book-backend-ldap.c +++ b/addressbook/backends/ldap/e-book-backend-ldap.c @@ -1559,9 +1559,9 @@ create_contact_handler (LDAPOp *op, if (!bl->priv->ldap) { g_static_rec_mutex_unlock (&eds_ldap_handler_lock); e_data_book_respond_create_contacts (op->book, - op->opid, - EDB_ERROR_NOT_CONNECTED (), - NULL); + op->opid, + EDB_ERROR_NOT_CONNECTED (), + NULL); ldap_op_finished (op); return; } @@ -1569,9 +1569,9 @@ create_contact_handler (LDAPOp *op, if (LDAP_RES_ADD != ldap_msgtype (res)) { e_data_book_respond_create_contacts (op->book, - op->opid, - EDB_ERROR_MSG_TYPE (ldap_msgtype (res)), - NULL); + op->opid, + EDB_ERROR_MSG_TYPE (ldap_msgtype (res)), + NULL); ldap_op_finished (op); return; } @@ -1593,9 +1593,9 @@ create_contact_handler (LDAPOp *op, /* and lastly respond */ added_contacts.data = create_op->new_contact; e_data_book_respond_create_contacts (op->book, - op->opid, - ldap_error_to_response (ldap_error), - &added_contacts); + op->opid, + ldap_error_to_response (ldap_error), + &added_contacts); ldap_op_finished (op); } @@ -1631,9 +1631,9 @@ e_book_backend_ldap_create_contacts (EBookBackend *backend, * in our static capability list. This is because there is no clean way to roll back changes in case of an error. */ if (vcards->next != NULL) { e_data_book_respond_create_contacts (book, opid, - EDB_ERROR_EX (NOT_SUPPORTED, + EDB_ERROR_EX (NOT_SUPPORTED, _("The backend does not support bulk additions")), - NULL); + NULL); return; } @@ -1744,9 +1744,9 @@ e_book_backend_ldap_create_contacts (EBookBackend *backend, if (LDAP_SUCCESS != err) { e_data_book_respond_create_contacts (create_op->op.book, - opid, - ldap_error_to_response (err), - NULL); + opid, + ldap_error_to_response (err), + NULL); create_contact_dtor ((LDAPOp *) create_op); return; } else { @@ -1923,9 +1923,9 @@ modify_contact_modify_handler (LDAPOp *op, if (!bl->priv->ldap) { g_static_rec_mutex_unlock (&eds_ldap_handler_lock); e_data_book_respond_modify_contacts (op->book, - op->opid, - EDB_ERROR_NOT_CONNECTED (), - NULL); + op->opid, + EDB_ERROR_NOT_CONNECTED (), + NULL); ldap_op_finished (op); return; } @@ -1933,9 +1933,9 @@ modify_contact_modify_handler (LDAPOp *op, if (LDAP_RES_MODIFY != ldap_msgtype (res)) { e_data_book_respond_modify_contacts (op->book, - op->opid, - EDB_ERROR_MSG_TYPE (ldap_msgtype (res)), - NULL); + op->opid, + EDB_ERROR_MSG_TYPE (ldap_msgtype (res)), + NULL); ldap_op_finished (op); return; } @@ -1957,9 +1957,9 @@ modify_contact_modify_handler (LDAPOp *op, /* and lastly respond */ modified_contacts.data = modify_op->contact; e_data_book_respond_modify_contacts (op->book, - op->opid, - ldap_error_to_response (ldap_error), - &modified_contacts); + op->opid, + ldap_error_to_response (ldap_error), + &modified_contacts); ldap_op_finished (op); } @@ -1978,7 +1978,7 @@ modify_contact_search_handler (LDAPOp *op, if (!bl->priv->ldap) { g_static_rec_mutex_unlock (&eds_ldap_handler_lock); e_data_book_respond_modify_contacts (op->book, op->opid, - EDB_ERROR_NOT_CONNECTED (), NULL); + EDB_ERROR_NOT_CONNECTED (), NULL); ldap_op_finished (op); return; } @@ -1998,9 +1998,9 @@ modify_contact_search_handler (LDAPOp *op, if (!e) { e_data_book_respond_modify_contacts (op->book, - op->opid, + op->opid, e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, "%s: NULL returned from ldap_first_entry", G_STRFUNC), - NULL); + NULL); ldap_op_finished (op); return; } @@ -2031,9 +2031,9 @@ modify_contact_search_handler (LDAPOp *op, if (ldap_error != LDAP_SUCCESS) { /* more here i'm sure */ e_data_book_respond_modify_contacts (op->book, - op->opid, - ldap_error_to_response (ldap_error), - NULL); + op->opid, + ldap_error_to_response (ldap_error), + NULL); ldap_op_finished (op); return; } @@ -2086,9 +2086,9 @@ modify_contact_search_handler (LDAPOp *op, } else { g_warning ("ldap_rename returned %d\n", ldap_error); e_data_book_respond_modify_contacts (op->book, - op->opid, - ldap_error_to_response (ldap_error), - NULL); + op->opid, + ldap_error_to_response (ldap_error), + NULL); ldap_op_finished (op); return; } @@ -2122,9 +2122,9 @@ modify_contact_rename_handler (LDAPOp *op, if (!bl->priv->ldap) { g_static_rec_mutex_unlock (&eds_ldap_handler_lock); e_data_book_respond_modify_contacts (op->book, - op->opid, - EDB_ERROR_NOT_CONNECTED (), - NULL); + op->opid, + EDB_ERROR_NOT_CONNECTED (), + NULL); ldap_op_finished (op); return; } @@ -2134,9 +2134,9 @@ modify_contact_rename_handler (LDAPOp *op, if (modify_op->new_id) { if (LDAP_RES_RENAME != ldap_msgtype (res)) { e_data_book_respond_modify_contacts (op->book, - op->opid, - EDB_ERROR_MSG_TYPE (ldap_msgtype (res)), - NULL); + op->opid, + EDB_ERROR_MSG_TYPE (ldap_msgtype (res)), + NULL); ldap_op_finished (op); return; } @@ -2157,9 +2157,9 @@ modify_contact_rename_handler (LDAPOp *op, if (ldap_error != LDAP_SUCCESS) { e_data_book_respond_modify_contacts (op->book, - op->opid, - ldap_error_to_response (ldap_error), - NULL); + op->opid, + ldap_error_to_response (ldap_error), + NULL); ldap_op_finished (op); return; } @@ -2232,18 +2232,18 @@ modify_contact_rename_handler (LDAPOp *op, } else { g_warning ("ldap_modify_ext returned %d\n", ldap_error); e_data_book_respond_modify_contacts (op->book, - op->opid, - ldap_error_to_response (ldap_error), - NULL); + op->opid, + ldap_error_to_response (ldap_error), + NULL); ldap_op_finished (op); return; } } else { e_data_book_respond_modify_contacts (op->book, - op->opid, - e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, + op->opid, + e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, "%s: Unhandled result type %d returned", G_STRFUNC, ldap_msgtype (res)), - NULL); + NULL); ldap_op_finished (op); } } @@ -2288,9 +2288,9 @@ e_book_backend_ldap_modify_contacts (EBookBackend *backend, * in our static capability list. This is because there is no clean way to roll back changes in case of an error. */ if (vcards->next != NULL) { e_data_book_respond_modify_contacts (book, opid, - EDB_ERROR_EX (NOT_SUPPORTED, + EDB_ERROR_EX (NOT_SUPPORTED, _("The backend does not support bulk modifications")), - NULL); + NULL); return; } @@ -2330,9 +2330,9 @@ e_book_backend_ldap_modify_contacts (EBookBackend *backend, modify_contact_search_handler, modify_contact_dtor); } else { e_data_book_respond_modify_contacts (book, - opid, - ldap_error_to_response (ldap_error), - NULL); + opid, + ldap_error_to_response (ldap_error), + NULL); modify_contact_dtor ((LDAPOp *) modify_op); } } @@ -2484,7 +2484,7 @@ e_book_backend_ldap_get_contact (EBookBackend *backend, return; } - e_data_book_respond_get_contact(book, opid, EDB_ERROR (REPOSITORY_OFFLINE), NULL); + e_data_book_respond_get_contact (book, opid, EDB_ERROR (REPOSITORY_OFFLINE), NULL); return; } diff --git a/addressbook/backends/vcf/e-book-backend-vcf.c b/addressbook/backends/vcf/e-book-backend-vcf.c index 06969a6..f5dcf75 100644 --- a/addressbook/backends/vcf/e-book-backend-vcf.c +++ b/addressbook/backends/vcf/e-book-backend-vcf.c @@ -287,12 +287,12 @@ e_book_backend_vcf_create_contacts (EBookBackendSync *backend, * in our static capability list. */ if (vcards->next != NULL) { g_propagate_error (perror, - EDB_ERROR_EX (NOT_SUPPORTED, + EDB_ERROR_EX (NOT_SUPPORTED, _("The backend does not support bulk additions"))); return; } - contact = do_create(bvcf, vcard, TRUE); + contact = do_create (bvcf, vcard, TRUE); if (added_contacts) { *added_contacts = g_slist_append (*added_contacts, contact); } else { @@ -319,7 +319,7 @@ e_book_backend_vcf_remove_contacts (EBookBackendSync *backend, * in our static capability list. */ if (id_list->next != NULL) { g_propagate_error (perror, - EDB_ERROR_EX (NOT_SUPPORTED, + EDB_ERROR_EX (NOT_SUPPORTED, _("The backend does not support bulk removals"))); return; } @@ -367,7 +367,7 @@ e_book_backend_vcf_modify_contacts (EBookBackendSync *backend, * in our static capability list. */ if (vcards->next != NULL) { g_propagate_error (perror, - EDB_ERROR_EX (NOT_SUPPORTED, + EDB_ERROR_EX (NOT_SUPPORTED, _("The backend does not support bulk modifications"))); return; } diff --git a/addressbook/backends/webdav/e-book-backend-webdav.c b/addressbook/backends/webdav/e-book-backend-webdav.c index 5f7ab57..7a8fe24 100644 --- a/addressbook/backends/webdav/e-book-backend-webdav.c +++ b/addressbook/backends/webdav/e-book-backend-webdav.c @@ -320,9 +320,9 @@ e_book_backend_webdav_create_contacts (EBookBackend *backend, * in our static capability list. This is because there is no clean way to roll back changes in case of an error. */ if (vcards->next != NULL) { e_data_book_respond_create_contacts (book, opid, - EDB_ERROR_EX (NOT_SUPPORTED, + EDB_ERROR_EX (NOT_SUPPORTED, _("The backend does not support bulk additions")), - NULL); + NULL); return; } @@ -348,9 +348,9 @@ e_book_backend_webdav_create_contacts (EBookBackend *backend, e_data_book_respond_create_contacts (book, opid, webdav_handle_auth_request (webdav), NULL); } else { e_data_book_respond_create_contacts (book, opid, - e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, + e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, _("Create resource '%s' failed with HTTP status: %d (%s)"), uid, status, status_reason), - NULL); + NULL); } g_free (uid); g_free (status_reason); @@ -427,9 +427,9 @@ e_book_backend_webdav_remove_contacts (EBookBackend *backend, * in our static capability list. */ if (id_list->next != NULL) { e_data_book_respond_remove_contacts (book, opid, - EDB_ERROR_EX (NOT_SUPPORTED, + EDB_ERROR_EX (NOT_SUPPORTED, _("The backend does not support bulk removals")), - NULL); + NULL); return; } @@ -437,13 +437,13 @@ e_book_backend_webdav_remove_contacts (EBookBackend *backend, if (status != 204) { if (status == 401 || status == 407) { e_data_book_respond_remove_contacts (book, opid, - webdav_handle_auth_request (webdav), NULL); + webdav_handle_auth_request (webdav), NULL); } else { g_warning("DELETE failed with HTTP status %d", status); e_data_book_respond_remove_contacts (book, opid, - e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, + e_data_book_create_error_fmt (E_DATA_BOOK_STATUS_OTHER_ERROR, "DELETE failed with HTTP status %d", status), - NULL); + NULL); } return; } @@ -481,9 +481,9 @@ e_book_backend_webdav_modify_contacts (EBookBackend *backend, * in our static capability list. This is because there is no clean way to roll back changes in case of an error. */ if (vcards->next != NULL) { e_data_book_respond_modify_contacts (book, opid, - EDB_ERROR_EX (NOT_SUPPORTED, + EDB_ERROR_EX (NOT_SUPPORTED, _("The backend does not support bulk modifications")), - NULL); + NULL); return; } diff --git a/addressbook/libebook/e-book-client-view.c b/addressbook/libebook/e-book-client-view.c index 22dd217..3232f91 100644 --- a/addressbook/libebook/e-book-client-view.c +++ b/addressbook/libebook/e-book-client-view.c @@ -276,9 +276,9 @@ e_book_client_view_stop (EBookClientView *view, * Since: 3.4 */ void -e_book_client_view_set_flags (EBookClientView *view, - EBookClientViewFlags flags, - GError **error) +e_book_client_view_set_flags (EBookClientView *view, + EBookClientViewFlags flags, + GError **error) { EBookClientViewPrivate *priv; diff --git a/addressbook/libebook/e-book-client-view.h b/addressbook/libebook/e-book-client-view.h index 94df3cd..bbf93af 100644 --- a/addressbook/libebook/e-book-client-view.h +++ b/addressbook/libebook/e-book-client-view.h @@ -38,14 +38,14 @@ typedef struct _EBookClientViewPrivate EBookClientViewPrivate; struct _EBookClient; /* Forward reference */ - /** * EBookClientViewFlags: - * @E_BOOK_CLIENT_VIEW_FLAGS_NONE: Symbolic value for no flags - * @E_BOOK_CLIENT_VIEW_FLAGS_NOTIFY_INITIAL: If this flag is set then all contacts matching the - * view's query will be sent as notifications when starting - * the view, otherwise only future changes will be reported. - * The default for a #EBookClientView is %TRUE. + * @E_BOOK_CLIENT_VIEW_FLAGS_NONE: + * Symbolic value for no flags + * @E_BOOK_CLIENT_VIEW_FLAGS_NOTIFY_INITIAL: + * If this flag is set then all contacts matching the view's query will + * be sent as notifications when starting the view, otherwise only future + * changes will be reported. The default for a #EBookClientView is %TRUE. * * Flags that control the behaviour of an #EBookClientView. * @@ -56,7 +56,6 @@ typedef enum { E_BOOK_CLIENT_VIEW_FLAGS_NOTIFY_INITIAL = (1 << 0), } EBookClientViewFlags; - struct _EBookClientView { GObject parent; /*< private >*/ diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c index 5e82d9d..4c8403f 100644 --- a/addressbook/libebook/e-contact.c +++ b/addressbook/libebook/e-contact.c @@ -2252,7 +2252,6 @@ e_contact_photo_set_uri (EContactPhoto *photo, photo->data.uri = g_strdup (uri); } - /* Try to unescape a mime type which was encoded into * the filename, return the mime type if g_content_type_from_mime_type() * returns something for the decoded filename extension. @@ -2285,8 +2284,8 @@ mime_type_from_filename (const gchar *filename) } static gboolean -e_contact_photo_make_inline (EContactPhoto *photo, - GError **error) +e_contact_photo_make_inline (EContactPhoto *photo, + GError **error) { gchar *filename; gchar *contents = NULL; @@ -2307,7 +2306,7 @@ e_contact_photo_make_inline (EContactPhoto *photo, mime_type = mime_type_from_filename (filename); if (!mime_type) { gchar *content_type = - g_content_type_guess (NULL, (const guchar *)contents, length, NULL); + g_content_type_guess (NULL, (const guchar *) contents, length, NULL); if (content_type) mime_type = g_content_type_get_mime_type (content_type); @@ -2318,8 +2317,8 @@ e_contact_photo_make_inline (EContactPhoto *photo, g_free (photo->data.uri); photo->type = E_CONTACT_PHOTO_TYPE_INLINED; - photo->data.inlined.data = (guchar *)contents; - photo->data.inlined.length = length; + photo->data.inlined.data = (guchar *) contents; + photo->data.inlined.length = length; photo->data.inlined.mime_type = mime_type; success = TRUE; @@ -2329,9 +2328,9 @@ e_contact_photo_make_inline (EContactPhoto *photo, } static gboolean -e_contact_inline_photo_field (EContact *contact, - EContactField field, - GError **error) +e_contact_inline_photo_field (EContact *contact, + EContactField field, + GError **error) { EContactPhoto *photo; gboolean success = TRUE; @@ -2367,8 +2366,8 @@ e_contact_inline_photo_field (EContact *contact, * Since: 3.4 */ gboolean -e_contact_inline_local_photos (EContact *contact, - GError **error) +e_contact_inline_local_photos (EContact *contact, + GError **error) { gboolean success = TRUE; @@ -2381,7 +2380,6 @@ e_contact_inline_local_photos (EContact *contact, return success; } - E_CONTACT_DEFINE_BOXED_TYPE (e_contact_photo, "EContactPhoto") /** diff --git a/addressbook/libebook/e-vcard.h b/addressbook/libebook/e-vcard.h index a4dac60..351fc6b 100644 --- a/addressbook/libebook/e-vcard.h +++ b/addressbook/libebook/e-vcard.h @@ -169,13 +169,30 @@ typedef enum { #define E_TYPE_VCARD_PARAM_ATTRIBUTE (e_vcard_attribute_param_get_type ()) -#define E_VCARD_21_VALID_PROPERTIES "ADR,ORG,N,AGENT,LOGO,PHOTO,LABEL,FN,TITLE,SOUND,VERSION,TEL," \ - "EMAIL,TZ,GEO,NOTE,URL,BDAY,ROLE,REV,UID,KEY,MAILER" -#define E_VCARD_21_VALID_PARAMETERS "TYPE,VALUE,ENCODING,CHARSET,LANGUAGE,DOM,INTL,POSTAL,PARCEL," \ - "HOME,WORK,PREF,VOICE,FAX,MSG,CELL,PAGER,BBS,MODEM,CAR,ISDN,VIDEO,AOL,APPLELINK," \ - "ATTMAIL,CIS,EWORLD,INTERNET,IBMMAIL,MCIMAIL,POWERSHARE,PRODIGY,TLX,X400,GIF,CGM," \ - "WMF,BMP,MET,PMB,DIB,PICT,TIFF,PDF,PS,JPEG,QTIME,MPEG,MPEG2,AVI,WAVE,AIFF,PCM," \ - "X509,PGP" +/** + * E_VCARD_21_VALID_PROPERTIES: + * + * FIXME: Document me! + * + * Since: 3.4 + **/ +#define E_VCARD_21_VALID_PROPERTIES \ + "ADR,ORG,N,AGENT,LOGO,PHOTO,LABEL,FN,TITLE,SOUND,VERSION,TEL," \ + "EMAIL,TZ,GEO,NOTE,URL,BDAY,ROLE,REV,UID,KEY,MAILER" + +/** + * E_VCARD_21_VALID_PARAMETERS: + * + * FIXME: Document me! + * + * Since: 3.4 + **/ +#define E_VCARD_21_VALID_PARAMETERS \ + "TYPE,VALUE,ENCODING,CHARSET,LANGUAGE,DOM,INTL,POSTAL,PARCEL," \ + "HOME,WORK,PREF,VOICE,FAX,MSG,CELL,PAGER,BBS,MODEM,CAR,ISDN,VIDEO," \ + "AOL,APPLELINK,ATTMAIL,CIS,EWORLD,INTERNET,IBMMAIL,MCIMAIL," \ + "POWERSHARE,PRODIGY,TLX,X400,GIF,CGM,WMF,BMP,MET,PMB,DIB,PICT,TIFF," \ + "PDF,PS,JPEG,QTIME,MPEG,MPEG2,AVI,WAVE,AIFF,PCM,X509,PGP" typedef struct _EVCard EVCard; typedef struct _EVCardClass EVCardClass; diff --git a/addressbook/libedata-book/e-book-backend-db-cache.c b/addressbook/libedata-book/e-book-backend-db-cache.c index 24eff63..2a6daf0 100644 --- a/addressbook/libedata-book/e-book-backend-db-cache.c +++ b/addressbook/libedata-book/e-book-backend-db-cache.c @@ -319,7 +319,7 @@ e_book_backend_db_cache_get_contacts (DB *db, /** * e_book_backend_db_cache_search: - * @backend: an #EBookBackend + * @db: DB handle * @query: an s-expression * * Returns an array of pointers to unique contact ID strings for contacts @@ -373,7 +373,7 @@ e_book_backend_db_cache_exists (const gchar *uri) /** * e_book_backend_db_cache_set_populated: - * @backend: an #EBookBackend + * @db: DB handle * * Flags @cache as being populated - that is, it is up-to-date on the * contents of the book it's caching. diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb.h b/addressbook/libedata-book/e-book-backend-sqlitedb.h index e418523..4726f0f 100644 --- a/addressbook/libedata-book/e-book-backend-sqlitedb.h +++ b/addressbook/libedata-book/e-book-backend-sqlitedb.h @@ -87,7 +87,7 @@ GType e_book_backend_sqlitedb_get_type (void); EBookBackendSqliteDB * e_book_backend_sqlitedb_new (const gchar *path, - const gchar *email_id, + const gchar *emailid, const gchar *folderid, const gchar *folder_name, gboolean store_vcard, diff --git a/addressbook/libedata-book/e-book-backend-sync.c b/addressbook/libedata-book/e-book-backend-sync.c index cb4b15c..04c5c0b 100644 --- a/addressbook/libedata-book/e-book-backend-sync.c +++ b/addressbook/libedata-book/e-book-backend-sync.c @@ -242,7 +242,8 @@ e_book_backend_sync_remove_contacts (EBookBackendSync *backend, * @book: an #EDataBook * @cancellable: a #GCancellable for the operation * @vcards: the string representations of contacts - * @contacts: a pointer to a location to store the resulting #EContact objects + * @modified_contacts: a pointer to a location to store the resulting + * #EContact objects * @error: #GError to set, when something fails * * Modifies the contacts specified by the IDs embedded in @vcards, to @@ -255,16 +256,16 @@ e_book_backend_sync_modify_contacts (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const GSList *vcards, - GSList **contacts, + GSList **modified_contacts, GError **error) { e_return_data_book_error_if_fail (E_IS_BOOK_BACKEND_SYNC (backend), E_DATA_BOOK_STATUS_INVALID_ARG); e_return_data_book_error_if_fail (E_IS_DATA_BOOK (book), E_DATA_BOOK_STATUS_INVALID_ARG); e_return_data_book_error_if_fail (vcards, E_DATA_BOOK_STATUS_INVALID_ARG); - e_return_data_book_error_if_fail (contacts, E_DATA_BOOK_STATUS_INVALID_ARG); + e_return_data_book_error_if_fail (modified_contacts, E_DATA_BOOK_STATUS_INVALID_ARG); e_return_data_book_error_if_fail (E_BOOK_BACKEND_SYNC_GET_CLASS (backend)->modify_contacts_sync, E_DATA_BOOK_STATUS_NOT_SUPPORTED); - (* E_BOOK_BACKEND_SYNC_GET_CLASS (backend)->modify_contacts_sync) (backend, book, cancellable, vcards, contacts, error); + (* E_BOOK_BACKEND_SYNC_GET_CLASS (backend)->modify_contacts_sync) (backend, book, cancellable, vcards, modified_contacts, error); } /** diff --git a/addressbook/libedata-book/e-book-backend.c b/addressbook/libedata-book/e-book-backend.c index fd576fb..6e32110 100644 --- a/addressbook/libedata-book/e-book-backend.c +++ b/addressbook/libedata-book/e-book-backend.c @@ -629,39 +629,38 @@ e_book_backend_get_contact_list_uids (EBookBackend *backend, /** * e_book_backend_start_book_view: * @backend: an #EBookBackend - * @book_view: the #EDataBookView to start + * @view: the #EDataBookView to start * - * Starts running the query specified by @book_view, emitting - * signals for matching contacts. + * Starts running the query specified by @view, emitting signals for + * matching contacts. **/ void e_book_backend_start_book_view (EBookBackend *backend, - EDataBookView *book_view) + EDataBookView *view) { g_return_if_fail (E_IS_BOOK_BACKEND (backend)); - g_return_if_fail (E_IS_DATA_BOOK_VIEW (book_view)); + g_return_if_fail (E_IS_DATA_BOOK_VIEW (view)); g_return_if_fail (E_BOOK_BACKEND_GET_CLASS (backend)->start_book_view); - (* E_BOOK_BACKEND_GET_CLASS (backend)->start_book_view) (backend, book_view); + (* E_BOOK_BACKEND_GET_CLASS (backend)->start_book_view) (backend, view); } /** * e_book_backend_stop_book_view: * @backend: an #EBookBackend - * @book_view: the #EDataBookView to stop + * @view: the #EDataBookView to stop * - * Stops running the query specified by @book_view, emitting - * no more signals. + * Stops running the query specified by @view, emitting no more signals. **/ void e_book_backend_stop_book_view (EBookBackend *backend, - EDataBookView *book_view) + EDataBookView *view) { g_return_if_fail (E_IS_BOOK_BACKEND (backend)); - g_return_if_fail (E_IS_DATA_BOOK_VIEW (book_view)); + g_return_if_fail (E_IS_DATA_BOOK_VIEW (view)); g_return_if_fail (E_BOOK_BACKEND_GET_CLASS (backend)->stop_book_view); - (* E_BOOK_BACKEND_GET_CLASS (backend)->stop_book_view) (backend, book_view); + (* E_BOOK_BACKEND_GET_CLASS (backend)->stop_book_view) (backend, view); } /** diff --git a/addressbook/libedata-book/e-data-book-view.c b/addressbook/libedata-book/e-data-book-view.c index 6d0c545..3f820cd 100644 --- a/addressbook/libedata-book/e-data-book-view.c +++ b/addressbook/libedata-book/e-data-book-view.c @@ -692,10 +692,10 @@ impl_DataBookView_stop (EGdbusBookView *object, } static gboolean -impl_DataBookView_setFlags (EGdbusBookView *object, - GDBusMethodInvocation *invocation, - EBookClientViewFlags flags, - EDataBookView *book_view) +impl_DataBookView_setFlags (EGdbusBookView *object, + GDBusMethodInvocation *invocation, + EBookClientViewFlags flags, + EDataBookView *book_view) { book_view->priv->flags = flags; diff --git a/addressbook/libegdbus/e-gdbus-book-view.c b/addressbook/libegdbus/e-gdbus-book-view.c index 9eb9980..a12ddf6 100644 --- a/addressbook/libegdbus/e-gdbus-book-view.c +++ b/addressbook/libegdbus/e-gdbus-book-view.c @@ -172,36 +172,36 @@ e_gdbus_book_view_call_stop_sync (GDBusProxy *proxy, void e_gdbus_book_view_call_set_flags (GDBusProxy *proxy, - guint in_flags, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) + guint in_flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { e_gdbus_proxy_method_call_uint ("set_flags", proxy, in_flags, cancellable, callback, user_data); } gboolean e_gdbus_book_view_call_set_flags_finish (GDBusProxy *proxy, - GAsyncResult *result, - GError **error) + GAsyncResult *result, + GError **error) { return e_gdbus_proxy_method_call_finish_void (proxy, result, error); } gboolean e_gdbus_book_view_call_set_flags_sync (GDBusProxy *proxy, - guint in_flags, - GCancellable *cancellable, - GError **error) + guint in_flags, + GCancellable *cancellable, + GError **error) { return e_gdbus_proxy_method_call_sync_uint__void ("set_flags", proxy, in_flags, cancellable, error); } void e_gdbus_book_view_call_dispose (GDBusProxy *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { e_gdbus_proxy_method_call_void ("dispose", proxy, cancellable, callback, user_data); } diff --git a/addressbook/libegdbus/e-gdbus-book-view.h b/addressbook/libegdbus/e-gdbus-book-view.h index 56e8965..ea0c06b 100644 --- a/addressbook/libegdbus/e-gdbus-book-view.h +++ b/addressbook/libegdbus/e-gdbus-book-view.h @@ -114,7 +114,7 @@ struct _EGdbusBookViewIface /* Signal handlers for handling D-Bus method calls: */ gboolean (*handle_start) (EGdbusBookView *object, GDBusMethodInvocation *invocation); gboolean (*handle_stop) (EGdbusBookView *object, GDBusMethodInvocation *invocation); - gboolean (*handle_set_flags) (EGdbusBookView *object, GDBusMethodInvocation *invocation, guint in_flags); + gboolean (*handle_set_flags) (EGdbusBookView *object, GDBusMethodInvocation *invocation, guint in_flags); gboolean (*handle_dispose) (EGdbusBookView *object, GDBusMethodInvocation *invocation); gboolean (*handle_set_fields_of_interest)(EGdbusBookView *object, GDBusMethodInvocation *invocation, const gchar * const *in_only_fields); }; @@ -128,7 +128,7 @@ void e_gdbus_book_view_call_stop (GDBusProxy *proxy, GCancellable *cancellable gboolean e_gdbus_book_view_call_stop_finish (GDBusProxy *proxy, GAsyncResult *result, GError **error); gboolean e_gdbus_book_view_call_stop_sync (GDBusProxy *proxy, GCancellable *cancellable, GError **error); -void e_gdbus_book_view_call_set_flags (GDBusProxy *proxy, +void e_gdbus_book_view_call_set_flags (GDBusProxy *proxy, guint in_flags, GCancellable *cancellable, GAsyncReadyCallback callback, diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c index c6b071c..1fe45be 100644 --- a/calendar/backends/caldav/e-cal-backend-caldav.c +++ b/calendar/backends/caldav/e-cal-backend-caldav.c @@ -3165,7 +3165,8 @@ convert_to_url_attachment (ECalBackendCalDAV *cbdav, } static void -remove_files (const gchar *dir, const gchar *fileprefix) +remove_files (const gchar *dir, + const gchar *fileprefix) { GDir *d; @@ -3223,7 +3224,7 @@ remove_cached_attachment (ECalBackendCalDAV *cbdav, fileprefix++; if (*fileprefix) - fileprefix[strlen(fileprefix) - 1] = '\0'; + fileprefix[strlen (fileprefix) - 1] = '\0'; remove_files (dir, fileprefix); } @@ -3524,11 +3525,11 @@ replace_master (ECalBackendCalDAV *cbdav, /* a busy_lock is supposed to be locked already, when calling this function */ static void -do_create_object (ECalBackendCalDAV *cbdav, - const gchar *in_calobj, - gchar **uid, - icalcomponent **new_component, - GError **perror) +do_create_object (ECalBackendCalDAV *cbdav, + const gchar *in_calobj, + gchar **uid, + icalcomponent **new_component, + GError **perror) { ECalComponent *comp; gboolean online, did_put = FALSE; @@ -3628,11 +3629,11 @@ do_create_object (ECalBackendCalDAV *cbdav, /* a busy_lock is supposed to be locked already, when calling this function */ static void do_modify_object (ECalBackendCalDAV *cbdav, - const gchar *calobj, - CalObjModType mod, - icalcomponent **old_component, - icalcomponent **new_component, - GError **error) + const gchar *calobj, + CalObjModType mod, + icalcomponent **old_component, + icalcomponent **new_component, + GError **error) { ECalBackendCalDAVPrivate *priv; ECalComponent *comp; @@ -3805,12 +3806,12 @@ do_modify_object (ECalBackendCalDAV *cbdav, /* a busy_lock is supposed to be locked already, when calling this function */ static void do_remove_object (ECalBackendCalDAV *cbdav, - const gchar *uid, - const gchar *rid, - CalObjModType mod, - icalcomponent **old_component, - icalcomponent **component, - GError **perror) + const gchar *uid, + const gchar *rid, + CalObjModType mod, + icalcomponent **old_component, + icalcomponent **component, + GError **perror) { ECalBackendCalDAVPrivate *priv; icalcomponent *cache_comp; @@ -4019,7 +4020,7 @@ process_object (ECalBackendCalDAV *cbdav, if (!is_declined) { icalcomponent *new_component = NULL, *old_component = NULL; - do_modify_object (cbdav, new_obj_str, mod, + do_modify_object (cbdav, new_obj_str, mod, &old_component, &new_component, &err); if (!err) { if (!old_component) diff --git a/calendar/backends/contacts/e-cal-backend-contacts.c b/calendar/backends/contacts/e-cal-backend-contacts.c index fd86ad6..c4f1a79 100644 --- a/calendar/backends/contacts/e-cal-backend-contacts.c +++ b/calendar/backends/contacts/e-cal-backend-contacts.c @@ -1260,11 +1260,12 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc) static void e_cal_backend_contacts_create_object (ECalBackendSync *backend, - EDataCal *cal, - GCancellable *cancellable, - const gchar *calobj, gchar **uid, - icalcomponent **new_component, - GError **perror) + EDataCal *cal, + GCancellable *cancellable, + const gchar *calobj, + gchar **uid, + icalcomponent **new_component, + GError **perror) { g_propagate_error (perror, EDC_ERROR (PermissionDenied)); } diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c index ff253eb..5e7d060 100644 --- a/calendar/backends/file/e-cal-backend-file.c +++ b/calendar/backends/file/e-cal-backend-file.c @@ -128,7 +128,6 @@ static void free_refresh_data (ECalBackendFile *cbfile); static icaltimezone * e_cal_backend_file_internal_get_timezone (ECalBackend *backend, const gchar *tzid); - /* g_hash_table_foreach() callback to destroy a ECalBackendFileObject */ static void free_object_data (gpointer data) @@ -1591,9 +1590,10 @@ typedef struct { EDataCalView *view; } MatchObjectData; - static GSList * -prepend_component (GSList *list, MatchObjectData *match_data, icalcomponent *icalcomp) +prepend_component (GSList *list, + MatchObjectData *match_data, + icalcomponent *icalcomp) { gchar *str; @@ -1605,7 +1605,6 @@ prepend_component (GSList *list, MatchObjectData *match_data, icalcomponent *ica return g_slist_prepend (list, str); } - static void match_object_sexp_to_component (gpointer value, gpointer data) @@ -2070,7 +2069,7 @@ e_cal_backend_file_get_free_busy (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const GSList *users, - time_t start, + time_t start, time_t end, GSList **freebusy, GError **error) @@ -2761,7 +2760,8 @@ remove_instance (ECalBackendFile *cbfile, } static icalcomponent * -clone_icalcomp_from_fileobject (ECalBackendFileObject *obj_data, const gchar *rid) +clone_icalcomp_from_fileobject (ECalBackendFileObject *obj_data, + const gchar *rid) { ECalComponent *comp = obj_data->full_object; icalcomponent *icalcomp = NULL; @@ -2885,7 +2885,7 @@ e_cal_backend_file_remove_object (ECalBackendSync *backend, } if (comp) { - icalcomponent *icalcomp = + icalcomponent *icalcomp = e_cal_component_get_icalcomponent (comp); *old_component = icalcomponent_new_clone (icalcomp); @@ -3226,7 +3226,6 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend, if (!is_declined) add_component (cbfile, comp, FALSE); - component = icalcomponent_new_clone (e_cal_component_get_icalcomponent (comp)); if (!is_declined) e_cal_backend_notify_component_modified (E_CAL_BACKEND (backend), diff --git a/calendar/backends/http/e-cal-backend-http.c b/calendar/backends/http/e-cal-backend-http.c index 6d6efd3..0c73c7a 100644 --- a/calendar/backends/http/e-cal-backend-http.c +++ b/calendar/backends/http/e-cal-backend-http.c @@ -1262,26 +1262,26 @@ e_cal_backend_http_get_free_busy (ECalBackendSync *backend, } static void -e_cal_backend_http_create_object (ECalBackendSync *backend, - EDataCal *cal, - GCancellable *cancellable, - const gchar *calobj, - gchar **uid, - icalcomponent **new_component, - GError **perror) +e_cal_backend_http_create_object (ECalBackendSync *backend, + EDataCal *cal, + GCancellable *cancellable, + const gchar *calobj, + gchar **uid, + icalcomponent **new_component, + GError **perror) { g_propagate_error (perror, EDC_ERROR (PermissionDenied)); } static void e_cal_backend_http_modify_object (ECalBackendSync *backend, - EDataCal *cal, - GCancellable *cancellable, - const gchar *calobj, - CalObjModType mod, - icalcomponent **old_component, - icalcomponent **component, - GError **perror) + EDataCal *cal, + GCancellable *cancellable, + const gchar *calobj, + CalObjModType mod, + icalcomponent **old_component, + icalcomponent **component, + GError **perror) { g_propagate_error (perror, EDC_ERROR (PermissionDenied)); } @@ -1289,14 +1289,14 @@ e_cal_backend_http_modify_object (ECalBackendSync *backend, /* Remove_object handler for the file backend */ static void e_cal_backend_http_remove_object (ECalBackendSync *backend, - EDataCal *cal, - GCancellable *cancellable, - const gchar *uid, - const gchar *rid, - CalObjModType mod, - icalcomponent **old_component, - icalcomponent **component, - GError **perror) + EDataCal *cal, + GCancellable *cancellable, + const gchar *uid, + const gchar *rid, + CalObjModType mod, + icalcomponent **old_component, + icalcomponent **component, + GError **perror) { *old_component = *component = NULL; diff --git a/calendar/libecal/e-cal-client.c b/calendar/libecal/e-cal-client.c index 7172b28..383d0c3 100644 --- a/calendar/libecal/e-cal-client.c +++ b/calendar/libecal/e-cal-client.c @@ -1126,7 +1126,7 @@ e_cal_client_check_organizer_must_attend (ECalClient *client) } /** - * e_cal_get_organizer_must_accept: + * e_cal_client_check_organizer_must_accept: * @client: A calendar client. * * Checks whether a calendar requires organizer to accept their attendance to @@ -2699,7 +2699,7 @@ static gboolean complete_get_object (gboolean res, gchar *out_string, icalcomponent **icalcomp, - gboolean ensure_unique_uid, + gboolean ensure_unique_uid, GError **error) { g_return_val_if_fail (icalcomp != NULL, FALSE); diff --git a/calendar/libedata-cal/e-cal-backend-cache.c b/calendar/libedata-cal/e-cal-backend-cache.c index afd3d25..c76a002 100644 --- a/calendar/libedata-cal/e-cal-backend-cache.c +++ b/calendar/libedata-cal/e-cal-backend-cache.c @@ -636,8 +636,8 @@ get_keys_key (const gchar *key) /** * e_cal_backend_cache_put_key_value: * @cache: An #ECalBackendCache object. - * @keyp: The Key parameter to identify uniquely. - * @valuep: The value for the keyp parameter. + * @key: The Key parameter to identify uniquely. + * @value: The value for the @key parameter. * * Returns: TRUE if the operation was successful, FALSE otherwise. */ diff --git a/calendar/libedata-cal/e-cal-backend-intervaltree.c b/calendar/libedata-cal/e-cal-backend-intervaltree.c index 48b6bde..c6e6527 100644 --- a/calendar/libedata-cal/e-cal-backend-intervaltree.c +++ b/calendar/libedata-cal/e-cal-backend-intervaltree.c @@ -274,7 +274,8 @@ binary_tree_insert (EIntervalTree *tree, /** * e_intervaltree_insert: * @tree: interval tree - * @key: the key to insert. + * @start: start of the interval + * @end: end of the interval * @comp: Component * * Since: 2.32 diff --git a/calendar/libedata-cal/e-cal-backend-sync.c b/calendar/libedata-cal/e-cal-backend-sync.c index de043e7..53ecf99 100644 --- a/calendar/libedata-cal/e-cal-backend-sync.c +++ b/calendar/libedata-cal/e-cal-backend-sync.c @@ -316,12 +316,12 @@ e_cal_backend_sync_get_free_busy (ECalBackendSync *backend, */ void e_cal_backend_sync_create_object (ECalBackendSync *backend, - EDataCal *cal, - GCancellable *cancellable, - const gchar *calobj, - gchar **uid, - icalcomponent **new_component, - GError **error) + EDataCal *cal, + GCancellable *cancellable, + const gchar *calobj, + gchar **uid, + icalcomponent **new_component, + GError **error) { e_return_data_cal_error_if_fail (backend && E_IS_CAL_BACKEND_SYNC (backend), InvalidArg); e_return_data_cal_error_if_fail (E_CAL_BACKEND_SYNC_GET_CLASS (backend)->create_object_sync != NULL, UnsupportedMethod); @@ -346,13 +346,13 @@ e_cal_backend_sync_create_object (ECalBackendSync *backend, */ void e_cal_backend_sync_modify_object (ECalBackendSync *backend, - EDataCal *cal, - GCancellable *cancellable, - const gchar *calobj, - CalObjModType mod, - icalcomponent **old_component, - icalcomponent **new_component, - GError **error) + EDataCal *cal, + GCancellable *cancellable, + const gchar *calobj, + CalObjModType mod, + icalcomponent **old_component, + icalcomponent **new_component, + GError **error) { e_return_data_cal_error_if_fail (backend && E_IS_CAL_BACKEND_SYNC (backend), InvalidArg); e_return_data_cal_error_if_fail (E_CAL_BACKEND_SYNC_GET_CLASS (backend)->modify_object_sync != NULL, UnsupportedMethod); @@ -380,14 +380,14 @@ e_cal_backend_sync_modify_object (ECalBackendSync *backend, */ void e_cal_backend_sync_remove_object (ECalBackendSync *backend, - EDataCal *cal, - GCancellable *cancellable, - const gchar *uid, - const gchar *rid, - CalObjModType mod, - icalcomponent **old_component, - icalcomponent **new_component, - GError **error) + EDataCal *cal, + GCancellable *cancellable, + const gchar *uid, + const gchar *rid, + CalObjModType mod, + icalcomponent **old_component, + icalcomponent **new_component, + GError **error) { e_return_data_cal_error_if_fail (backend && E_IS_CAL_BACKEND_SYNC (backend), InvalidArg); e_return_data_cal_error_if_fail (E_CAL_BACKEND_SYNC_GET_CLASS (backend)->remove_object_sync != NULL, UnsupportedMethod); @@ -774,12 +774,12 @@ cal_backend_modify_object (ECalBackend *backend, } static void -cal_backend_remove_object (ECalBackend *backend, - EDataCal *cal, - guint32 opid, +cal_backend_remove_object (ECalBackend *backend, + EDataCal *cal, + guint32 opid, GCancellable *cancellable, - const gchar *uid, - const gchar *rid, + const gchar *uid, + const gchar *rid, CalObjModType mod) { GError *error = NULL; diff --git a/calendar/libedata-cal/e-cal-backend-sync.h b/calendar/libedata-cal/e-cal-backend-sync.h index c6fa3d1..5e96b91 100644 --- a/calendar/libedata-cal/e-cal-backend-sync.h +++ b/calendar/libedata-cal/e-cal-backend-sync.h @@ -63,7 +63,7 @@ gboolean e_cal_backend_sync_get_backend_property (ECalBackendSync *backend, EDat gboolean e_cal_backend_sync_set_backend_property (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *prop_name, const gchar *prop_value, GError **error); void e_cal_backend_sync_get_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *uid, const gchar *rid, gchar **calobj, GError **error); void e_cal_backend_sync_get_object_list (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *sexp, GSList **calobjs, GError **error); -void e_cal_backend_sync_get_free_busy (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const GSList *users, time_t start, time_t end, GSList **freebusyobjs, GError **error); +void e_cal_backend_sync_get_free_busy (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const GSList *users, time_t start, time_t end, GSList **freebusyobjects, GError **error); void e_cal_backend_sync_create_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *calobj, gchar **uid, icalcomponent **new_component, GError **error); void e_cal_backend_sync_modify_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *calobj, CalObjModType mod, icalcomponent **old_component, icalcomponent **new_component, GError **error); void e_cal_backend_sync_remove_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *uid, const gchar *rid, CalObjModType mod, icalcomponent **old_component, icalcomponent **new_component, GError **error); diff --git a/calendar/libedata-cal/e-cal-backend.c b/calendar/libedata-cal/e-cal-backend.c index 4c3dcc7..1a4d589 100644 --- a/calendar/libedata-cal/e-cal-backend.c +++ b/calendar/libedata-cal/e-cal-backend.c @@ -1287,7 +1287,7 @@ e_cal_backend_get_timezone (ECalBackend *backend, * @cal: an #EDataCal * @opid: the ID to use for this operation * @cancellable: a #GCancellable for the operation - * @tzobj: The timezone object, in a string. + * @tzobject: The timezone object, in a string. * * Add a timezone object to the given backend. * This might be finished with e_data_cal_respond_add_timezone(). @@ -1373,9 +1373,10 @@ e_cal_backend_stop_view (ECalBackend *backend, } static gboolean -component_created_cb (EDataCalView *view, gpointer data) +component_created_cb (EDataCalView *view, + gpointer data) { - ECalComponent *comp = (ECalComponent *)data; + ECalComponent *comp = (ECalComponent *) data; icalcomponent *icalcomp = e_cal_component_get_icalcomponent (comp); if (e_data_cal_view_component_matches (view, comp)) @@ -1392,7 +1393,7 @@ ecal_comp_from_icalcomp (const icalcomponent *component) if (component) { comp = e_cal_component_new (); - icalclone = icalcomponent_new_clone ((icalcomponent *)component); + icalclone = icalcomponent_new_clone ((icalcomponent *) component); if (!e_cal_component_set_icalcomponent (comp, icalclone)) { g_warning ("ecal_comp_from_icalcomp failed to set icalcomponent"); @@ -1414,14 +1415,15 @@ ecal_comp_from_icalcomp (const icalcomponent *component) * Notifies each of the backend's listeners about a new object. * * Like e_cal_backend_notify_object_created() except takes an #icalcomponent - * instead of an ical string representation and uses the #EDataCalView's fields-of-interest - * to filter out unwanted information from ical strings sent over the bus. + * instead of an ical string representation and uses the #EDataCalView's + * fields-of-interest to filter out unwanted information from ical strings + * sent over the bus. * * Since: 3.4 **/ void -e_cal_backend_notify_component_created (ECalBackend *backend, - const icalcomponent *component) +e_cal_backend_notify_component_created (ECalBackend *backend, + const icalcomponent *component) { ECalBackendPrivate *priv; ECalComponent *comp; @@ -1442,24 +1444,25 @@ e_cal_backend_notify_component_created (ECalBackend *backend, /** * e_cal_backend_notify_components_added: * - * Like e_cal_backend_notify_objects_added() except take a list of #icalcomponents - * instead of ical string representations and uses the #EDataCalView's fields-of-interest - * to filter out unwanted information from ical strings sent over the bus. + * Like e_cal_backend_notify_objects_added() except take a list of + * #icalcomponents instead of ical string representations and uses the + * #EDataCalView's fields-of-interest to filter out unwanted information + * from ical strings sent over the bus. * * Since: 3.4 **/ void -e_cal_backend_notify_components_added (ECalBackend *backend, - EDataCalView *view, - const GSList *objects) +e_cal_backend_notify_components_added (ECalBackend *backend, + EDataCalView *view, + const GSList *objects) { e_data_cal_view_notify_components_added (view, objects); } static void -match_view_and_notify_component (EDataCalView *view, - ECalComponent *old_component, - ECalComponent *component) +match_view_and_notify_component (EDataCalView *view, + ECalComponent *old_component, + ECalComponent *component) { gboolean old_match = FALSE, new_match = FALSE; icalcomponent *icalcomp; @@ -1491,7 +1494,8 @@ struct component_call_data { }; static gboolean -call_match_and_notify_component (EDataCalView *view, gpointer user_data) +call_match_and_notify_component (EDataCalView *view, + gpointer user_data) { struct component_call_data *cd = user_data; @@ -1506,20 +1510,21 @@ call_match_and_notify_component (EDataCalView *view, gpointer user_data) * e_cal_backend_notify_component_modified: * @backend: an #ECalBackend * @old_component: the #icalcomponent before the modification - * @component: the #icalcomponent after the modification + * @new_component: the #icalcomponent after the modification * * Notifies each of the backend's listeners about a modified object. * * Like e_cal_backend_notify_object_modified() except takes an #icalcomponent - * instead of an ical string representation and uses the #EDataCalView's fields-of-interest - * to filter out unwanted information from ical strings sent over the bus. + * instead of an ical string representation and uses the #EDataCalView's + * fields-of-interest to filter out unwanted information from ical strings + * sent over the bus. * * Since: 3.4 **/ void -e_cal_backend_notify_component_modified (ECalBackend *backend, - const icalcomponent *old_component, - const icalcomponent *component) +e_cal_backend_notify_component_modified (ECalBackend *backend, + const icalcomponent *old_component, + const icalcomponent *new_component) { ECalBackendPrivate *priv; struct component_call_data cd; @@ -1527,12 +1532,12 @@ e_cal_backend_notify_component_modified (ECalBackend *backend, priv = backend->priv; if (priv->notification_proxy) { - e_cal_backend_notify_component_modified (priv->notification_proxy, old_component, component); + e_cal_backend_notify_component_modified (priv->notification_proxy, old_component, new_component); return; } cd.old_component = ecal_comp_from_icalcomp (old_component); - cd.component = ecal_comp_from_icalcomp (component); + cd.component = ecal_comp_from_icalcomp (new_component); cd.id = NULL; e_cal_backend_foreach_view (backend, call_match_and_notify_component, &cd); @@ -1547,22 +1552,24 @@ e_cal_backend_notify_component_modified (ECalBackend *backend, /** * e_cal_backend_notify_components_modified: * - * Like e_cal_backend_notify_objects_modified() except takes a list of #icalcomponents - * instead of a ical string representations and uses the #EDataCalView's fields-of-interest - * to filter out unwanted information from ical strings sent over the bus. + * Like e_cal_backend_notify_objects_modified() except takes a list of + * #icalcomponents instead of a ical string representations and uses the + * #EDataCalView's fields-of-interest to filter out unwanted information + * from ical strings sent over the bus. * * Since: 3.4 **/ void -e_cal_backend_notify_components_modified (ECalBackend *backend, - EDataCalView *view, - const GSList *objects) +e_cal_backend_notify_components_modified (ECalBackend *backend, + EDataCalView *view, + const GSList *objects) { e_data_cal_view_notify_components_modified (view, objects); } static gboolean -component_removed_cb (EDataCalView *view, gpointer user_data) +component_removed_cb (EDataCalView *view, + gpointer user_data) { struct component_call_data *cd = user_data; @@ -1570,7 +1577,7 @@ component_removed_cb (EDataCalView *view, gpointer user_data) if (cd->component == NULL) { /* if object == NULL, it means the object has been completely - removed from the backend */ + * removed from the backend */ if (!cd->old_component || e_data_cal_view_component_matches (view, cd->old_component)) e_data_cal_view_notify_objects_removed_1 (view, cd->id); } else @@ -1585,22 +1592,23 @@ component_removed_cb (EDataCalView *view, gpointer user_data) * @id: the Id of the removed object * @old_component: the removed component * @component: the component after the removal. This only applies to recurrent - * appointments that had an instance removed. In that case, this function notifies a - * modification instead of a removal. + * appointments that had an instance removed. In that case, this function + * notifies a modification instead of a removal. * * Notifies each of the backend's listeners about a removed object. * * Like e_cal_backend_notify_object_removed() except takes an #icalcomponent - * instead of an ical string representation and uses the #EDataCalView's fields-of-interest - * to filter out unwanted information from ical strings sent over the bus. + * instead of an ical string representation and uses the #EDataCalView's + * fields-of-interest to filter out unwanted information from ical strings + * sent over the bus. * * Since: 3.4 **/ void -e_cal_backend_notify_component_removed (ECalBackend *backend, - const ECalComponentId *id, - const icalcomponent *old_component, - const icalcomponent *component) +e_cal_backend_notify_component_removed (ECalBackend *backend, + const ECalComponentId *id, + const icalcomponent *old_component, + const icalcomponent *component) { ECalBackendPrivate *priv; struct component_call_data cd; @@ -1626,7 +1634,8 @@ e_cal_backend_notify_component_removed (ECalBackend *backend, } static gboolean -object_created_cb (EDataCalView *view, gpointer data) +object_created_cb (EDataCalView *view, + gpointer data) { const gchar *calobj = data; @@ -1678,8 +1687,8 @@ e_cal_backend_notify_objects_added (ECalBackend *backend, static void match_view_and_notify_object (EDataCalView *view, - const gchar *old_object, - const gchar *object) + const gchar *old_object, + const gchar *object) { gboolean old_match = FALSE, new_match = FALSE; @@ -1713,7 +1722,8 @@ struct object_call_data { }; static gboolean -call_match_and_notify_object (EDataCalView *view, gpointer user_data) +call_match_and_notify_object (EDataCalView *view, + gpointer user_data) { struct object_call_data *cd = user_data; @@ -1809,7 +1819,7 @@ void e_cal_backend_notify_object_removed (ECalBackend *backend, const ECalComponentId *id, const gchar *old_object, - const gchar *object) + const gchar *new_object) { ECalBackendPrivate *priv; struct object_call_data cd; @@ -1817,12 +1827,12 @@ e_cal_backend_notify_object_removed (ECalBackend *backend, priv = backend->priv; if (priv->notification_proxy) { - e_cal_backend_notify_object_removed (priv->notification_proxy, id, old_object, object); + e_cal_backend_notify_object_removed (priv->notification_proxy, id, old_object, new_object); return; } cd.old_object = old_object; - cd.object = object; + cd.object = new_object; cd.id = id; e_cal_backend_foreach_view (backend, object_removed_cb, &cd); diff --git a/calendar/libedata-cal/e-cal-backend.h b/calendar/libedata-cal/e-cal-backend.h index e566110..a50c1fc 100644 --- a/calendar/libedata-cal/e-cal-backend.h +++ b/calendar/libedata-cal/e-cal-backend.h @@ -217,14 +217,14 @@ void e_cal_backend_stop_view (ECalBackend *backend, EDataCalView *view); void e_cal_backend_notify_component_created (ECalBackend *backend, const icalcomponent *component); void e_cal_backend_notify_components_added (ECalBackend *backend, EDataCalView *view, const GSList *components); void e_cal_backend_notify_component_modified (ECalBackend *backend, const icalcomponent *old_component, const icalcomponent *new_component); -void e_cal_backend_notify_components_modified(ECalBackend *backend, EDataCalView *view, const GSList *components); +void e_cal_backend_notify_components_modified (ECalBackend *backend, EDataCalView *view, const GSList *components); void e_cal_backend_notify_component_removed (ECalBackend *backend, const ECalComponentId *id, const icalcomponent *old_component, const icalcomponent *component); void e_cal_backend_notify_object_created (ECalBackend *backend, const gchar *calobj); void e_cal_backend_notify_objects_added (ECalBackend *backend, EDataCalView *view, const GSList *objects); void e_cal_backend_notify_object_modified (ECalBackend *backend, const gchar *old_object, const gchar *object); void e_cal_backend_notify_objects_modified (ECalBackend *backend, EDataCalView *view, const GSList *objects); -void e_cal_backend_notify_object_removed (ECalBackend *backend, const ECalComponentId *id, const gchar *old_object, const gchar *object); +void e_cal_backend_notify_object_removed (ECalBackend *backend, const ECalComponentId *id, const gchar *old_object, const gchar *new_object); void e_cal_backend_notify_objects_removed (ECalBackend *backend, EDataCalView *view, const GSList *ids); void e_cal_backend_notify_error (ECalBackend *backend, const gchar *message); diff --git a/calendar/libedata-cal/e-data-cal-view.c b/calendar/libedata-cal/e-data-cal-view.c index 24b2589..e916df1 100644 --- a/calendar/libedata-cal/e-data-cal-view.c +++ b/calendar/libedata-cal/e-data-cal-view.c @@ -270,7 +270,7 @@ ensure_pending_flush_timeout (EDataCalView *view) static void notify_add (EDataCalView *view, - gchar *obj) + gchar *obj) { EDataCalViewPrivate *priv = view->priv; ECalComponent *comp; @@ -293,7 +293,8 @@ notify_add (EDataCalView *view, } static void -notify_add_component (EDataCalView *view, icalcomponent *icalcomp) +notify_add_component (EDataCalView *view, + icalcomponent *icalcomp) { EDataCalViewPrivate *priv = view->priv; icalcomponent *icalclone; @@ -323,7 +324,8 @@ notify_add_component (EDataCalView *view, icalcomponent *icalcomp) } static void -notify_change (EDataCalView *view, gchar *obj) +notify_change (EDataCalView *view, + gchar *obj) { EDataCalViewPrivate *priv = view->priv; @@ -340,7 +342,8 @@ notify_change (EDataCalView *view, gchar *obj) } static void -notify_change_component (EDataCalView *view, icalcomponent *comp) +notify_change_component (EDataCalView *view, + icalcomponent *comp) { gchar *obj; @@ -350,7 +353,8 @@ notify_change_component (EDataCalView *view, icalcomponent *comp) } static void -notify_remove (EDataCalView *view, ECalComponentId *id) +notify_remove (EDataCalView *view, + ECalComponentId *id) { EDataCalViewPrivate *priv = view->priv; gchar *ids; @@ -722,7 +726,8 @@ e_data_cal_view_object_matches (EDataCalView *view, * Since: 3.4 */ gboolean -e_data_cal_view_component_matches (EDataCalView *view, ECalComponent *component) +e_data_cal_view_component_matches (EDataCalView *view, + ECalComponent *component) { EDataCalViewPrivate *priv; @@ -813,13 +818,15 @@ e_data_cal_view_get_fields_of_interest (EDataCalView *view) } static gboolean -filter_component (icalcomponent *icomponent, GHashTable *fields_of_interest, GString *string) +filter_component (icalcomponent *icomponent, + GHashTable *fields_of_interest, + GString *string) { gchar *str; /* RFC 2445 explicitly says that the newline is *ALWAYS* a \r\n (CRLF)!!!! */ const gchar newline[] = "\r\n"; - + icalcomponent_kind kind; const gchar *kind_string; icalproperty *prop; @@ -869,7 +876,7 @@ filter_component (icalcomponent *icomponent, GHashTable *fields_of_interest, GSt for (icomp = icalcomponent_get_first_component (icomponent, ICAL_ANY_COMPONENT); fail == FALSE && icomp; icomp = icalcomponent_get_next_component (icomponent, ICAL_ANY_COMPONENT)) { - + if (!filter_component (icomp, fields_of_interest, string)) { fail = TRUE; break; @@ -892,12 +899,14 @@ filter_component (icalcomponent *icomponent, GHashTable *fields_of_interest, GSt * that it takes into account the fields-of-interest that @view is * configured with and filters out any unneeded fields. * - * Returns: (transfer full): A newly allocated string representation of @component suitable for @view. + * Returns: (transfer full): A newly allocated string representation of + * @component suitable for @view. * * Since: 3.4 */ gchar * -e_data_cal_view_get_component_string (EDataCalView *view, icalcomponent *component) +e_data_cal_view_get_component_string (EDataCalView *view, + icalcomponent *component) { g_return_val_if_fail (E_IS_DATA_CAL_VIEW (view), NULL); g_return_val_if_fail (component != NULL, NULL); @@ -930,7 +939,7 @@ e_data_cal_view_get_component_string (EDataCalView *view, icalcomponent *compone */ void e_data_cal_view_notify_components_added (EDataCalView *view, - const GSList *components) + const GSList *components) { EDataCalViewPrivate *priv; const GSList *l; @@ -960,14 +969,15 @@ e_data_cal_view_notify_components_added (EDataCalView *view, * Notifies all the view listeners of the addition of a single object. * * Like e_data_cal_view_notify_objects_added_1() except takes an #icalcomponent - * instead of an ical string representation and uses the #EDataCalView's fields-of-interest - * to filter out unwanted information from ical strings sent over the bus. + * instead of an ical string representation and uses the #EDataCalView's + * fields-of-interest to filter out unwanted information from ical strings + * sent over the bus. * * Since: 3.4 */ void -e_data_cal_view_notify_components_added_1 (EDataCalView *view, - const icalcomponent *component) +e_data_cal_view_notify_components_added_1 (EDataCalView *view, + const icalcomponent *component) { GSList l = {NULL,}; @@ -985,15 +995,16 @@ e_data_cal_view_notify_components_added_1 (EDataCalView *view, * * Notifies all view listeners of the modification of a list of components. * - * Like e_data_cal_view_notify_objects_modified() except takes a list of #icalcomponents - * instead of a ical string representations and uses the #EDataCalView's fields-of-interest - * to filter out unwanted information from ical strings sent over the bus. + * Like e_data_cal_view_notify_objects_modified() except takes a list of + * #icalcomponents instead of a ical string representations and uses the + * #EDataCalView's fields-of-interest to filter out unwanted information + * from ical strings sent over the bus. * * Since: 3.4 */ void e_data_cal_view_notify_components_modified (EDataCalView *view, - const GSList *components) + const GSList *components) { EDataCalViewPrivate *priv; const GSList *l; @@ -1023,15 +1034,16 @@ e_data_cal_view_notify_components_modified (EDataCalView *view, * * Notifies all view listeners of the modification of @component. * - * Like e_data_cal_view_notify_objects_modified_1() except takes an #icalcomponent - * instead of an ical string representation and uses the #EDataCalView's fields-of-interest - * to filter out unwanted information from ical strings sent over the bus. + * Like e_data_cal_view_notify_objects_modified_1() except takes an + * #icalcomponent instead of an ical string representation and uses the + * #EDataCalView's fields-of-interest to filter out unwanted information + * from ical strings sent over the bus. * * Since: 3.4 */ void -e_data_cal_view_notify_components_modified_1 (EDataCalView *view, - const icalcomponent *component) +e_data_cal_view_notify_components_modified_1 (EDataCalView *view, + const icalcomponent *component) { GSList l = {NULL,}; diff --git a/calendar/libedata-cal/e-data-cal-view.h b/calendar/libedata-cal/e-data-cal-view.h index bfe80e5..2434ced 100644 --- a/calendar/libedata-cal/e-data-cal-view.h +++ b/calendar/libedata-cal/e-data-cal-view.h @@ -60,9 +60,9 @@ GHashTable * e_data_cal_view_get_fields_of_interest (EDataCalView *view); gchar *e_data_cal_view_get_component_string (EDataCalView *view, icalcomponent *component); -void e_data_cal_view_notify_components_added (EDataCalView *view, const GSList *objects); +void e_data_cal_view_notify_components_added (EDataCalView *view, const GSList *components); void e_data_cal_view_notify_components_added_1 (EDataCalView *view, const icalcomponent *component); -void e_data_cal_view_notify_components_modified (EDataCalView *view, const GSList *objects); +void e_data_cal_view_notify_components_modified (EDataCalView *view, const GSList *components); void e_data_cal_view_notify_components_modified_1 (EDataCalView *view, const icalcomponent *component); void e_data_cal_view_notify_objects_added (EDataCalView *view, const GSList *objects); diff --git a/calendar/libedata-cal/e-data-cal.c b/calendar/libedata-cal/e-data-cal.c index 52ca24e..c9f0517 100644 --- a/calendar/libedata-cal/e-data-cal.c +++ b/calendar/libedata-cal/e-data-cal.c @@ -1174,11 +1174,11 @@ e_data_cal_respond_get_free_busy (EDataCal *cal, * Since: 3.2 */ void -e_data_cal_respond_create_object (EDataCal *cal, - guint32 opid, - GError *error, - const gchar *uid, - icalcomponent *component) +e_data_cal_respond_create_object (EDataCal *cal, + guint32 opid, + GError *error, + const gchar *uid, + icalcomponent *component) { gchar *gdbus_uid = NULL; @@ -1208,11 +1208,11 @@ e_data_cal_respond_create_object (EDataCal *cal, * Since: 3.2 */ void -e_data_cal_respond_modify_object (EDataCal *cal, - guint32 opid, - GError *error, - icalcomponent *old_component, - icalcomponent *component) +e_data_cal_respond_modify_object (EDataCal *cal, + guint32 opid, + GError *error, + icalcomponent *old_component, + icalcomponent *component) { op_complete (cal, opid); @@ -1231,7 +1231,7 @@ e_data_cal_respond_modify_object (EDataCal *cal, * e_data_cal_respond_remove_object: * @cal: A calendar client interface. * @error: Operation error, if any, automatically freed if passed it. - * @uid: UID of the removed object. + * @id: ID of the removed object. * @old_component: The old #icalcomponent. * @component: The new #icalcomponent. This will not be NULL only * when removing instances of a recurring appointment. @@ -1245,8 +1245,8 @@ e_data_cal_respond_remove_object (EDataCal *cal, guint32 opid, GError *error, const ECalComponentId *id, - icalcomponent *old_component, - icalcomponent *component) + icalcomponent *old_component, + icalcomponent *component) { op_complete (cal, opid); diff --git a/calendar/libedata-cal/e-data-cal.h b/calendar/libedata-cal/e-data-cal.h index 9f3e5f4..1cb32e7 100644 --- a/calendar/libedata-cal/e-data-cal.h +++ b/calendar/libedata-cal/e-data-cal.h @@ -141,7 +141,7 @@ void e_data_cal_respond_modify_object (EDataCal *cal, guint32 opid, GError *er void e_data_cal_respond_remove_object (EDataCal *cal, guint32 opid, GError *error, const ECalComponentId *id, icalcomponent *old_component, icalcomponent *component); void e_data_cal_respond_receive_objects (EDataCal *cal, guint32 opid, GError *error); void e_data_cal_respond_send_objects (EDataCal *cal, guint32 opid, GError *error, const GSList *users, const gchar *calobj); -void e_data_cal_respond_get_attachment_uris (EDataCal *cal, guint32 opid, GError *error, const GSList *attachments); +void e_data_cal_respond_get_attachment_uris (EDataCal *cal, guint32 opid, GError *error, const GSList *attachment_uris); void e_data_cal_respond_discard_alarm (EDataCal *cal, guint32 opid, GError *error); void e_data_cal_respond_get_view (EDataCal *cal, guint32 opid, GError *error, const gchar *view_path); void e_data_cal_respond_get_timezone (EDataCal *cal, guint32 opid, GError *error, const gchar *tzobject); diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c index 364c539..a4f88e6 100644 --- a/camel/camel-folder-search.c +++ b/camel/camel-folder-search.c @@ -412,7 +412,6 @@ camel_folder_search_execute_expression (CamelFolderSearch *search, * camel_folder_search_count: * @search: * @expr: - * @uids: to search against, NULL for all uid's. * @error: return location for a #GError, or %NULL * * Run a search. Search must have had Folder already set on it, and diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c index c6d4f27..1641b68 100644 --- a/camel/camel-folder-summary.c +++ b/camel/camel-folder-summary.c @@ -3008,7 +3008,7 @@ camel_folder_summary_info_new_from_parser (CamelFolderSummary *summary, * camel_folder_summary_info_new_from_message: * @summary: a #CamelFodlerSummary object * @message: a #CamelMimeMessage object - * @boydstructure: a bodystructure or NULL + * @bodystructure: a bodystructure or NULL * * Create a summary item from a message. * diff --git a/camel/camel-folder.c b/camel/camel-folder.c index 01a1df6..d0fec0d 100644 --- a/camel/camel-folder.c +++ b/camel/camel-folder.c @@ -1844,7 +1844,7 @@ camel_folder_get_display_name (CamelFolder *folder) /** * camel_folder_set_display_name: * @folder: a #CamelFolder - * @name: a display name for the folder + * @display_name: a display name for the folder * * Sets the display name for the folder. * @@ -2504,7 +2504,7 @@ camel_folder_search_by_expression (CamelFolder *folder, /** * camel_folder_count_by_expression: * @folder: a #CamelFolder - * @expr: a search expression + * @expression: a search expression * @error: return location for a #GError, or %NULL * * Searches the folder for count of messages matching the given search expression. diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c index 837c61a..30f6296 100644 --- a/camel/camel-gpg-context.c +++ b/camel/camel-gpg-context.c @@ -2296,7 +2296,7 @@ camel_gpg_context_get_always_trust (CamelGpgContext *context) /** * camel_gpg_context_set_always_trust: - * @ctx: gpg context + * @context: gpg context * @always_trust always truct flag * * Sets the @always_trust flag on the gpg context which is used for diff --git a/camel/camel-index.c b/camel/camel-index.c index 4bf4079..1546689 100644 --- a/camel/camel-index.c +++ b/camel/camel-index.c @@ -122,21 +122,21 @@ camel_index_rename (CamelIndex *idx, /** * camel_index_set_normalize: - * @idx: a #CamelIndex + * @index: a #CamelIndex * @func: normalization function * @data: user data for @func * * Since: 2.32 **/ void -camel_index_set_normalize (CamelIndex *idx, +camel_index_set_normalize (CamelIndex *index, CamelIndexNorm func, gpointer data) { - g_return_if_fail (CAMEL_IS_INDEX (idx)); + g_return_if_fail (CAMEL_IS_INDEX (index)); - idx->normalize = func; - idx->normalize_data = data; + index->normalize = func; + index->normalize_data = data; } gint diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c index 2ea393d..24f0558 100644 --- a/camel/camel-mime-message.c +++ b/camel/camel-mime-message.c @@ -1311,16 +1311,17 @@ cmm_dump_rec (CamelMimeMessage *msg, /** * camel_mime_message_dump: - * @msg: + * @message: * @body: * * Dump information about the mime message to stdout. * - * If body is TRUE, then dump body content of the message as well (currently unimplemented). + * If body is TRUE, then dump body content of the message as well + * (currently unimplemented). **/ void -camel_mime_message_dump (CamelMimeMessage *msg, +camel_mime_message_dump (CamelMimeMessage *message, gint body) { - cmm_dump_rec (msg, (CamelMimePart *) msg, body, 0); + cmm_dump_rec (message, (CamelMimePart *) message, body, 0); } diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c index 63b6677..43688be 100644 --- a/camel/camel-mime-utils.c +++ b/camel/camel-mime-utils.c @@ -2108,13 +2108,15 @@ rfc2184_decode (const gchar *in, * Returns: the value of the @name param **/ gchar * -camel_header_param (struct _camel_header_param *p, +camel_header_param (struct _camel_header_param *params, const gchar *name) { - while (p && p->name && g_ascii_strcasecmp (p->name, name) != 0) - p = p->next; - if (p) - return p->value; + while (params && params->name && + g_ascii_strcasecmp (params->name, name) != 0) + params = params->next; + if (params) + return params->value; + return NULL; } diff --git a/camel/camel-offline-store.c b/camel/camel-offline-store.c index 6c24ae7..98ee061 100644 --- a/camel/camel-offline-store.c +++ b/camel/camel-offline-store.c @@ -82,7 +82,6 @@ camel_offline_store_init (CamelOfflineStore *store) /** * camel_offline_store_get_online: * @store: a #CamelOfflineStore - * @error: return location for a #GError, or %NULL * * Returns %TRUE if @store is online. * @@ -98,7 +97,7 @@ camel_offline_store_get_online (CamelOfflineStore *store) /** * camel_offline_store_set_online_sync: - * @offline_store: a #CamelOfflineStore + * @store: a #CamelOfflineStore * @online: %TRUE for online, %FALSE for offline * @cancellable: optional #GCancellable object, or %NULL * @error: return location for a #GError, or %NULL @@ -106,12 +105,11 @@ camel_offline_store_get_online (CamelOfflineStore *store) * Sets the online/offline state of @store according to @online. **/ gboolean -camel_offline_store_set_online_sync (CamelOfflineStore *offline_store, +camel_offline_store_set_online_sync (CamelOfflineStore *store, gboolean online, GCancellable *cancellable, GError **error) { - CamelStore *store; CamelService *service; CamelSession *session; CamelSettings *settings; @@ -120,27 +118,25 @@ camel_offline_store_set_online_sync (CamelOfflineStore *offline_store, gboolean sync_store; gboolean success; - g_return_val_if_fail (CAMEL_IS_OFFLINE_STORE (offline_store), FALSE); + g_return_val_if_fail (CAMEL_IS_OFFLINE_STORE (store), FALSE); - if (offline_store->priv->online == online) + if (store->priv->online == online) return TRUE; - store = CAMEL_STORE (offline_store); - service = CAMEL_SERVICE (offline_store); + service = CAMEL_SERVICE (store); session = camel_service_get_session (service); settings = camel_service_get_settings (service); network_available = camel_session_get_network_available (session); - store_is_online = camel_offline_store_get_online (offline_store); + store_is_online = camel_offline_store_get_online (store); sync_store = camel_offline_settings_get_stay_synchronized ( CAMEL_OFFLINE_SETTINGS (settings)); /* Returning to online mode is the simpler case. */ if (!store_is_online) { - offline_store->priv->online = online; - return camel_service_connect_sync ( - CAMEL_SERVICE (store), error); + store->priv->online = online; + return camel_service_connect_sync (service, error); } /* network available -> network unavailable */ @@ -148,7 +144,8 @@ camel_offline_store_set_online_sync (CamelOfflineStore *offline_store, GPtrArray *folders; guint ii; - folders = camel_object_bag_list (store->folders); + folders = camel_object_bag_list ( + CAMEL_STORE (store)->folders); for (ii = 0; ii < folders->len; ii++) { CamelFolder *folder = folders->pdata[ii]; @@ -170,13 +167,14 @@ camel_offline_store_set_online_sync (CamelOfflineStore *offline_store, g_ptr_array_foreach (folders, (GFunc) g_object_unref, NULL); g_ptr_array_free (folders, TRUE); - camel_store_synchronize_sync (store, FALSE, cancellable, NULL); + camel_store_synchronize_sync ( + CAMEL_STORE (store), FALSE, cancellable, NULL); } success = camel_service_disconnect_sync ( - CAMEL_SERVICE (store), network_available, error); + service, network_available, error); - offline_store->priv->online = online; + store->priv->online = online; return success; } @@ -187,11 +185,10 @@ camel_offline_store_set_online_sync (CamelOfflineStore *offline_store, * Since: 2.22 **/ gboolean -camel_offline_store_prepare_for_offline_sync (CamelOfflineStore *offline_store, +camel_offline_store_prepare_for_offline_sync (CamelOfflineStore *store, GCancellable *cancellable, GError **error) { - CamelStore *store; CamelService *service; CamelSession *session; CamelSettings *settings; @@ -199,15 +196,14 @@ camel_offline_store_prepare_for_offline_sync (CamelOfflineStore *offline_store, gboolean store_is_online; gboolean sync_store; - g_return_val_if_fail (CAMEL_IS_OFFLINE_STORE (offline_store), FALSE); + g_return_val_if_fail (CAMEL_IS_OFFLINE_STORE (store), FALSE); - store = CAMEL_STORE (offline_store); - service = CAMEL_SERVICE (offline_store); + service = CAMEL_SERVICE (store); session = camel_service_get_session (service); settings = camel_service_get_settings (service); network_available = camel_session_get_network_available (session); - store_is_online = camel_offline_store_get_online (offline_store); + store_is_online = camel_offline_store_get_online (store); sync_store = camel_offline_settings_get_stay_synchronized ( CAMEL_OFFLINE_SETTINGS (settings)); @@ -216,7 +212,8 @@ camel_offline_store_prepare_for_offline_sync (CamelOfflineStore *offline_store, GPtrArray *folders; guint ii; - folders = camel_object_bag_list (store->folders); + folders = camel_object_bag_list ( + CAMEL_STORE (store)->folders); for (ii = 0; ii < folders->len; ii++) { CamelFolder *folder = folders->pdata[ii]; @@ -241,7 +238,8 @@ camel_offline_store_prepare_for_offline_sync (CamelOfflineStore *offline_store, } if (network_available) - camel_store_synchronize_sync (store, FALSE, cancellable, NULL); + camel_store_synchronize_sync ( + CAMEL_STORE (store), FALSE, cancellable, NULL); return TRUE; } diff --git a/camel/camel-provider.h b/camel/camel-provider.h index 9b8a2e0..f30d505 100644 --- a/camel/camel-provider.h +++ b/camel/camel-provider.h @@ -202,7 +202,7 @@ gboolean camel_provider_load (const gchar *path, GError **error); void camel_provider_register (CamelProvider *provider); GList * camel_provider_list (gboolean load); -CamelProvider * camel_provider_get (const gchar *url_string, +CamelProvider * camel_provider_get (const gchar *protocol, GError **error); /* This is defined by each module, not by camel-provider.c. */ diff --git a/camel/camel-search-sql.c b/camel/camel-search-sql.c index 131096b..1bc8879 100644 --- a/camel/camel-search-sql.c +++ b/camel/camel-search-sql.c @@ -199,15 +199,16 @@ escape_values (gchar *str) /** * camel_sexp_to_sql: - * @txt: A valid sexp expression + * @sexp: A valid sexp expression * - * Converts a valid sexp expression to a sql statement with table fields converted into it. - * This is very specific to Evolution. It might crash is the sexp is invalid. The callers must ensure that the sexp is valid + * Converts a valid sexp expression to a sql statement with table fields + * converted into it. This is very specific to Evolution. It might crash + * is the sexp is invalid. The callers must ensure that the sexp is valid. * * Since: 2.24 **/ gchar * -camel_sexp_to_sql (const gchar *txt) +camel_sexp_to_sql (const gchar *sexp) { GScanner *scanner = g_scanner_new (&config); gchar *sql = NULL; @@ -219,12 +220,12 @@ camel_sexp_to_sql (const gchar *txt) GList *res = NULL; gboolean last_sysnode = FALSE; - d(printf("len = %d\n", strlen (txt))); + d(printf("len = %d\n", strlen (sexp))); - if (!txt || !*txt) + if (!sexp || !*sexp) return NULL; - g_scanner_input_text (scanner, txt, strlen (txt)); + g_scanner_input_text (scanner, sexp, strlen (sexp)); while (!g_scanner_eof (scanner)) { Node *mnode; gint new_level = -1; diff --git a/camel/camel-session.c b/camel/camel-session.c index 75d35f9..b59aa8c 100644 --- a/camel/camel-session.c +++ b/camel/camel-session.c @@ -1269,7 +1269,7 @@ camel_session_get_junk_filter (CamelSession *session) /** * camel_session_set_junk_filter: * @session: a #CamelSession - * @junk_filer: a #CamelJunkFilter, or %NULL + * @junk_filter: a #CamelJunkFilter, or %NULL * * Installs the #CamelJunkFilter instance used to classify messages as * junk or not junk during filtering. diff --git a/camel/camel-session.h b/camel/camel-session.h index 23e955f..005233e 100644 --- a/camel/camel-session.h +++ b/camel/camel-session.h @@ -177,7 +177,7 @@ void camel_session_get_socks_proxy (CamelSession *session, gint *port_ret); CamelService * camel_session_add_service (CamelSession *session, const gchar *uid, - const gchar *uri_string, + const gchar *protocol, CamelProviderType type, GError **error); gboolean camel_session_remove_service (CamelSession *session, @@ -230,7 +230,7 @@ gboolean camel_session_get_network_available (CamelSession *session); void camel_session_set_network_available (CamelSession *session, - gboolean network_state); + gboolean network_available); const GHashTable * camel_session_get_junk_headers (CamelSession *session); void camel_session_set_junk_headers (CamelSession *session, diff --git a/camel/camel-settings.c b/camel/camel-settings.c index d50f20a..e453456 100644 --- a/camel/camel-settings.c +++ b/camel/camel-settings.c @@ -137,7 +137,7 @@ camel_settings_init (CamelSettings *settings) /** * camel_settings_class_list_settings: - * @class: a #CamelSettingsClass + * @settings_class: a #CamelSettingsClass * @n_settings: return location for the length of the returned array * * Returns an array of #GParamSpec for properties of @class which are @@ -150,13 +150,13 @@ camel_settings_init (CamelSettings *settings) * Since: 3.2 **/ GParamSpec ** -camel_settings_class_list_settings (CamelSettingsClass *class, +camel_settings_class_list_settings (CamelSettingsClass *settings_class, guint *n_settings) { - g_return_val_if_fail (CAMEL_IS_SETTINGS_CLASS (class), NULL); - g_return_val_if_fail (class->list_settings != NULL, NULL); + g_return_val_if_fail (CAMEL_IS_SETTINGS_CLASS (settings_class), NULL); + g_return_val_if_fail (settings_class->list_settings != NULL, NULL); - return class->list_settings (class, n_settings); + return settings_class->list_settings (settings_class, n_settings); } /** diff --git a/camel/camel-settings.h b/camel/camel-settings.h index 75dc833..14d1852 100644 --- a/camel/camel-settings.h +++ b/camel/camel-settings.h @@ -77,7 +77,7 @@ struct _CamelSettingsClass { GType camel_settings_get_type (void) G_GNUC_CONST; GParamSpec ** camel_settings_class_list_settings - (CamelSettingsClass *klass, + (CamelSettingsClass *settings_class, guint *n_settings); CamelSettings * camel_settings_clone (CamelSettings *settings); gboolean camel_settings_equal (CamelSettings *settings_a, diff --git a/camel/camel-store.c b/camel/camel-store.c index 85c4f1b..2ef5e23 100644 --- a/camel/camel-store.c +++ b/camel/camel-store.c @@ -1499,7 +1499,6 @@ camel_folder_info_free (CamelFolderInfo *fi) /** * camel_folder_info_new: - * @store: a #CamelStore * * Allocates a new #CamelFolderInfo instance. Free it with * camel_folder_info_free(). diff --git a/docs/reference/addressbook/libebook/libebook-sections.txt b/docs/reference/addressbook/libebook/libebook-sections.txt index 877f3ba..dec9725 100644 --- a/docs/reference/addressbook/libebook/libebook-sections.txt +++ b/docs/reference/addressbook/libebook/libebook-sections.txt @@ -124,6 +124,7 @@ EBookPrivate BOOK_BACKEND_PROPERTY_REQUIRED_FIELDS BOOK_BACKEND_PROPERTY_SUPPORTED_FIELDS BOOK_BACKEND_PROPERTY_SUPPORTED_AUTH_METHODS +BOOK_BACKEND_PROPERTY_REVISION E_BOOK_CLIENT_ERROR EBookClientError e_book_client_error_to_string @@ -195,6 +196,8 @@ e_book_client_view_is_running e_book_client_view_set_fields_of_interest e_book_client_view_start e_book_client_view_stop +EBookClientViewFlags +e_book_client_view_set_flags E_BOOK_CLIENT_VIEW E_IS_BOOK_CLIENT_VIEW @@ -243,6 +246,7 @@ e_contact_photo_get_mime_type e_contact_photo_set_mime_type e_contact_photo_get_uri e_contact_photo_set_uri +e_contact_inline_local_photos e_contact_photo_free e_contact_geo_free e_contact_address_new @@ -406,6 +410,8 @@ EVC_PARENT_CL EVC_CL_UID EVC_X_DEST_EMAIL EVC_X_DEST_NAME +E_VCARD_21_VALID_PROPERTIES +E_VCARD_21_VALID_PARAMETERS E_VCARD E_IS_VCARD diff --git a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt index 1867f93..9fd4ef2 100644 --- a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt +++ b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt @@ -11,6 +11,7 @@ CLIENT_BACKEND_PROPERTY_CAPABILITIES BOOK_BACKEND_PROPERTY_REQUIRED_FIELDS BOOK_BACKEND_PROPERTY_SUPPORTED_FIELDS BOOK_BACKEND_PROPERTY_SUPPORTED_AUTH_METHODS +BOOK_BACKEND_PROPERTY_REVISION e_book_backend_get_cache_dir e_book_backend_set_cache_dir e_book_backend_add_client @@ -325,6 +326,7 @@ e_data_book_view_register_gdbus_object e_data_book_view_get_card_query e_data_book_view_get_card_sexp e_data_book_view_get_backend +e_data_book_view_get_flags e_data_book_view_notify_update e_data_book_view_notify_update_vcard e_data_book_view_notify_update_prefiltered_vcard diff --git a/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt b/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt index a3f6f74..a77bd3f 100644 --- a/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt +++ b/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt @@ -46,6 +46,11 @@ e_cal_backend_add_timezone e_cal_backend_internal_get_timezone e_cal_backend_start_view e_cal_backend_stop_view +e_cal_backend_notify_component_created +e_cal_backend_notify_components_added +e_cal_backend_notify_component_modified +e_cal_backend_notify_components_modified +e_cal_backend_notify_component_removed e_cal_backend_notify_object_created e_cal_backend_notify_objects_added e_cal_backend_notify_object_modified @@ -347,10 +352,16 @@ e_data_cal_view_register_gdbus_object e_data_cal_view_get_text e_data_cal_view_get_object_sexp e_data_cal_view_object_matches +e_data_cal_view_component_matches e_data_cal_view_is_started e_data_cal_view_is_completed e_data_cal_view_is_stopped e_data_cal_view_get_fields_of_interest +e_data_cal_view_get_component_string +e_data_cal_view_notify_components_added +e_data_cal_view_notify_components_added_1 +e_data_cal_view_notify_components_modified +e_data_cal_view_notify_components_modified_1 e_data_cal_view_notify_objects_added e_data_cal_view_notify_objects_added_1 e_data_cal_view_notify_objects_modified diff --git a/libedataserver/e-gdbus-templates.c b/libedataserver/e-gdbus-templates.c index 39d30a3..5e8125a 100644 --- a/libedataserver/e-gdbus-templates.c +++ b/libedataserver/e-gdbus-templates.c @@ -910,7 +910,7 @@ async_op_complete (AsyncOpData *op_data, static void e_gdbus_op_cancelled_cb (GCancellable *cancellable, - AsyncOpData *op_data) + AsyncOpData *op_data) { GError *call_error = NULL; @@ -934,7 +934,7 @@ e_gdbus_op_cancelled_cb (GCancellable *cancellable, static void e_gdbus_async_call_opid_ready_cb (GObject *source_proxy, - GAsyncResult *result, + GAsyncResult *result, gpointer user_data) { GVariant *_result; @@ -994,10 +994,10 @@ copy_strv (const gchar * const *strv) static void e_gdbus_proxy_async_method_done (guint e_gdbus_type, - gconstpointer out_value, - EGdbusAsyncOpKeeper *object, - guint arg_opid, - const GError *error) + gconstpointer out_value, + EGdbusAsyncOpKeeper *object, + guint arg_opid, + const GError *error) { AsyncOpData *op_data; GHashTable *pending_ops; @@ -1091,12 +1091,12 @@ e_gdbus_proxy_async_method_done_uint (EGdbusAsyncOpKeeper *proxy, /* takes ownership of _params */ static void e_gdbus_proxy_call_with_params (GVariant *_params, - const gchar *method_name, - gpointer source_tag, - EGdbusAsyncOpKeeper *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) + const gchar *method_name, + gpointer source_tag, + EGdbusAsyncOpKeeper *proxy, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) { AsyncOpData *op_data; @@ -1330,7 +1330,7 @@ typedef struct _SyncOpData static void e_gdbus_proxy_sync_ready_cb (GObject *proxy, - GAsyncResult *result, + GAsyncResult *result, gpointer user_data) { SyncOpData *sync_data = user_data; @@ -1369,14 +1369,14 @@ e_gdbus_proxy_sync_ready_cb (GObject *proxy, static gboolean e_gdbus_proxy_call_sync (GDBusProxy *proxy, - GCancellable *cancellable, - GError **error, - gpointer start_func, - gpointer finish_func, - guint in_type, - gconstpointer in_value, - guint out_type, - gpointer out_value) + GCancellable *cancellable, + GError **error, + gpointer start_func, + gpointer finish_func, + guint in_type, + gconstpointer in_value, + guint out_type, + gpointer out_value) { SyncOpData sync_data = { 0 }; @@ -1446,8 +1446,8 @@ e_gdbus_proxy_call_sync (GDBusProxy *proxy, || g_main_context_default () == g_main_context_get_thread_default () || !g_main_context_get_thread_default ()))) { /* the call to e_gdbus_templates_init_main_thread() wasn't done, but no problem, - check if the call was done in the main thread with main loop running, - and if so, then remember it + * check if the call was done in the main thread with main loop running, + * and if so, then remember it */ if (!main_thread && g_main_context_is_owner (g_main_context_default ())) e_gdbus_templates_init_main_thread (); diff --git a/libedataserver/e-list.c b/libedataserver/e-list.c index 6022c63..d63e9e4 100644 --- a/libedataserver/e-list.c +++ b/libedataserver/e-list.c @@ -74,26 +74,26 @@ e_list_construct (EList *list, /** * e_list_duplicate: - * @old: The #EList object. + * @list: The #EList object. * * Returns: (transfer full): The duplicated #EList. **/ EList * -e_list_duplicate (EList *old) +e_list_duplicate (EList *list) { - EList *list = g_object_new (E_TYPE_LIST, NULL); + EList *dupe = g_object_new (E_TYPE_LIST, NULL); - list->copy = old->copy; - list->free = old->free; - list->closure = old->closure; - list->list = g_list_copy (old->list); - if (list->copy) { + dupe->copy = list->copy; + dupe->free = list->free; + dupe->closure = list->closure; + dupe->list = g_list_copy (list->list); + if (dupe->copy) { GList *listlist; - for (listlist = list->list; listlist; listlist = listlist->next) { - listlist->data = list->copy (listlist->data, list->closure); + for (listlist = dupe->list; listlist; listlist = listlist->next) { + listlist->data = dupe->copy (listlist->data, dupe->closure); } } - return list; + return dupe; } /** diff --git a/libedataserver/e-operation-pool.h b/libedataserver/e-operation-pool.h index f787558..375f067 100644 --- a/libedataserver/e-operation-pool.h +++ b/libedataserver/e-operation-pool.h @@ -38,6 +38,6 @@ EOperationPool *e_operation_pool_new (guint max_threads, GFunc thread_func, gpoi void e_operation_pool_free (EOperationPool *pool); guint32 e_operation_pool_reserve_opid (EOperationPool *pool); void e_operation_pool_release_opid (EOperationPool *pool, guint32 opid); -void e_operation_pool_push (EOperationPool *pool, gpointer data); +void e_operation_pool_push (EOperationPool *pool, gpointer opdata); #endif /* E_OPERATION_POOL_H */ diff --git a/libedataserver/e-source-group.c b/libedataserver/e-source-group.c index d4a5835..b5d8589 100644 --- a/libedataserver/e-source-group.c +++ b/libedataserver/e-source-group.c @@ -995,23 +995,20 @@ e_source_group_set_property (ESourceGroup *source_group, /** * e_source_group_foreach_property: - * @source_group: the #ESourceGroup + * @group: the #ESourceGroup * @func: (scope call): the func to call on each property * @data: the user data * * Since: 1.12 **/ void -e_source_group_foreach_property (ESourceGroup *source_group, +e_source_group_foreach_property (ESourceGroup *group, GHFunc func, gpointer data) { - ESourceGroupPrivate *priv; - - g_return_if_fail (E_IS_SOURCE_GROUP (source_group)); - priv = source_group->priv; + g_return_if_fail (E_IS_SOURCE_GROUP (group)); - g_hash_table_foreach (priv->properties, func, data); + g_hash_table_foreach (group->priv->properties, func, data); } #undef XC diff --git a/libedataserver/e-source-group.h b/libedataserver/e-source-group.h index 0e91753..c9ed6b1 100644 --- a/libedataserver/e-source-group.h +++ b/libedataserver/e-source-group.h @@ -116,7 +116,7 @@ gchar * e_source_group_get_property (ESourceGroup *source, void e_source_group_set_property (ESourceGroup *source, const gchar *property, const gchar *value); -void e_source_group_foreach_property (ESourceGroup *source, +void e_source_group_foreach_property (ESourceGroup *group, GHFunc func, gpointer data); gchar * e_source_group_to_xml (ESourceGroup *group); diff --git a/libedataserver/e-source-list.c b/libedataserver/e-source-list.c index ffb402c..1b3849e 100644 --- a/libedataserver/e-source-list.c +++ b/libedataserver/e-source-list.c @@ -602,27 +602,27 @@ e_source_list_peek_source_any (ESourceList *list) /** * e_source_list_peek_default_source: - * @source_list: an #ESourceList + * @list: an #ESourceList * - * Attempts to find a default #ESource in @source_list by looking for + * Attempts to find a default #ESource in @list by looking for * a source with a property named "default", or else a source with a * property named "system". If no such #ESource exists, the function * returns %NULL. * - * Returns: (transfer none): the default #ESource in @source_list, or %NULL + * Returns: (transfer none): the default #ESource in @list, or %NULL * * Since: 2.32 **/ ESource * -e_source_list_peek_default_source (ESourceList *source_list) +e_source_list_peek_default_source (ESourceList *list) { ESource *system_source = NULL; GSList *groups; GSList *iter1; - g_return_val_if_fail (E_IS_SOURCE_LIST (source_list), NULL); + g_return_val_if_fail (E_IS_SOURCE_LIST (list), NULL); - groups = e_source_list_peek_groups (source_list); + groups = e_source_list_peek_groups (list); for (iter1 = groups; iter1 != NULL; iter1 = iter1->next) { ESourceGroup *source_group; diff --git a/libedataserver/e-source-list.h b/libedataserver/e-source-list.h index 2f0b553..d67b490 100644 --- a/libedataserver/e-source-list.h +++ b/libedataserver/e-source-list.h @@ -113,7 +113,7 @@ gboolean e_source_list_remove_group_by_base_uri const gchar *base_uri); gboolean e_source_list_remove_source_by_uid (ESourceList *list, - const gchar *uidj); + const gchar *uid); gboolean e_source_list_sync (ESourceList *list, GError **error); gboolean e_source_list_is_gconf_updated (ESourceList *list); diff --git a/libedataserverui/e-categories-editor.c b/libedataserverui/e-categories-editor.c index 35184c1..1af2634 100644 --- a/libedataserverui/e-categories-editor.c +++ b/libedataserverui/e-categories-editor.c @@ -361,7 +361,7 @@ e_categories_editor_get_categories (ECategoriesEditor *editor) /** * e_categories_editor_set_categories: - * @dialog: an #ECategoriesEditor + * @editor: an #ECategoriesEditor * @categories: comma-separated list of categories * * Sets the list of categories selected on the editor. diff --git a/libedataserverui/e-name-selector.c b/libedataserverui/e-name-selector.c index 84b1156..41533e0 100644 --- a/libedataserverui/e-name-selector.c +++ b/libedataserverui/e-name-selector.c @@ -390,7 +390,7 @@ e_name_selector_peek_model (ENameSelector *name_selector) /** * e_name_selector_peek_dialog: - * @name_selelctor: an #ENameSelector + * @name_selector: an #ENameSelector * * Gets the #ENameSelectorDialog used by @name_selector. * diff --git a/libedataserverui/e-passwords.c b/libedataserverui/e-passwords.c index 9a14502..f13e314 100644 --- a/libedataserverui/e-passwords.c +++ b/libedataserverui/e-passwords.c @@ -1074,7 +1074,7 @@ e_passwords_add_password (const gchar *key, * @unused: this argument is no longer used * @key: key to store the password under * @prompt: prompt string - * @type: whether or not to offer to remember the password, + * @remember_type: whether or not to offer to remember the password, * and for how long. * @remember: on input, the default state of the remember checkbox. * on output, the state of the checkbox when the dialog was closed. @@ -1092,7 +1092,7 @@ e_passwords_ask_password (const gchar *title, const gchar *unused, const gchar *key, const gchar *prompt, - EPasswordsRememberType type, + EPasswordsRememberType remember_type, gboolean *remember, GtkWindow *parent) { @@ -1101,14 +1101,14 @@ e_passwords_ask_password (const gchar *title, g_return_val_if_fail (key != NULL, NULL); - if ((type & E_PASSWORDS_ONLINE) && !ep_online_state) + if ((remember_type & E_PASSWORDS_ONLINE) && !ep_online_state) return NULL; msg = ep_msg_new (ep_ask_password); msg->title = title; msg->key = key; msg->prompt = prompt; - msg->flags = type; + msg->flags = remember_type; msg->remember = remember; msg->parent = parent; diff --git a/libedataserverui/e-passwords.h b/libedataserverui/e-passwords.h index 05ba0be..48aa503 100644 --- a/libedataserverui/e-passwords.h +++ b/libedataserverui/e-passwords.h @@ -60,8 +60,9 @@ typedef enum { E_PASSWORDS_PASSPHRASE = 1<<12 /* We are asking a passphrase */ } EPasswordsRememberType; -gchar * e_passwords_ask_password (const gchar *title, - const gchar *unused, const gchar *key, +gchar * e_passwords_ask_password (const gchar *title, + const gchar *unused, + const gchar *key, const gchar *prompt, EPasswordsRememberType remember_type, gboolean *remember, diff --git a/tests/libebook/client/test-client-get-revision.c b/tests/libebook/client/test-client-get-revision.c index bff0511..f76c905 100644 --- a/tests/libebook/client/test-client-get-revision.c +++ b/tests/libebook/client/test-client-get-revision.c @@ -36,14 +36,15 @@ get_revision_compare_cycle (EBookClient *client) g_assert (strcmp (revision_before, revision_after) != 0); g_message ("Passed cycle, revision before '%s' revision after '%s'", - revision_before, revision_after); + revision_before, revision_after); g_free (revision_before); g_free (revision_after); } gint -main (gint argc, gchar **argv) +main (gint argc, + gchar **argv) { EBookClient *book_client; GError *error = NULL; diff --git a/tests/libebook/client/test-client-photo-is-uri.c b/tests/libebook/client/test-client-photo-is-uri.c index 8818cb7..430d00d 100644 --- a/tests/libebook/client/test-client-photo-is-uri.c +++ b/tests/libebook/client/test-client-photo-is-uri.c @@ -4,34 +4,31 @@ #include "client-test-utils.h" - static const gchar *photo_data = -"/9j/4AAQSkZJRgABAQEARwBHAAD//gAXQ3JlYXRlZCB3aXRoIFRoZSBHSU1Q/9sAQwAIBgYHB\ +"/9j / 4AAQSkZJRgABAQEARwBHAAD//gAXQ3JlYXRlZCB3aXRoIFRoZSBHSU1Q / 9sAQwAIBgYHB\ gUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04Mjw\ -uMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyM\ -jIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAMgAyAwEiAAIRAQMRAf/EABsAAQACAwEBAAAAAAAAAAA\ -AAAAHCAQFBgID/8QAMBAAAgEDAQYEBQQDAAAAAAAAAQIDAAQRBQYSEyExQQdhcYEiI0JRkRQVM\ -qFiguH/xAAaAQADAQEBAQAAAAAAAAAAAAAABAUCBgED/8QAIxEAAgICAQQCAwAAAAAAAAAAAAE\ -CAwQRQRITITEUYQUiUf/aAAwDAQACEQMRAD8An+sHUtWtNKjVrmQ7754cajLvjrgfbzPIdzWdV\ -fds9pJb3XdQkMrcFZGj+HqY0bdVV9Tz/wBia+N9vbjvkaxMb5E9N6SJB1HxLEEjJaWsUjD6QzS\ -MPXdGB7E1zV74t63HINy1s4F7CWCTn77wrA0TY86jY3N1qsUk6wxBxBDvYjLHkoUH4j3JP/a0V\ -3s1CvF/QM9tKpw0THeU+TLkj8VLnmzT8y0n9FujBx5bioba/rZLWx3iPZ7RzLp95GtnqRGVTez\ -HNjruH7/4n+67iqpq7Qi3uYWMMsNynfnE6sM8/Lr6VamFi0KMepUE1Sx7XZHbI+fjxos1H0z3S\ -lKYEjzISI2I64OKqsyu8sck2QYrmPjBvpIYg598Vauoh8VtlY7JW2isoBwpPl6hGByZTyD+o6E\ -+h7UtlVOcPHA/+PyI1Wal6Zp7vaC/06wnTTLtEeUDiKwzu4H8vI9AM9Tiuctkng1Nnk1G5cOoY\ -ifB4nI/jB7VjWuoT21qPmwXUCHKlphHKvqG5N6g0/cLi/Rg88FhbkbxlaUSu3kqpnn6kDzqGqb\ -NdPB0XyK4/svZr9RVntL50GePdcKEDqzhVBx7sKtPpayppNosxzKIlDHzxUFeG2zo2n2kivWhK\ +uMzQy / 9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyM\ +jIyMjIyMjIyMjIyMjIyMjIy / 8AAEQgAMgAyAwEiAAIRAQMRAf / EABsAAQACAwEBAAAAAAAAAAA\ +AAAAHCAQFBgID / 8QAMBAAAgEDAQYEBQQDAAAAAAAAAQIDAAQRBQYSEyExQQdhcYEiI0JRkRQVM\ +qFiguH / xAAaAQADAQEBAQAAAAAAAAAAAAAABAUCBgED / 8QAIxEAAgICAQQCAwAAAAAAAAAAAAE\ +CAwQRQRITITEUYQUiUf / aAAwDAQACEQMRAD8An + sHUtWtNKjVrmQ7754cajLvjrgfbzPIdzWdV\ +fds9pJb3XdQkMrcFZGj + HqY0bdVV9Tz / wBia + N9vbjvkaxMb5E9N6SJB1HxLEEjJaWsUjD6QzS\ +MPXdGB7E1zV74t63HINy1s4F7CWCTn77wrA0TY86jY3N1qsUk6wxBxBDvYjLHkoUH4j3JP / a0V\ +3s1CvF / QM9tKpw0THeU + TLkj8VLnmzT8y0n9FujBx5bioba / rZLWx3iPZ7RzLp95GtnqRGVTez\ +HNjruH7 / 4n + 67iqpq7Qi3uYWMMsNynfnE6sM8 / Lr6VamFi0KMepUE1Sx7XZHbI + fjxos1H0z3S\ +lKYEjzISI2I64OKqsyu8sck2QYrmPjBvpIYg598Vauoh8VtlY7JW2isoBwpPl6hGByZTyD + o6E\ ++h7UtlVOcPHA/+PyI1Wal6Zp7vaC / 06wnTTLtEeUDiKwzu4H8vI9AM9Tiuctkng1Nnk1G5cOoY\ +ifB4nI / jB7VjWuoT21qPmwXUCHKlphHKvqG5N6g0 / cLi / Rg88FhbkbxlaUSu3kqpnn6kDzqGqb\ +NdPB0XyK4 / svZr9RVntL50GePdcKEDqzhVBx7sKtPpayppNosxzKIlDHzxUFeG2zo2n2kivWhK\ 6PpHwwoTnfk65J7kZyT9z5VYADAwKuYtfRA5zPv7tnjgUpSmREV8bq1hvbWW1uY1khlUo6MMhg\ eor7UoAje18FtmLe9eeQT3EXPcglkJRPbv71EWu7Dajp2o3MGmlRCkjKQ30jPUe1WlrlNW0Rpt\ -TleNB84DnjkD0P9VlxT4Nqck9pmn8JuFp2zo0cgCWFi2e7555/NSHXLadso2m3sU0NxlV65HM+\ +TleNB84DnjkD0P9VlxT4Nqck9pmn8JuFp2zo0cgCWFi2e7555 / NSHXLadso2m3sU0NxlV65HM+\ VdTW3rgwvsUpSvAFKUoAUxSlAClKUAKUpQB//2Q=="; - static GMainLoop *loop = NULL; static gchar *micheal_jackson_uid = NULL; static gchar *james_brown_uid = NULL; - /* Decide what to do with every "view-completed" signal */ enum { ITERATION_SWAP_FACE = 0, @@ -42,7 +39,6 @@ enum { }; static gint iteration = ITERATION_SWAP_FACE; - static void print_contact (EContact *contact) { @@ -54,36 +50,38 @@ print_contact (EContact *contact) } static void -objects_added (EBookView *book_view, const GSList *contacts) +objects_added (EBookView *book_view, + const GSList *contacts) { const GSList *l; - for (l = (GSList*)contacts; l; l = l->next) { + for (l = (GSList *) contacts; l; l = l->next) { print_contact (l->data); } } static void -objects_modified (EBookView *book_view, const GSList *contacts) +objects_modified (EBookView *book_view, + const GSList *contacts) { GSList *l; - for (l = (GSList*)contacts; l; l = l->next) { + for (l = (GSList *) contacts; l; l = l->next) { print_contact (l->data); } } static void -objects_removed (EBookClientView *book_view, const GSList *ids) +objects_removed (EBookClientView *book_view, + const GSList *ids) { GSList *l; - for (l = (GSList*)ids; l; l = l->next) { + for (l = (GSList *) ids; l; l = l->next) { g_print ("Removed contact: %s\n", (gchar *)l->data); } } - /* This provokes the backend to handle a cross-referenced photo * between contacts, how the backend handles this is it's choice, * we should test that when deleting one of the contacts, the other @@ -112,7 +110,7 @@ give_james_brown_micheal_jacksons_face (EBookClient *book) james_face = g_new (EContactPhoto, 1); james_face->type = E_CONTACT_PHOTO_TYPE_URI; james_face->data.uri = g_strdup (micheal_face->data.uri); - + e_contact_set (james, E_CONTACT_PHOTO, james_face); g_print ("Giving james brown micheal jacksons face: %s\n", micheal_face->data.uri); @@ -122,8 +120,8 @@ give_james_brown_micheal_jacksons_face (EBookClient *book) } static void -update_contact_inline (EBookClient *book, - const gchar *uid) +update_contact_inline (EBookClient *book, + const gchar *uid) { EContact *contact = NULL; EContactPhoto *photo; @@ -156,7 +154,7 @@ update_contact_inline (EBookClient *book, * photo uris exist on disk while they should */ static void assert_uri_exists (EBookClient *book, - const gchar *uid) + const gchar *uid) { EContact *contact; EContactPhoto *photo; @@ -180,7 +178,8 @@ assert_uri_exists (EBookClient *book, } static void -complete (EBookClientView *view, const GError *error) +complete (EBookClientView *view, + const GError *error) { EBookClient *book = e_book_client_view_get_client (view); GError *local_error = NULL; @@ -299,7 +298,7 @@ add_contact_uri (EBookClient *book) } static void -setup_book (EBookClient **book_out) +setup_book (EBookClient **book_out) { EBookClient *book; GError *error = NULL; @@ -318,7 +317,8 @@ setup_book (EBookClient **book_out) } gint -main (gint argc, gchar **argv) +main (gint argc, + gchar **argv) { EBookClient *book; EBookClientView *view; diff --git a/tests/libebook/client/test-client-suppress-notifications.c b/tests/libebook/client/test-client-suppress-notifications.c index 80b9030..781f3d0 100644 --- a/tests/libebook/client/test-client-suppress-notifications.c +++ b/tests/libebook/client/test-client-suppress-notifications.c @@ -51,7 +51,8 @@ finish_test (EBookClientView *view) } static void -objects_added (EBookClientView *view, const GSList *contacts) +objects_added (EBookClientView *view, + const GSList *contacts) { const GSList *l; @@ -70,7 +71,8 @@ objects_added (EBookClientView *view, const GSList *contacts) } static void -objects_removed (EBookClientView *view, const GSList *ids) +objects_removed (EBookClientView *view, + const GSList *ids) { const GSList *l; @@ -83,7 +85,8 @@ objects_removed (EBookClientView *view, const GSList *ids) } static void -complete (EBookClientView *view, const GError *error) +complete (EBookClientView *view, + const GError *error) { /* Now add a contact and assert that we received notification */ loading_view = FALSE; @@ -116,7 +119,9 @@ setup_and_start_view (EBookClientView *view) } static void -get_view_cb (GObject *source_object, GAsyncResult *result, gpointer user_data) +get_view_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { EBookClientView *view; GError *error = NULL; @@ -153,7 +158,8 @@ call_get_view (gpointer user_data) } gint -main (gint argc, gchar **argv) +main (gint argc, + gchar **argv) { EBookClient *book_client; EBookQuery *query; diff --git a/tests/libebook/test-bulk-methods.c b/tests/libebook/test-bulk-methods.c index ea392f8..935bd91 100644 --- a/tests/libebook/test-bulk-methods.c +++ b/tests/libebook/test-bulk-methods.c @@ -49,7 +49,7 @@ test_bulk_add_remove (EBookClient *client, /* Make sure the uids are in the address book */ g_return_val_if_fail (e_book_client_get_contacts_uids_sync (client, sexp, &book_uids, NULL, NULL), FALSE); for (l = added_uids; l != NULL; l = l->next) { - g_return_val_if_fail (check_string_in_slist (book_uids, (const gchar*) l->data), FALSE); + g_return_val_if_fail (check_string_in_slist (book_uids, (const gchar *) l->data), FALSE); } g_slist_free_full (book_uids, g_free); @@ -61,7 +61,7 @@ test_bulk_add_remove (EBookClient *client, book_uids = NULL; g_return_val_if_fail (e_book_client_get_contacts_uids_sync (client, sexp, &book_uids, NULL, NULL), FALSE); for (l = added_uids; l != NULL; l = l->next) { - g_return_val_if_fail (!check_string_in_slist (book_uids, (const gchar*) l->data), FALSE); + g_return_val_if_fail (!check_string_in_slist (book_uids, (const gchar *) l->data), FALSE); } g_slist_free_full (book_uids, g_free); @@ -99,7 +99,7 @@ test_bulk_modify (EBookClient *client, g_print (" * Bulk modification of %d contacts...\n", batch_size); ll = added_uids; for (l = contacts; l != NULL; l = l->next) { - const gchar* uid = ll->data; + const gchar * uid = ll->data; contact = E_CONTACT (l->data); /* Set contact UID */ @@ -166,7 +166,7 @@ test_bulk_modify (EBookClient *client, return TRUE; } -int main (gint argc, gchar **argv) +gint main (gint argc, gchar **argv) { EBookClient *client = NULL; const gchar diff --git a/tests/libebook/test-vcard-parsing.c b/tests/libebook/test-vcard-parsing.c index 9606253..e279b2d 100644 --- a/tests/libebook/test-vcard-parsing.c +++ b/tests/libebook/test-vcard-parsing.c @@ -2,7 +2,9 @@ #include static gboolean -compare_single_value (EVCard *vcard, const gchar *attrname, const gchar *expected_value) +compare_single_value (EVCard *vcard, + const gchar *attrname, + const gchar *expected_value) { EVCardAttribute *attr; gchar *str; @@ -24,7 +26,8 @@ compare_single_value (EVCard *vcard, const gchar *attrname, const gchar *expecte } static gboolean -has_only_one (EVCard *vcard, const gchar *attrname) +has_only_one (EVCard *vcard, + const gchar *attrname) { gboolean found = FALSE; GList *iter; @@ -75,7 +78,7 @@ test_vcard (const gchar *vcard_str) g_free (str); g_object_unref (vc1); - + /* do not parse */ vc1 = e_vcard_new_from_string (vcard_str); /* Setting the UID does not cause vCard parsing */ @@ -217,7 +220,7 @@ test_econtact (const gchar *vcard_str) return TRUE; } -int main(int argc, char **argv) +gint main (gint argc, gchar **argv) { const gchar *test_vcard_no_uid_str = diff --git a/tests/libecal/client/test-client-revision-view.c b/tests/libecal/client/test-client-revision-view.c index 6ee9e75..e772353 100644 --- a/tests/libecal/client/test-client-revision-view.c +++ b/tests/libecal/client/test-client-revision-view.c @@ -31,24 +31,25 @@ subtest_passed (SubTestId id) stop_main_loop (0); } - static struct icaltimetype get_last_modified (icalcomponent *component) { - icalcomponent *inner = icalcomponent_get_inner(component); + icalcomponent *inner = icalcomponent_get_inner (component); icalproperty *prop; - prop = icalcomponent_get_first_property(inner, ICAL_LASTMODIFIED_PROPERTY); + prop = icalcomponent_get_first_property (inner, ICAL_LASTMODIFIED_PROPERTY); - if (prop == 0){ - return icaltime_null_time(); + if (prop == 0) { + return icaltime_null_time (); } return icalproperty_get_lastmodified (prop); } static void -objects_added_cb (GObject *object, const GSList *objects, gpointer data) +objects_added_cb (GObject *object, + const GSList *objects, + gpointer data) { const GSList *l; @@ -69,7 +70,9 @@ objects_added_cb (GObject *object, const GSList *objects, gpointer data) } static void -objects_modified_cb (GObject *object, const GSList *objects, gpointer data) +objects_modified_cb (GObject *object, + const GSList *objects, + gpointer data) { const GSList *l; @@ -90,7 +93,9 @@ objects_modified_cb (GObject *object, const GSList *objects, gpointer data) } static void -objects_removed_cb (GObject *object, const GSList *objects, gpointer data) +objects_removed_cb (GObject *object, + const GSList *objects, + gpointer data) { const GSList *l; @@ -104,7 +109,9 @@ objects_removed_cb (GObject *object, const GSList *objects, gpointer data) } static void -complete_cb (GObject *object, const GError *error, gpointer data) +complete_cb (GObject *object, + const GError *error, + gpointer data) { g_print ("View complete (status: %d, error_msg:%s)\n", error ? error->code : 0, error ? error->message : "NULL"); @@ -136,7 +143,7 @@ alter_cal_client (gpointer user_data) } icalcomponent_set_uid (icalcomp, uid); - icalcomponent_set_recurrenceid (icalcomp, + icalcomponent_set_recurrenceid (icalcomp, icaltime_from_timet (icaltime_as_timet (now) + 60 * 60 * 60, 0)); icalcomponent_set_summary (icalcomp, "Modified event summary"); @@ -163,7 +170,9 @@ alter_cal_client (gpointer user_data) } static void -async_get_view_ready (GObject *source_object, GAsyncResult *result, gpointer user_data) +async_get_view_ready (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { ECalClient *cal_client = E_CAL_CLIENT (source_object); ECalClientView *view = NULL; @@ -213,7 +222,8 @@ get_view_async (gpointer user_data) } gint -main (gint argc, gchar **argv) +main (gint argc, + gchar **argv) { ECalClientView *view = NULL; ECalClient *cal_client; @@ -225,7 +235,6 @@ main (gint argc, gchar **argv) cal_client = new_temp_client (E_CAL_CLIENT_SOURCE_TYPE_EVENTS, NULL); g_return_val_if_fail (cal_client != NULL, FALSE); - if (!e_client_open_sync (E_CLIENT (cal_client), FALSE, NULL, &error)) { report_error ("client open sync", &error); g_object_unref (cal_client);