diff options
| author | Christopher James Lahey <clahey@helixcode.com> | 2000-11-23 12:00:48 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2000-11-23 12:00:48 +0800 |
| commit | c6e85a3bc20364d1b7350cc8d6de1c2b317fba9f (patch) | |
| tree | 667654ece009b2b7ee9a9ded65c6ac65405ee02a /addressbook | |
| parent | 93c7eea44833db296c55fd0dd04c03acfccc5fc6 (diff) | |
| download | gsoc2013-evolution-c6e85a3bc20364d1b7350cc8d6de1c2b317fba9f.tar.gz gsoc2013-evolution-c6e85a3bc20364d1b7350cc8d6de1c2b317fba9f.tar.zst gsoc2013-evolution-c6e85a3bc20364d1b7350cc8d6de1c2b317fba9f.zip | |
Set view.change_context to NULL in pas_backend_file_process_get_book_view.
2000-11-22 Christopher James Lahey <clahey@helixcode.com>
* backend/pas/pas-backend-file.c: Set view.change_context to NULL
in pas_backend_file_process_get_book_view. Changed
pas_backend_file_book_view_copy a bit.
* backend/pas/pas-backend-ldap.c: Got rid of a warning.
svn path=/trunk/; revision=6654
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 8 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-backend-file.c | 9 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-backend-ldap.c | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index fb589f0b76..154e812ee3 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,11 @@ +2000-11-22 Christopher James Lahey <clahey@helixcode.com> + + * backend/pas/pas-backend-file.c: Set view.change_context to NULL + in pas_backend_file_process_get_book_view. Changed + pas_backend_file_book_view_copy a bit. + + * backend/pas/pas-backend-ldap.c: Got rid of a warning. + 2000-11-18 Matt Bissiri <matt@bissiri.org> * gui/component/Makefile.am: diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c index 299edaf52d..d0ace222ad 100644 --- a/addressbook/backend/pas/pas-backend-file.c +++ b/addressbook/backend/pas/pas-backend-file.c @@ -83,7 +83,7 @@ static PASBackendFileBookView * pas_backend_file_book_view_copy(const PASBackendFileBookView *book_view, void *closure) { PASBackendFileBookView *new_book_view; - new_book_view = g_new0 (PASBackendFileBookView, 1); + new_book_view = g_new (PASBackendFileBookView, 1); new_book_view->book_view = book_view->book_view; new_book_view->search = g_strdup(book_view->search); @@ -93,7 +93,8 @@ pas_backend_file_book_view_copy(const PASBackendFileBookView *book_view, void *c if (book_view->search_context) { new_book_view->search_context = g_new(PASBackendFileSearchContext, 1); new_book_view->search_context->card = book_view->search_context->card; - } + } else + new_book_view->search_context = NULL; new_book_view->change_id = g_strdup(book_view->change_id); if (book_view->change_context) { @@ -105,7 +106,8 @@ pas_backend_file_book_view_copy(const PASBackendFileBookView *book_view, void *c new_book_view->change_context->mod_ids = book_view->change_context->mod_ids; new_book_view->change_context->del_cards = book_view->change_context->del_cards; new_book_view->change_context->del_ids = book_view->change_context->del_ids; - } + } else + new_book_view->change_context = NULL; return new_book_view; } @@ -992,6 +994,7 @@ pas_backend_file_process_get_book_view (PASBackend *backend, view.search = req->search; view.search_sexp = NULL; view.search_context = &ctx; + view.change_context = NULL; ctx.card = NULL; e_list_append(bf->priv->book_views, &view); diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c index 825f03ccc3..22e37b3841 100644 --- a/addressbook/backend/pas/pas-backend-ldap.c +++ b/addressbook/backend/pas/pas-backend-ldap.c @@ -330,7 +330,7 @@ ldap_error_to_response (int ldap_error) { if (ldap_error == LDAP_SUCCESS) return GNOME_Evolution_Addressbook_BookListener_Success; - else if (LDAP_NAME_ERROR (ldap_error)) + else if (NAME_ERROR (ldap_error)) return GNOME_Evolution_Addressbook_BookListener_CardNotFound; else if (ldap_error == LDAP_INSUFFICIENT_ACCESS) return GNOME_Evolution_Addressbook_BookListener_PermissionDenied; |