diff options
author | Chris Toshok <toshok@ximian.com> | 2003-02-08 17:05:42 +0800 |
---|---|---|
committer | Chris Toshok <toshok@src.gnome.org> | 2003-02-08 17:05:42 +0800 |
commit | aaa6c778e8c8458e107f564d12f1089880810f04 (patch) | |
tree | 19ac67dfd11ad7b236f93cfe2b04e9d5a6064bf3 /addressbook/backend/ebook/e-book-view-listener.c | |
parent | 5d961e94b2009211f6e7069ee80c7bd448556446 (diff) | |
download | gsoc2013-evolution-aaa6c778e8c8458e107f564d12f1089880810f04.tar gsoc2013-evolution-aaa6c778e8c8458e107f564d12f1089880810f04.tar.gz gsoc2013-evolution-aaa6c778e8c8458e107f564d12f1089880810f04.tar.bz2 gsoc2013-evolution-aaa6c778e8c8458e107f564d12f1089880810f04.tar.lz gsoc2013-evolution-aaa6c778e8c8458e107f564d12f1089880810f04.tar.xz gsoc2013-evolution-aaa6c778e8c8458e107f564d12f1089880810f04.tar.zst gsoc2013-evolution-aaa6c778e8c8458e107f564d12f1089880810f04.zip |
[ huge change, all for 1 little performance problem :) fixes #18207 ] use
2003-02-08 Chris Toshok <toshok@ximian.com>
[ huge change, all for 1 little performance problem :) fixes #18207 ]
* gui/widgets/e-addressbook-model.c (get_view): use
e_book_check_static_capability here to make things a little
prettier.
(remove_card): complain about my life, and add code to use one
"model_changed" signal if we get back a list of cards instead of
multiple "card_removed" signals.
* gui/widgets/e-addressbook-model.h: little clean up.
* gui/widgets/e-addressbook-view.c (delete): write a bulk-remove
case for this. if the backend supports it, send all the ids at
once. otherwise loop over the ids.
(e_addressbook_view_delete_selection): fake a CardAndBook
structure and call delete, instead of duplicating the code in 2
places.
* gui/component/addressbook.c (delete_contact_cb): don't call
e_contact_editor_confirm_delete here, it's handled by the
EAddressbookView.
* backend/pas/pas-card-cursor.c (pas_card_cursor_construct): fix a
compiler warning about a stupid crash.
* backend/pas/pas-book.h (PASOperation): RemoveCard ->
RemoveCards.
(PASRemoveCardsReques): char *id -> GList *ids.
(PASRequest): PASRemoveCardRequest -> PASRemoveCardsRequest.
* backend/pas/pas-book.c (pas_book_queue_remove_cards): build up a
GList from the id sequence.
(pas_book_respond_remove): notifyCardRemoved ->
notifyCardsRemoved.
(impl_GNOME_Evolution_Addressbook_Book_removeCards): rename.
(pas_book_free_request): free the idlist for RemoveCards.
(pas_book_class_init): removeCard -> removeCards.
* backend/pas/pas-book-view.h: change prototype for
pas_book_view_notify_remove, and add prototype for
pas_book_view_notify_remove_1.
* backend/pas/pas-book-view.c (pas_book_view_notify_remove_1):
build up a list and call pas_book_view_notify_remove.
(pas_book_view_notify_remove): build up the corba id sequence and
call BookViewListener::notifyCardsRemoved.
* backend/pas/pas-backend.h: remove_card -> remove_cards.
* backend/pas/pas-backend.c (pas_backend_remove_cards): rename
from _remove_card.
(process_client_requests): RemoveCard -> RemoveCards and
_remove_card -> _remove_cards.
* backend/pas/pas-backend-ldap.c (check_schema_support):
g_strcasecmp -> g_ascii_strcasecmp.
(remove_card_handler): _remove => _remove_1.
(modify_card_modify_handler): same.
(pas_backend_ldap_process_remove_cards): rename from _remove_card.
(pas_backend_ldap_class_init): _remove_card -> _remove_cards.
* backend/pas/pas-backend-file.c (pas_backend_file_class_init):
remove_card -> remove_cards.
(pas_backend_file_get_static_capabilities): add "bulk-removes".
(pas_backend_file_process_remove_cards): rewrite this function
largely, so that it handles lists of ids. first we loop through
and for every successful deletion we build a list of deleted
ECards. Then for each view we build a list (a subset of the
deleted ECard list) and pass back that list to the view.
(pas_backend_file_process_modify_card): use _remove_1 instead of
_remove.
(ecard_matches_search): new function.
* backend/pas/pas-backend-card-sexp.c
(pas_backend_card_sexp_match_vcard): rewrite in terms of
_match_ecard.
(pas_backend_card_sexp_match_ecard): new function, the guts from
_match_vcard.
* backend/pas/pas-backend-card-sexp.h: add prototype for
pas_backend_card_sexp_match_ecard.
* backend/idl/addressbook.idl: the card removal stuff now takes
CardIdList.
* backend/ebook/e-book.c (e_book_get_static_capabilities): cache
successful capability queries (since they're static).
(e_book_check_static_capability): new, convenience function to
check if a particular capability is supported.
(e_book_remove_card_by_id): build a single element GList and call
e_book_remove_cards.
(e_book_remove_cards): build up a CORBA sequence from the GList
and call Book::removeCards.
(e_book_dispose): free the cached capabilities string.
* backend/ebook/e-book.h: add new prototypes for
e_book_check_static_capability and e_book_remove_cards.
* backend/ebook/e-book-view.h (struct _EBookViewClass): rename
"card_removed" signal to "cards_removed".
* backend/ebook/e-book-view.c (e_book_view_do_removed_event): id
-> ids, and free the id list.
(e_book_view_check_listener_queue): CardRemovedEvent ->
CardsRemovedEvent.
* backend/ebook/e-book-view-listener.c
(e_book_view_listener_queue_response): free the id list.
(e_book_view_listener_queue_idlist_event): new function, used for
cards_removed.
(e_book_view_listener_queue_status_event): id -> ids.
(e_book_view_listener_queue_sequence_event): same.
(e_book_view_listener_queue_message_event): same.
(impl_BookViewListener_notify_cards_removed): call
queue_idlist_event.
(e_book_view_listener_dispose): free the id list.
(e_book_view_listener_class_init): track change to idl call.
* backend/ebook/e-book-view-listener.h
(EBookViewListenerOperation): CardRemovedEvent ->
CardsRemovedEvent.
(EBookViewListenerResponse): char *id -> GList *ids.
* backend/ebook/e-book-listener.c
(impl_BookListener_respond_remove_cards): rename from remove_card.
svn path=/trunk/; revision=19853
Diffstat (limited to 'addressbook/backend/ebook/e-book-view-listener.c')
-rw-r--r-- | addressbook/backend/ebook/e-book-view-listener.c | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/addressbook/backend/ebook/e-book-view-listener.c b/addressbook/backend/ebook/e-book-view-listener.c index fe50cf037b..668c442a9a 100644 --- a/addressbook/backend/ebook/e-book-view-listener.c +++ b/addressbook/backend/ebook/e-book-view-listener.c @@ -67,7 +67,8 @@ e_book_view_listener_queue_response (EBookViewListener *listener, if (listener->priv->stopped) { /* Free response and return */ - g_free (response->id); + g_list_foreach (response->ids, (GFunc)g_free, NULL); + g_list_free (response->ids); g_list_foreach (response->cards, (GFunc) g_object_unref, NULL); g_list_free (response->cards); g_free (response->message); @@ -124,7 +125,7 @@ e_book_view_listener_queue_status_event (EBookViewListener *listener, resp->op = op; resp->status = status; - resp->id = NULL; + resp->ids = NULL; resp->cards = NULL; resp->message = NULL; @@ -133,11 +134,12 @@ e_book_view_listener_queue_status_event (EBookViewListener *listener, /* Add, Remove, Modify */ static void -e_book_view_listener_queue_id_event (EBookViewListener *listener, - EBookViewListenerOperation op, - const char *id) +e_book_view_listener_queue_idlist_event (EBookViewListener *listener, + EBookViewListenerOperation op, + const GNOME_Evolution_Addressbook_CardIdList *ids) { EBookViewListenerResponse *resp; + int i; if (listener->priv->stopped) return; @@ -146,10 +148,14 @@ e_book_view_listener_queue_id_event (EBookViewListener *listener, resp->op = op; resp->status = E_BOOK_VIEW_STATUS_SUCCESS; - resp->id = g_strdup (id); + resp->ids = NULL; resp->cards = NULL; resp->message = NULL; + for (i = 0; i < ids->_length; i ++) { + resp->ids = g_list_prepend (resp->ids, g_strdup (ids->_buffer[i])); + } + e_book_view_listener_queue_response (listener, resp); } @@ -169,7 +175,7 @@ e_book_view_listener_queue_sequence_event (EBookViewListener *listener, resp->op = op; resp->status = E_BOOK_VIEW_STATUS_SUCCESS; - resp->id = NULL; + resp->ids = NULL; resp->cards = NULL; resp->message = NULL; @@ -195,7 +201,7 @@ e_book_view_listener_queue_message_event (EBookViewListener *listener, resp->op = op; resp->status = E_BOOK_VIEW_STATUS_SUCCESS; - resp->id = NULL; + resp->ids = NULL; resp->cards = NULL; resp->message = g_strdup(message); @@ -214,14 +220,13 @@ impl_BookViewListener_notify_card_added (PortableServer_Servant servant, } static void -impl_BookViewListener_notify_card_removed (PortableServer_Servant servant, - const CORBA_char* id, - CORBA_Environment *ev) +impl_BookViewListener_notify_cards_removed (PortableServer_Servant servant, + const GNOME_Evolution_Addressbook_CardIdList *ids, + CORBA_Environment *ev) { EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object (servant)); - e_book_view_listener_queue_id_event ( - listener, CardRemovedEvent, (const char *) id); + e_book_view_listener_queue_idlist_event (listener, CardsRemovedEvent, ids); } static void @@ -388,7 +393,8 @@ e_book_view_listener_dispose (GObject *object) for (l = listener->priv->response_queue; l != NULL; l = l->next) { EBookViewListenerResponse *resp = l->data; - g_free(resp->id); + g_list_foreach (resp->ids, (GFunc)g_free, NULL); + g_list_free (resp->ids); g_list_foreach(resp->cards, (GFunc) g_object_unref, NULL); g_list_free(resp->cards); @@ -430,7 +436,7 @@ e_book_view_listener_class_init (EBookViewListenerClass *klass) epv = &klass->epv; epv->notifyCardChanged = impl_BookViewListener_notify_card_changed; - epv->notifyCardRemoved = impl_BookViewListener_notify_card_removed; + epv->notifyCardsRemoved = impl_BookViewListener_notify_cards_removed; epv->notifyCardAdded = impl_BookViewListener_notify_card_added; epv->notifySequenceComplete = impl_BookViewListener_notify_sequence_complete; epv->notifyStatusMessage = impl_BookViewListener_notify_status_message; |