diff options
| author | Chris Toshok <toshok@ximian.com> | 2002-11-12 12:06:30 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2002-11-12 12:06:30 +0800 |
| commit | 83f816df158441ca750b0bc12b7ccab2d43c0e43 (patch) | |
| tree | 62e82d7236bb0bbbc9ecc2ec2e3feb6180402d0f /addressbook/backend/ebook | |
| parent | d7aee7e7edfe1d76beba4246f50510479af955a7 (diff) | |
| download | gsoc2013-evolution-83f816df158441ca750b0bc12b7ccab2d43c0e43.tar.gz gsoc2013-evolution-83f816df158441ca750b0bc12b7ccab2d43c0e43.tar.zst gsoc2013-evolution-83f816df158441ca750b0bc12b7ccab2d43c0e43.zip | |
guard against multiple invocations.
2002-11-11 Chris Toshok <toshok@ximian.com>
* backend/pas/pas-card-cursor.c (pas_card_cursor_dispose): guard
against multiple invocations.
* backend/pas/pas-backend-ldap.c (view_destroy): change signature
to that of a weak ref notify function.
(cursor_destroy): same.
(pas_backend_ldap_book_destroy_cb): same.
(get_cursor_handler): ::destroy -> weak_ref.
(pas_backend_ldap_process_get_book_view): same.
(pas_backend_ldap_add_client): same.
* backend/pas/pas-backend-file.c (cursor_destroy): change
signature to that of a weak ref notify function.
(view_destroy): same.
(pas_backend_file_book_destroy_cb): same.
(pas_backend_file_process_get_cursor): ::destroy -> weak_ref.
(pas_backend_file_process_get_book_view): same.
(pas_backend_file_process_get_completion_view): same.
(pas_backend_file_process_get_changes): same.
(pas_backend_file_add_client): same.
* backend/ebook/test-client.c (get_cursor_cb): unref the book and
exit here.
(get_card_cb): pass a query string to get_cursor.
* backend/ebook/e-book-view.c (e_book_view_class_init): correct
marshaller for "card_added".
svn path=/trunk/; revision=18720
Diffstat (limited to 'addressbook/backend/ebook')
| -rw-r--r-- | addressbook/backend/ebook/e-book-view.c | 4 | ||||
| -rw-r--r-- | addressbook/backend/ebook/test-client.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/addressbook/backend/ebook/e-book-view.c b/addressbook/backend/ebook/e-book-view.c index 68c73e06f7..007f052297 100644 --- a/addressbook/backend/ebook/e-book-view.c +++ b/addressbook/backend/ebook/e-book-view.c @@ -286,9 +286,9 @@ e_book_view_class_init (EBookViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EBookViewClass, card_added), NULL, NULL, - e_book_marshal_NONE__STRING, + e_book_marshal_NONE__POINTER, G_TYPE_NONE, 1, - G_TYPE_STRING); + G_TYPE_POINTER); e_book_view_signals [CARD_REMOVED] = g_signal_new ("card_removed", diff --git a/addressbook/backend/ebook/test-client.c b/addressbook/backend/ebook/test-client.c index 8d44cb73e0..0ed9290759 100644 --- a/addressbook/backend/ebook/test-client.c +++ b/addressbook/backend/ebook/test-client.c @@ -50,6 +50,9 @@ get_cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer cl g_free(vcard); g_object_unref(card); } + + g_object_unref (book); + exit(0); } static void @@ -62,7 +65,7 @@ get_card_cb (EBook *book, EBookStatus status, ECard *card, gpointer closure) g_free(vcard); printf ("Getting cards..\n"); - e_book_get_cursor(book, "", get_cursor_cb, NULL); + e_book_get_cursor(book, "(contains \"x-evolution-any-field\" \"\")", get_cursor_cb, NULL); printf ("Done getting all cards.\n"); } |