From da5463a9848b522800cfd720bd8b18108f520bc3 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 7 Nov 2003 17:48:55 +0000 Subject: [PATCH] Remove the word "process" from method names, which hasn't really made * backends/ldap/e-book-backend-ldap.c: Remove the word "process" from method names, which hasn't really made sense since 1.2. * backends/vcf/e-book-backend-vcf.c: Likewise --- addressbook/ChangeLog | 7 +++ addressbook/backends/ldap/e-book-backend-ldap.c | 76 ++++++++++++------------- addressbook/backends/vcf/e-book-backend-vcf.c | 70 +++++++++++------------ 3 files changed, 80 insertions(+), 73 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index c6c066f..72d2755 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2003-11-06 Dan Winship + + * backends/ldap/e-book-backend-ldap.c: Remove the word "process" + from method names, which hasn't really made sense since 1.2. + + * backends/vcf/e-book-backend-vcf.c: Likewise + 2003-11-06 * libebook/Makefile.am: don't add libename diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c index 0af9cf1..22927bd 100644 --- a/addressbook/backends/ldap/e-book-backend-ldap.c +++ b/addressbook/backends/ldap/e-book-backend-ldap.c @@ -1157,9 +1157,9 @@ create_contact_dtor (LDAPOp *op) } static void -e_book_backend_ldap_process_create_contact (EBookBackend *backend, - EDataBook *book, - const char *vcard) +e_book_backend_ldap_create_contact (EBookBackend *backend, + EDataBook *book, + const char *vcard) { LDAPCreateOp *create_op = g_new (LDAPCreateOp, 1); EBookBackendLDAP *bl = E_BOOK_BACKEND_LDAP (backend); @@ -1316,9 +1316,9 @@ remove_contact_dtor (LDAPOp *op) } static void -e_book_backend_ldap_process_remove_contacts (EBookBackend *backend, - EDataBook *book, - GList *ids) +e_book_backend_ldap_remove_contacts (EBookBackend *backend, + EDataBook *book, + GList *ids) { LDAPRemoveOp *remove_op = g_new (LDAPRemoveOp, 1); EBookBackendLDAP *bl = E_BOOK_BACKEND_LDAP (backend); @@ -1518,9 +1518,9 @@ modify_contact_dtor (LDAPOp *op) } static void -e_book_backend_ldap_process_modify_contact (EBookBackend *backend, - EDataBook *book, - const char *vcard) +e_book_backend_ldap_modify_contact (EBookBackend *backend, + EDataBook *book, + const char *vcard) { LDAPModifyOp *modify_op = g_new0 (LDAPModifyOp, 1); EBookBackendLDAP *bl = E_BOOK_BACKEND_LDAP (backend); @@ -1627,9 +1627,9 @@ get_contact_dtor (LDAPOp *op) } static void -e_book_backend_ldap_process_get_contact (EBookBackend *backend, - EDataBook *book, - const char *id) +e_book_backend_ldap_get_contact (EBookBackend *backend, + EDataBook *book, + const char *id) { LDAPGetContactOp *get_contact_op = g_new0 (LDAPGetContactOp, 1); EBookBackendLDAP *bl = E_BOOK_BACKEND_LDAP (backend); @@ -2813,8 +2813,8 @@ e_book_backend_ldap_search (EBookBackendLDAP *bl, } static void -e_book_backend_ldap_process_start_book_view (EBookBackend *backend, - EDataBookView *view) +e_book_backend_ldap_start_book_view (EBookBackend *backend, + EDataBookView *view) { EBookBackendLDAP *bl = E_BOOK_BACKEND_LDAP (backend); @@ -2822,16 +2822,16 @@ e_book_backend_ldap_process_start_book_view (EBookBackend *backend, } static void -e_book_backend_ldap_process_stop_book_view (EBookBackend *backend, - EDataBookView *view) +e_book_backend_ldap_stop_book_view (EBookBackend *backend, + EDataBookView *view) { /* FIXME we don't stop them... */ } static void -e_book_backend_ldap_process_get_changes (EBookBackend *backend, - EDataBook *book, - const char *change_id) +e_book_backend_ldap_get_changes (EBookBackend *backend, + EDataBook *book, + const char *change_id) { /* FIXME: implement */ } @@ -2840,11 +2840,11 @@ e_book_backend_ldap_process_get_changes (EBookBackend *backend, #define SASL_PREFIX "sasl/" static void -e_book_backend_ldap_process_authenticate_user (EBookBackend *backend, - EDataBook *book, - const char *user, - const char *passwd, - const char *auth_method) +e_book_backend_ldap_authenticate_user (EBookBackend *backend, + EDataBook *book, + const char *user, + const char *passwd, + const char *auth_method) { EBookBackendLDAP *bl = E_BOOK_BACKEND_LDAP (backend); int ldap_error; @@ -2945,8 +2945,8 @@ e_book_backend_ldap_process_authenticate_user (EBookBackend *backend, } static void -e_book_backend_ldap_process_get_supported_fields (EBookBackend *backend, - EDataBook *book) +e_book_backend_ldap_get_supported_fields (EBookBackend *backend, + EDataBook *book) { EBookBackendLDAP *bl = E_BOOK_BACKEND_LDAP (backend); @@ -2957,8 +2957,8 @@ e_book_backend_ldap_process_get_supported_fields (EBookBackend *backend, } static void -e_book_backend_ldap_process_get_supported_auth_methods (EBookBackend *backend, - EDataBook *book) +e_book_backend_ldap_get_supported_auth_methods (EBookBackend *backend, + EDataBook *book) { EBookBackendLDAP *bl = E_BOOK_BACKEND_LDAP (backend); @@ -3150,16 +3150,16 @@ e_book_backend_ldap_class_init (EBookBackendLDAPClass *klass) parent_class->load_uri = e_book_backend_ldap_load_uri; parent_class->get_static_capabilities = e_book_backend_ldap_get_static_capabilities; - parent_class->create_contact = e_book_backend_ldap_process_create_contact; - parent_class->remove_contacts = e_book_backend_ldap_process_remove_contacts; - parent_class->modify_contact = e_book_backend_ldap_process_modify_contact; - parent_class->get_contact = e_book_backend_ldap_process_get_contact; - parent_class->start_book_view = e_book_backend_ldap_process_start_book_view; - parent_class->stop_book_view = e_book_backend_ldap_process_stop_book_view; - parent_class->get_changes = e_book_backend_ldap_process_get_changes; - parent_class->authenticate_user = e_book_backend_ldap_process_authenticate_user; - parent_class->get_supported_fields = e_book_backend_ldap_process_get_supported_fields; - parent_class->get_supported_auth_methods = e_book_backend_ldap_process_get_supported_auth_methods; + parent_class->create_contact = e_book_backend_ldap_create_contact; + parent_class->remove_contacts = e_book_backend_ldap_remove_contacts; + parent_class->modify_contact = e_book_backend_ldap_modify_contact; + parent_class->get_contact = e_book_backend_ldap_get_contact; + parent_class->start_book_view = e_book_backend_ldap_start_book_view; + parent_class->stop_book_view = e_book_backend_ldap_stop_book_view; + parent_class->get_changes = e_book_backend_ldap_get_changes; + parent_class->authenticate_user = e_book_backend_ldap_authenticate_user; + parent_class->get_supported_fields = e_book_backend_ldap_get_supported_fields; + parent_class->get_supported_auth_methods = e_book_backend_ldap_get_supported_auth_methods; object_class->dispose = e_book_backend_ldap_dispose; } diff --git a/addressbook/backends/vcf/e-book-backend-vcf.c b/addressbook/backends/vcf/e-book-backend-vcf.c index 010c579..9aeb1bc 100644 --- a/addressbook/backends/vcf/e-book-backend-vcf.c +++ b/addressbook/backends/vcf/e-book-backend-vcf.c @@ -275,10 +275,10 @@ do_create(EBookBackendVCF *bvcf, } static EBookBackendSyncStatus -e_book_backend_vcf_process_create_contact (EBookBackendSync *backend, - EDataBook *book, - const char *vcard, - EContact **contact) +e_book_backend_vcf_create_contact (EBookBackendSync *backend, + EDataBook *book, + const char *vcard, + EContact **contact) { EBookBackendVCF *bvcf = E_BOOK_BACKEND_VCF (backend); @@ -294,10 +294,10 @@ e_book_backend_vcf_process_create_contact (EBookBackendSync *backend, } static EBookBackendSyncStatus -e_book_backend_vcf_process_remove_contacts (EBookBackendSync *backend, - EDataBook *book, - GList *id_list, - GList **ids) +e_book_backend_vcf_remove_contacts (EBookBackendSync *backend, + EDataBook *book, + GList *id_list, + GList **ids) { /* FIXME: make this handle bulk deletes like the file backend does */ EBookBackendVCF *bvcf = E_BOOK_BACKEND_VCF (backend); @@ -325,10 +325,10 @@ e_book_backend_vcf_process_remove_contacts (EBookBackendSync *backend, } static EBookBackendSyncStatus -e_book_backend_vcf_process_modify_contact (EBookBackendSync *backend, - EDataBook *book, - const char *vcard, - EContact **contact) +e_book_backend_vcf_modify_contact (EBookBackendSync *backend, + EDataBook *book, + const char *vcard, + EContact **contact) { EBookBackendVCF *bvcf = E_BOOK_BACKEND_VCF (backend); char *old_id, *old_vcard_string; @@ -361,10 +361,10 @@ e_book_backend_vcf_process_modify_contact (EBookBackendSync *backend, } static EBookBackendSyncStatus -e_book_backend_vcf_process_get_contact (EBookBackendSync *backend, - EDataBook *book, - const char *id, - char **vcard) +e_book_backend_vcf_get_contact (EBookBackendSync *backend, + EDataBook *book, + const char *id, + char **vcard) { EBookBackendVCF *bvcf = E_BOOK_BACKEND_VCF (backend); char *v; @@ -397,10 +397,10 @@ foreach_get_contact_compare (char *id, char *vcard_string, GetContactListClosure } static EBookBackendSyncStatus -e_book_backend_vcf_process_get_contact_list (EBookBackendSync *backend, - EDataBook *book, - const char *query, - GList **contacts) +e_book_backend_vcf_get_contact_list (EBookBackendSync *backend, + EDataBook *book, + const char *query, + GList **contacts) { EBookBackendVCF *bvcf = E_BOOK_BACKEND_VCF (backend); const char *search = query; @@ -442,19 +442,19 @@ e_book_backend_vcf_extract_path_from_uri (const char *uri) } static EBookBackendSyncStatus -e_book_backend_vcf_process_authenticate_user (EBookBackendSync *backend, - EDataBook *book, - const char *user, - const char *passwd, - const char *auth_method) +e_book_backend_vcf_authenticate_user (EBookBackendSync *backend, + EDataBook *book, + const char *user, + const char *passwd, + const char *auth_method) { return GNOME_Evolution_Addressbook_Success; } static EBookBackendSyncStatus -e_book_backend_vcf_process_get_supported_fields (EBookBackendSync *backend, - EDataBook *book, - GList **fields_out) +e_book_backend_vcf_get_supported_fields (EBookBackendSync *backend, + EDataBook *book, + GList **fields_out) { GList *fields = NULL; int i; @@ -624,13 +624,13 @@ e_book_backend_vcf_class_init (EBookBackendVCFClass *klass) backend_class->stop_book_view = e_book_backend_vcf_stop_book_view; backend_class->cancel_operation = e_book_backend_vcf_cancel_operation; - sync_class->create_contact_sync = e_book_backend_vcf_process_create_contact; - sync_class->remove_contacts_sync = e_book_backend_vcf_process_remove_contacts; - sync_class->modify_contact_sync = e_book_backend_vcf_process_modify_contact; - sync_class->get_contact_sync = e_book_backend_vcf_process_get_contact; - sync_class->get_contact_list_sync = e_book_backend_vcf_process_get_contact_list; - sync_class->authenticate_user_sync = e_book_backend_vcf_process_authenticate_user; - sync_class->get_supported_fields_sync = e_book_backend_vcf_process_get_supported_fields; + sync_class->create_contact_sync = e_book_backend_vcf_create_contact; + sync_class->remove_contacts_sync = e_book_backend_vcf_remove_contacts; + sync_class->modify_contact_sync = e_book_backend_vcf_modify_contact; + sync_class->get_contact_sync = e_book_backend_vcf_get_contact; + sync_class->get_contact_list_sync = e_book_backend_vcf_get_contact_list; + sync_class->authenticate_user_sync = e_book_backend_vcf_authenticate_user; + sync_class->get_supported_fields_sync = e_book_backend_vcf_get_supported_fields; object_class->dispose = e_book_backend_vcf_dispose; } -- 2.7.4