diff options
Diffstat (limited to 'addressbook/backend/pas')
| -rw-r--r-- | addressbook/backend/pas/pas-backend-file.c | 598 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-backend-ldap.c | 626 |
2 files changed, 668 insertions, 556 deletions
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c index 06eb84cc4e..ddef2a568b 100644 --- a/addressbook/backend/pas/pas-backend-file.c +++ b/addressbook/backend/pas/pas-backend-file.c @@ -10,13 +10,15 @@ #include "pas-backend-file.h" #include <stdio.h> -#include <string.h> #include <unistd.h> #include <fcntl.h> #include <time.h> #include <db.h> #include <sys/stat.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> + #include <e-util/e-db3-utils.h> #if DB_VERSION_MAJOR != 3 || \ @@ -25,14 +27,15 @@ #error Including wrong DB3. Need libdb 3.1.17. #endif +#include <gtk/gtksignal.h> +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-util.h> #include <gal/util/e-util.h> #include <gal/widgets/e-unicode.h> #include <ebook/e-card-simple.h> #include <e-util/e-dbhash.h> #include <e-util/e-db3-utils.h> -#include <libgnome/gnome-i18n.h> - #include "pas-book.h" #include "pas-card-cursor.h" #include "pas-backend-card-sexp.h" @@ -51,10 +54,13 @@ typedef struct _PASBackendFileSearchContext PASBackendFileSearchContext; typedef struct _PasBackendFileChangeContext PASBackendFileChangeContext; struct _PASBackendFilePrivate { + GList *clients; + gboolean loaded; char *uri; char *filename; DB *file_db; EList *book_views; + gboolean writable; GHashTable *address_lists; PASBackendSummary *summary; }; @@ -208,7 +214,7 @@ pas_backend_file_book_view_copy(const PASBackendFileBookView *book_view, void *c new_book_view->search = g_strdup(book_view->search); new_book_view->card_sexp = book_view->card_sexp; if (new_book_view->card_sexp) - g_object_ref(new_book_view->card_sexp); + gtk_object_ref(GTK_OBJECT(new_book_view->card_sexp)); new_book_view->change_id = g_strdup(book_view->change_id); if (book_view->change_context) { @@ -230,7 +236,7 @@ pas_backend_file_book_view_free(PASBackendFileBookView *book_view, void *closure { g_free(book_view->search); if (book_view->card_sexp) - g_object_unref (book_view->card_sexp); + gtk_object_unref (GTK_OBJECT(book_view->card_sexp)); g_free(book_view->change_id); if (book_view->change_context) { @@ -268,7 +274,7 @@ get_nth(PASCardCursor *cursor, long n, gpointer data) } static void -cursor_destroy(gpointer data, GObject *where_object_was) +cursor_destroy(GtkObject *object, gpointer data) { CORBA_Environment ev; GNOME_Evolution_Addressbook_Book corba_book; @@ -294,7 +300,7 @@ cursor_destroy(gpointer data, GObject *where_object_was) } static void -view_destroy(gpointer data, GObject *where_object_was) +view_destroy(GtkObject *object, gpointer data) { PASBook *book = (PASBook *)data; PASBackendFile *bf; @@ -304,7 +310,7 @@ view_destroy(gpointer data, GObject *where_object_was) bf = PAS_BACKEND_FILE(pas_book_get_backend(book)); for (iterator = e_list_get_iterator(bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) { const PASBackendFileBookView *view = e_iterator_get(iterator); - if (view->book_view == (PASBookView*)where_object_was) { + if (view->book_view == PAS_BOOK_VIEW(object)) { e_iterator_delete(iterator); success = TRUE; break; @@ -312,7 +318,7 @@ view_destroy(gpointer data, GObject *where_object_was) } if (!success) g_warning ("Failed to remove from book_views list"); - g_object_unref(iterator); + gtk_object_unref(GTK_OBJECT(iterator)); bonobo_object_unref(BONOBO_OBJECT(book)); } @@ -337,116 +343,6 @@ vcard_matches_search (const PASBackendFileBookView *view, char *vcard_string) return pas_backend_card_sexp_match_vcard (view->card_sexp, vcard_string); } -static gboolean -ecard_matches_search (const PASBackendFileBookView *view, ECard *card) -{ - /* If this is not a search context view, it doesn't match be default */ - if (view->card_sexp == NULL) - return FALSE; - - return pas_backend_card_sexp_match_ecard (view->card_sexp, card); -} - -typedef struct { - PASBackendFile *bf; - PASBook *book; - const PASBackendFileBookView *view; - DBC *dbc; - - int card_count; - int card_threshold; - int card_threshold_max; - GList *cards; - - gboolean done_first; - gboolean search_needed; -} FileBackendSearchClosure; - -static void -free_search_closure (FileBackendSearchClosure *closure) -{ - g_list_foreach (closure->cards, (GFunc)g_free, NULL); - g_list_free (closure->cards); - g_free (closure); -} - -static gboolean -pas_backend_file_search_timeout (gpointer data) -{ - FileBackendSearchClosure *closure = data; - int db_error = 0; - DBT id_dbt, vcard_dbt; - int file_version_name_len; - DBC *dbc = closure->dbc; - - file_version_name_len = strlen (PAS_BACKEND_FILE_VERSION_NAME); - - memset (&id_dbt, 0, sizeof (id_dbt)); - memset (&vcard_dbt, 0, sizeof (vcard_dbt)); - - if (closure->done_first) { - db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_NEXT); - } - else { - db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_FIRST); - closure->done_first = TRUE; - } - - while (db_error == 0) { - - /* don't include the version in the list of cards */ - if (id_dbt.size != file_version_name_len+1 - || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) { - char *vcard_string = vcard_dbt.data; - - /* check if the vcard matches the search sexp */ - if ((!closure->search_needed) || vcard_matches_search (closure->view, vcard_string)) { - closure->cards = g_list_prepend (closure->cards, g_strdup (vcard_string)); - closure->card_count ++; - } - - /* If we've accumulated a number of checks, pass them off to the client. */ - if (closure->card_count >= closure->card_threshold) { - pas_book_view_notify_add (closure->view->book_view, closure->cards); - /* Clean up the handed-off data. */ - g_list_foreach (closure->cards, (GFunc)g_free, NULL); - g_list_free (closure->cards); - closure->cards = NULL; - closure->card_count = 0; - - /* Yeah, this scheme is overly complicated. But I like it. */ - if (closure->card_threshold < closure->card_threshold_max) { - closure->card_threshold = MIN (2*closure->card_threshold, closure->card_threshold_max); - } - - /* return here, we'll do the next lump in the next callback */ - g_timeout_add (200, pas_backend_file_search_timeout, closure); - - return FALSE; - } - } - - db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_NEXT); - } - - dbc->c_close (dbc); - - if (db_error != DB_NOTFOUND) { - g_warning ("pas_backend_file_search: error building list\n"); - free_search_closure (closure); - } - - if (closure->card_count) - pas_book_view_notify_add (closure->view->book_view, closure->cards); - - pas_book_view_notify_complete (closure->view->book_view, GNOME_Evolution_Addressbook_BookViewListener_Success); - - free_search_closure (closure); - - return FALSE; -} - - static void pas_backend_file_search (PASBackendFile *bf, PASBook *book, @@ -456,6 +352,9 @@ pas_backend_file_search (PASBackendFile *bf, PASBackendFileBookView *view = (PASBackendFileBookView *)cnstview; gboolean search_needed; + if (!bf->priv->loaded) + return; + search_needed = TRUE; if ( ! strcmp (view->search, "(contains \"x-evolution-any-field\" \"\")")) @@ -467,7 +366,7 @@ pas_backend_file_search (PASBackendFile *bf, pas_book_view_notify_status_message (view->book_view, _("Loading...")); if (view->card_sexp) { - g_object_unref (view->card_sexp); + gtk_object_unref (GTK_OBJECT(view->card_sexp)); view->card_sexp = NULL; } @@ -482,24 +381,74 @@ pas_backend_file_search (PASBackendFile *bf, do_summary_query (bf, view, completion_search); } else { - FileBackendSearchClosure *closure = g_new0 (FileBackendSearchClosure, 1); - DB *db = bf->priv->file_db; - int db_error; + gint card_count = 0, card_threshold = 20, card_threshold_max = 3000; + int db_error = 0; + GList *cards = NULL; + DB *db = bf->priv->file_db; + DBC *dbc; + DBT id_dbt, vcard_dbt; + int file_version_name_len; + + file_version_name_len = strlen (PAS_BACKEND_FILE_VERSION_NAME); - closure->card_threshold = 20; - closure->card_threshold_max = 3000; - closure->search_needed = search_needed; - closure->view = view; - closure->bf = bf; - closure->book = book; + db_error = db->cursor (db, NULL, &dbc, 0); - db_error = db->cursor (db, NULL, &closure->dbc, 0); + memset (&id_dbt, 0, sizeof (id_dbt)); + memset (&vcard_dbt, 0, sizeof (vcard_dbt)); if (db_error != 0) { g_warning ("pas_backend_file_search: error building list\n"); } else { - g_idle_add (pas_backend_file_search_timeout, closure); + db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_FIRST); + + while (db_error == 0) { + + /* don't include the version in the list of cards */ + if (id_dbt.size != file_version_name_len+1 + || strcmp (id_dbt.data, PAS_BACKEND_FILE_VERSION_NAME)) { + char *vcard_string = vcard_dbt.data; + + /* check if the vcard matches the search sexp */ + if ((!search_needed) || vcard_matches_search (view, vcard_string)) { + cards = g_list_prepend (cards, g_strdup (vcard_string)); + card_count ++; + } + + /* If we've accumulated a number of checks, pass them off to the client. */ + if (card_count >= card_threshold) { + pas_book_view_notify_add (view->book_view, cards); + /* Clean up the handed-off data. */ + g_list_foreach (cards, (GFunc)g_free, NULL); + g_list_free (cards); + cards = NULL; + card_count = 0; + + /* Yeah, this scheme is overly complicated. But I like it. */ + if (card_threshold < card_threshold_max) { + card_threshold = MIN (2*card_threshold, card_threshold_max); + } + } + } + + db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_NEXT); + } + dbc->c_close (dbc); + + if (db_error != DB_NOTFOUND) { + g_warning ("pas_backend_file_search: error building list\n"); + } } + + if (card_count) + pas_book_view_notify_add (view->book_view, cards); + + pas_book_view_notify_complete (view->book_view, GNOME_Evolution_Addressbook_BookViewListener_Success); + + /* + ** It's fine to do this now since the data has been handed off. + */ + g_list_foreach (cards, (GFunc)g_free, NULL); + g_list_free (cards); } } @@ -541,6 +490,9 @@ pas_backend_file_changes (PASBackendFile *bf, memset (&id_dbt, 0, sizeof (id_dbt)); memset (&vcard_dbt, 0, sizeof (vcard_dbt)); + if (!bf->priv->loaded) + return; + /* Find the changed ids */ dirname = g_strdup (bf->priv->filename); slash = strrchr (dirname, '/'); @@ -572,9 +524,9 @@ pas_backend_file_changes (PASBackendFile *bf, * card changing */ card = e_card_new (vcard_dbt.data); - g_object_set (card, "last_use", NULL, "use_score", 0.0, NULL); + gtk_object_set (GTK_OBJECT (card), "last_use", NULL, "use_score", 0.0, NULL); vcard_string = e_card_get_vcard_assume_utf8 (card); - g_object_unref (card); + gtk_object_unref (GTK_OBJECT (card)); /* check what type of change has occurred, if any */ switch (e_dbhash_compare (ehash, id, vcard_string)) { @@ -612,7 +564,7 @@ pas_backend_file_changes (PASBackendFile *bf, for (v = ctx->del_ids; v != NULL; v = v->next){ char *id = v->data; - pas_book_view_notify_remove_1 (view->book_view, id); + pas_book_view_notify_remove (view->book_view, id); } pas_book_view_notify_complete (view->book_view, GNOME_Evolution_Addressbook_BookViewListener_Success); @@ -684,7 +636,7 @@ do_create(PASBackend *backend, ret_val = NULL; } - g_object_unref(card); + gtk_object_unref(GTK_OBJECT(card)); card = NULL; if (vcard_ptr && ret_val) @@ -716,7 +668,7 @@ pas_backend_file_process_create_card (PASBackend *backend, bonobo_object_unref (BONOBO_OBJECT (view->book_view)); } } - g_object_unref(iterator); + gtk_object_unref(GTK_OBJECT(iterator)); pas_book_respond_create ( book, @@ -739,76 +691,59 @@ pas_backend_file_process_create_card (PASBackend *backend, } static void -pas_backend_file_process_remove_cards (PASBackend *backend, - PASBook *book, - PASRemoveCardsRequest *req) +pas_backend_file_process_remove_card (PASBackend *backend, + PASBook *book, + PASRemoveCardRequest *req) { PASBackendFile *bf = PAS_BACKEND_FILE (backend); DB *db = bf->priv->file_db; DBT id_dbt, vcard_dbt; int db_error; EIterator *iterator; + char *vcard_string; const char *id; - GList *l; - GList *removed_cards = NULL; - GNOME_Evolution_Addressbook_BookListener_CallStatus rv = GNOME_Evolution_Addressbook_BookListener_Success; - - for (l = req->ids; l; l = l->next) { - id = l->data; - string_to_dbt (id, &id_dbt); - memset (&vcard_dbt, 0, sizeof (vcard_dbt)); + id = req->id; + string_to_dbt (id, &id_dbt); + memset (&vcard_dbt, 0, sizeof (vcard_dbt)); - db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0); - if (0 != db_error) { - rv = GNOME_Evolution_Addressbook_BookListener_CardNotFound; - continue; - } + db_error = db->get (db, NULL, &id_dbt, &vcard_dbt, 0); + if (0 != db_error) { + pas_book_respond_remove ( + book, + GNOME_Evolution_Addressbook_BookListener_CardNotFound); + return; + } - db_error = db->del (db, NULL, &id_dbt, 0); - if (0 != db_error) { - rv = GNOME_Evolution_Addressbook_BookListener_CardNotFound; - continue; - } - - removed_cards = g_list_prepend (removed_cards, e_card_new (vcard_dbt.data)); + db_error = db->del (db, NULL, &id_dbt, 0); + if (0 != db_error) { + pas_book_respond_remove ( + book, + GNOME_Evolution_Addressbook_BookListener_CardNotFound); + return; } - /* if we actually removed some, try to sync */ - if (removed_cards) { - db_error = db->sync (db, 0); - if (db_error != 0) - g_warning ("db->sync failed.\n"); - } + db_error = db->sync (db, 0); + if (db_error != 0) + g_warning ("db->sync failed.\n"); + + vcard_string = vcard_dbt.data; for (iterator = e_list_get_iterator (bf->priv->book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) { const PASBackendFileBookView *view = e_iterator_get(iterator); - GList *view_removed = NULL; - for (l = removed_cards; l; l = l->next) { - ECard *removed_card = l->data; - if (ecard_matches_search (view, removed_card)) { - view_removed = g_list_prepend (view_removed, (char*)e_card_get_id (removed_card)); - } - } - if (view_removed) { + if (vcard_matches_search (view, vcard_string)) { bonobo_object_ref (BONOBO_OBJECT (view->book_view)); - pas_book_view_notify_remove (view->book_view, view_removed); + pas_book_view_notify_remove (view->book_view, req->id); pas_book_view_notify_complete (view->book_view, GNOME_Evolution_Addressbook_BookViewListener_Success); bonobo_object_unref (BONOBO_OBJECT (view->book_view)); - g_list_free (view_removed); } } - g_object_unref(iterator); + gtk_object_unref(GTK_OBJECT(iterator)); - pas_book_respond_remove (book, rv); - - for (l = removed_cards; l; l = l->next) { - ECard *c = l->data; - pas_backend_summary_remove_card (bf->priv->summary, e_card_get_id (c)); - g_object_unref (c); - } - - g_list_free (removed_cards); + pas_book_respond_remove ( + book, + GNOME_Evolution_Addressbook_BookListener_Success); + pas_backend_summary_remove_card (bf->priv->summary, id); } static void @@ -878,7 +813,7 @@ pas_backend_file_process_modify_card (PASBackend *backend, else if (new_match) pas_book_view_notify_add_1 (view->book_view, req->vcard); else /* if (old_match) */ - pas_book_view_notify_remove_1 (view->book_view, id); + pas_book_view_notify_remove (view->book_view, id); pas_book_view_notify_complete (view->book_view, GNOME_Evolution_Addressbook_BookViewListener_Success); @@ -887,7 +822,7 @@ pas_backend_file_process_modify_card (PASBackend *backend, CORBA_exception_free (&ev); } - g_object_unref(iterator); + gtk_object_unref(GTK_OBJECT(iterator)); pas_book_respond_modify ( book, @@ -904,7 +839,7 @@ pas_backend_file_process_modify_card (PASBackend *backend, g_free(old_vcard_string); - g_object_unref(card); + gtk_object_unref(GTK_OBJECT(card)); } static void @@ -1038,8 +973,8 @@ pas_backend_file_process_get_cursor (PASBackend *backend, get_nth, cursor_data); - g_object_weak_ref (G_OBJECT (cursor), - cursor_destroy, cursor_data); + gtk_signal_connect(GTK_OBJECT(cursor), "destroy", + GTK_SIGNAL_FUNC(cursor_destroy), cursor_data); pas_book_respond_get_cursor ( book, @@ -1059,11 +994,14 @@ pas_backend_file_process_get_book_view (PASBackend *backend, PASBackendFileBookView view; EIterator *iterator; + g_return_if_fail (req->listener != NULL); + bonobo_object_ref(BONOBO_OBJECT(book)); book_view = pas_book_view_new (req->listener); - g_object_weak_ref (G_OBJECT (book_view), view_destroy, book); + gtk_signal_connect(GTK_OBJECT(book_view), "destroy", + GTK_SIGNAL_FUNC(view_destroy), book); view.book_view = book_view; view.search = g_strdup (req->search); @@ -1079,13 +1017,10 @@ pas_backend_file_process_get_book_view (PASBackend *backend, : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */), book_view); - if (!pas_backend_is_loaded (backend)) - return; - iterator = e_list_get_iterator(bf->priv->book_views); e_iterator_last(iterator); pas_backend_file_search (bf, book, e_iterator_get(iterator), FALSE); - g_object_unref(iterator); + gtk_object_unref(GTK_OBJECT(iterator)); } static void @@ -1098,11 +1033,14 @@ pas_backend_file_process_get_completion_view (PASBackend *backend, PASBackendFileBookView view; EIterator *iterator; + g_return_if_fail (req->listener != NULL); + bonobo_object_ref(BONOBO_OBJECT(book)); book_view = pas_book_view_new (req->listener); - g_object_weak_ref (G_OBJECT (book_view), view_destroy, book); + gtk_signal_connect(GTK_OBJECT(book_view), "destroy", + GTK_SIGNAL_FUNC(view_destroy), book); view.book_view = book_view; view.search = g_strdup (req->search); @@ -1118,13 +1056,10 @@ pas_backend_file_process_get_completion_view (PASBackend *backend, : GNOME_Evolution_Addressbook_BookListener_CardNotFound /* XXX */), book_view); - if (!pas_backend_is_loaded (backend)) - return; - iterator = e_list_get_iterator(bf->priv->book_views); e_iterator_last(iterator); pas_backend_file_search (bf, book, e_iterator_get(iterator), TRUE); - g_object_unref(iterator); + gtk_object_unref(GTK_OBJECT(iterator)); } static void @@ -1138,11 +1073,14 @@ pas_backend_file_process_get_changes (PASBackend *backend, PASBackendFileChangeContext ctx; EIterator *iterator; + g_return_if_fail (req->listener != NULL); + bonobo_object_ref(BONOBO_OBJECT(book)); book_view = pas_book_view_new (req->listener); - g_object_weak_ref (G_OBJECT (book_view), view_destroy, book); + gtk_signal_connect(GTK_OBJECT(book_view), "destroy", + GTK_SIGNAL_FUNC(view_destroy), book); pas_book_respond_get_changes (book, (book_view != NULL @@ -1164,13 +1102,10 @@ pas_backend_file_process_get_changes (PASBackend *backend, e_list_append(bf->priv->book_views, &view); - if (!pas_backend_is_loaded (backend)) - return; - iterator = e_list_get_iterator(bf->priv->book_views); e_iterator_last(iterator); pas_backend_file_changes (bf, book, e_iterator_get(iterator)); - g_object_unref(iterator); + gtk_object_unref(GTK_OBJECT(iterator)); } static void @@ -1219,14 +1154,85 @@ pas_backend_file_process_get_supported_fields (PASBackend *backend, for (i = 0; i < E_CARD_SIMPLE_FIELD_LAST; i ++) e_list_append (fields, e_card_simple_get_ecard_field (simple, i)); - g_object_unref (card); - g_object_unref (simple); + gtk_object_unref (GTK_OBJECT (card)); + gtk_object_unref (GTK_OBJECT (simple)); pas_book_respond_get_supported_fields (book, GNOME_Evolution_Addressbook_BookListener_Success, fields); } +static void +pas_backend_file_process_client_requests (PASBook *book) +{ + PASBackend *backend; + PASRequest *req; + + backend = pas_book_get_backend (book); + + req = pas_book_pop_request (book); + if (req == NULL) + return; + + switch (req->op) { + case CreateCard: + pas_backend_file_process_create_card (backend, book, (PASCreateCardRequest*)req); + break; + + case RemoveCard: + pas_backend_file_process_remove_card (backend, book, (PASRemoveCardRequest*)req); + break; + + case ModifyCard: + pas_backend_file_process_modify_card (backend, book, (PASModifyCardRequest*)req); + break; + + case CheckConnection: + pas_backend_file_process_check_connection (backend, book, (PASCheckConnectionRequest*)req); + break; + + case GetVCard: + pas_backend_file_process_get_vcard (backend, book, (PASGetVCardRequest*)req); + break; + + case GetCursor: + pas_backend_file_process_get_cursor (backend, book, (PASGetCursorRequest*)req); + break; + + case GetBookView: + pas_backend_file_process_get_book_view (backend, book, (PASGetBookViewRequest*)req); + break; + + case GetCompletionView: + pas_backend_file_process_get_completion_view (backend, book, (PASGetCompletionViewRequest*)req); + break; + + case GetChanges: + pas_backend_file_process_get_changes (backend, book, (PASGetChangesRequest*)req); + break; + + case AuthenticateUser: + pas_backend_file_process_authenticate_user (backend, book, (PASAuthenticateUserRequest*)req); + break; + + case GetSupportedFields: + pas_backend_file_process_get_supported_fields (backend, book, (PASGetSupportedFieldsRequest*)req); + break; + } + + pas_book_free_request (req); +} + +static void +pas_backend_file_book_destroy_cb (PASBook *book, gpointer data) +{ + PASBackendFile *backend; + + backend = PAS_BACKEND_FILE (data); + + pas_backend_remove_client (PAS_BACKEND (backend), book); +} + /* ** versions: ** @@ -1301,7 +1307,7 @@ pas_backend_file_upgrade_db (PASBackendFile *bf, char *old_version) card_failed++; } - g_object_unref (card); + gtk_object_unref (GTK_OBJECT(card)); } db_error = dbc->c_get(dbc, &id_dbt, &vcard_dbt, DB_NEXT); @@ -1353,10 +1359,11 @@ pas_backend_file_maybe_upgrade_db (PASBackendFile *bf) return ret_val; } + #define INITIAL_VCARD "BEGIN:VCARD\n\ X-EVOLUTION-FILE-AS:Ximian, Inc.\n\ LABEL;WORK;QUOTED-PRINTABLE:401 Park Drive 3 West=0ABoston, MA 02215=0AUSA\n\ -TEL;WORK;VOICE:(617) 375-3800\n\ +TEL;WORK;VOICE:(617) 236-0442\n\ TEL;WORK;FAX:(617) 236-8630\n\ EMAIL;INTERNET:hello@ximian.com\n\ URL:www.ximian.com/\n\ @@ -1378,6 +1385,8 @@ pas_backend_file_load_uri (PASBackend *backend, struct stat sb; char *summary_filename; + g_assert (bf->priv->loaded == FALSE); + db_version (&major, &minor, &patch); if (major != 3 || @@ -1422,10 +1431,10 @@ pas_backend_file_load_uri (PASBackend *backend, char *create_initial_file; char *dir; - dir = g_path_get_dirname(filename); - create_initial_file = g_build_filename (dir, "create-initial", NULL); + dir = g_dirname(filename); + create_initial_file = g_concat_dir_and_file(dir, "create-initial"); - if (g_file_test(create_initial_file, G_FILE_TEST_EXISTS)) { + if (g_file_exists(create_initial_file)) { char *id; id = do_create(backend, INITIAL_VCARD, NULL); g_free (id); @@ -1444,9 +1453,14 @@ pas_backend_file_load_uri (PASBackend *backend, return GNOME_Evolution_Addressbook_BookListener_OtherError; } - if (!pas_backend_file_maybe_upgrade_db (bf)) { + bf->priv->writable = writable; + + if (pas_backend_file_maybe_upgrade_db (bf)) + bf->priv->loaded = TRUE; + else { db->close (db, 0); bf->priv->file_db = NULL; + bf->priv->writable = FALSE; return GNOME_Evolution_Addressbook_BookListener_OtherError; } @@ -1459,6 +1473,7 @@ pas_backend_file_load_uri (PASBackend *backend, if (stat (bf->priv->filename, &sb) == -1) { db->close (db, 0); bf->priv->file_db = NULL; + bf->priv->writable = FALSE; return GNOME_Evolution_Addressbook_BookListener_OtherError; } db_mtime = sb.st_mtime; @@ -1472,8 +1487,6 @@ pas_backend_file_load_uri (PASBackend *backend, build_summary (bf->priv); } - pas_backend_set_is_loaded (backend, TRUE); - pas_backend_set_is_writable (backend, writable); return GNOME_Evolution_Addressbook_BookListener_Success; } @@ -1485,15 +1498,99 @@ pas_backend_file_get_uri (PASBackend *backend) bf = PAS_BACKEND_FILE (backend); + g_return_val_if_fail (bf->priv->loaded, NULL); g_assert (bf->priv->uri != NULL); return bf->priv->uri; } +static gboolean +pas_backend_file_add_client (PASBackend *backend, + GNOME_Evolution_Addressbook_BookListener listener) +{ + PASBackendFile *bf; + PASBook *book; + + g_assert (backend != NULL); + g_assert (PAS_IS_BACKEND_FILE (backend)); + + bf = PAS_BACKEND_FILE (backend); + + book = pas_book_new (backend, listener); + + if (!book) { + if (!bf->priv->clients) + pas_backend_last_client_gone (backend); + + return FALSE; + } + + gtk_signal_connect (GTK_OBJECT (book), "destroy", + pas_backend_file_book_destroy_cb, backend); + + gtk_signal_connect (GTK_OBJECT (book), "requests_queued", + pas_backend_file_process_client_requests, NULL); + + bf->priv->clients = g_list_prepend ( + bf->priv->clients, book); + + if (bf->priv->loaded) { + pas_book_respond_open ( + book, GNOME_Evolution_Addressbook_BookListener_Success); + if (bf->priv->writable) + pas_book_report_writable (book, bf->priv->writable); + } else { + pas_book_respond_open ( + book, GNOME_Evolution_Addressbook_BookListener_OtherError); + } + + bonobo_object_unref (BONOBO_OBJECT (book)); + + return TRUE; +} + +static void +pas_backend_file_remove_client (PASBackend *backend, + PASBook *book) +{ + PASBackendFile *bf; + GList *l; + PASBook *lbook; + + g_return_if_fail (backend != NULL); + g_return_if_fail (PAS_IS_BACKEND_FILE (backend)); + g_return_if_fail (book != NULL); + g_return_if_fail (PAS_IS_BOOK (book)); + + bf = PAS_BACKEND_FILE (backend); + + /* Find the book in the list of clients */ + + for (l = bf->priv->clients; l; l = l->next) { + lbook = PAS_BOOK (l->data); + + if (lbook == book) + break; + } + + g_assert (l != NULL); + + /* Disconnect */ + + bf->priv->clients = g_list_remove_link (bf->priv->clients, l); + g_list_free_1 (l); + + /* When all clients go away, notify the parent factory about it so that + * it may decide whether to kill the backend or not. + */ + if (!bf->priv->clients) + pas_backend_last_client_gone (backend); +} + static char * -pas_backend_file_get_static_capabilities (PASBackend *backend) +pas_backend_file_get_static_capabilities (PASBackend *backend) { - return g_strdup("local,do-initial-query,bulk-removes"); + return g_strdup("local,do-initial-query,cache-completions"); } static gboolean @@ -1516,10 +1613,10 @@ pas_backend_file_new (void) { PASBackendFile *backend; - backend = g_object_new (PAS_TYPE_BACKEND_FILE, NULL); + backend = gtk_type_new (pas_backend_file_get_type ()); if (! pas_backend_file_construct (backend)) { - g_object_unref (backend); + gtk_object_unref (GTK_OBJECT (backend)); return NULL; } @@ -1528,53 +1625,40 @@ pas_backend_file_new (void) } static void -pas_backend_file_dispose (GObject *object) +pas_backend_file_destroy (GtkObject *object) { PASBackendFile *bf; bf = PAS_BACKEND_FILE (object); - if (bf->priv) { - g_object_unref(bf->priv->book_views); - g_object_unref(bf->priv->summary); - g_free (bf->priv->uri); - g_free (bf->priv->filename); + gtk_object_unref(GTK_OBJECT(bf->priv->book_views)); + gtk_object_unref(GTK_OBJECT(bf->priv->summary)); + g_free (bf->priv->uri); + g_free (bf->priv->filename); - g_free (bf->priv); - bf->priv = NULL; - } + g_free (bf->priv); - G_OBJECT_CLASS (pas_backend_file_parent_class)->dispose (object); + GTK_OBJECT_CLASS (pas_backend_file_parent_class)->destroy (object); } static void pas_backend_file_class_init (PASBackendFileClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); + GtkObjectClass *object_class = (GtkObjectClass *) klass; PASBackendClass *parent_class; - pas_backend_file_parent_class = g_type_class_peek_parent (klass); + pas_backend_file_parent_class = gtk_type_class (pas_backend_get_type ()); parent_class = PAS_BACKEND_CLASS (klass); /* Set the virtual methods. */ parent_class->load_uri = pas_backend_file_load_uri; parent_class->get_uri = pas_backend_file_get_uri; + parent_class->add_client = pas_backend_file_add_client; + parent_class->remove_client = pas_backend_file_remove_client; parent_class->get_static_capabilities = pas_backend_file_get_static_capabilities; - parent_class->create_card = pas_backend_file_process_create_card; - parent_class->remove_cards = pas_backend_file_process_remove_cards; - parent_class->modify_card = pas_backend_file_process_modify_card; - parent_class->check_connection = pas_backend_file_process_check_connection; - parent_class->get_vcard = pas_backend_file_process_get_vcard; - parent_class->get_cursor = pas_backend_file_process_get_cursor; - parent_class->get_book_view = pas_backend_file_process_get_book_view; - parent_class->get_completion_view = pas_backend_file_process_get_completion_view; - parent_class->get_changes = pas_backend_file_process_get_changes; - parent_class->authenticate_user = pas_backend_file_process_authenticate_user; - parent_class->get_supported_fields = pas_backend_file_process_get_supported_fields; - - object_class->dispose = pas_backend_file_dispose; + object_class->destroy = pas_backend_file_destroy; } static void @@ -1583,8 +1667,11 @@ pas_backend_file_init (PASBackendFile *backend) PASBackendFilePrivate *priv; priv = g_new0 (PASBackendFilePrivate, 1); + priv->loaded = FALSE; + priv->clients = NULL; priv->book_views = e_list_new((EListCopyFunc) pas_backend_file_book_view_copy, (EListFreeFunc) pas_backend_file_book_view_free, NULL); priv->uri = NULL; + priv->writable = FALSE; backend->priv = priv; } @@ -1592,25 +1679,24 @@ pas_backend_file_init (PASBackendFile *backend) /** * pas_backend_file_get_type: */ -GType +GtkType pas_backend_file_get_type (void) { - static GType type = 0; + static GtkType type = 0; if (! type) { - GTypeInfo info = { - sizeof (PASBackendFileClass), - NULL, /* base_class_init */ - NULL, /* base_class_finalize */ - (GClassInitFunc) pas_backend_file_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ + GtkTypeInfo info = { + "PASBackendFile", sizeof (PASBackendFile), - 0, /* n_preallocs */ - (GInstanceInitFunc) pas_backend_file_init + sizeof (PASBackendFileClass), + (GtkClassInitFunc) pas_backend_file_class_init, + (GtkObjectInitFunc) pas_backend_file_init, + NULL, /* reserved 1 */ + NULL, /* reserved 2 */ + (GtkClassInitFunc) NULL }; - type = g_type_register_static (PAS_TYPE_BACKEND, "PASBackendFile", &info, 0); + type = gtk_type_unique (pas_backend_get_type (), &info); } return type; diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c index 237bc8597c..866bad8148 100644 --- a/addressbook/backend/pas/pas-backend-ldap.c +++ b/addressbook/backend/pas/pas-backend-ldap.c @@ -10,7 +10,10 @@ #include "config.h" #include <fcntl.h> -#include <string.h> +#include <gtk/gtksignal.h> + +#include <libgnome/gnome-defs.h> +#include <libgnome/gnome-i18n.h> #ifdef DEBUG #define LDAP_DEBUG @@ -35,7 +38,6 @@ #include <e-util/e-sexp.h> #include <ebook/e-card-simple.h> -#include <libgnome/gnome-i18n.h> #include "pas-backend-ldap.h" #include "pas-backend-card-sexp.h" @@ -44,9 +46,6 @@ #include <stdlib.h> -/* this is broken currently, don't enable it */ -/*#define ENABLE_SASL_BINDS*/ - typedef enum { PAS_BACKEND_LDAP_TLS_NO, PAS_BACKEND_LDAP_TLS_ALWAYS, @@ -88,6 +87,7 @@ typedef struct LDAPOp LDAPOp; struct _PASBackendLDAPPrivate { char *uri; gboolean connected; + GList *clients; gchar *ldap_host; /* the hostname of the server */ int ldap_port; /* the port of the server */ @@ -112,7 +112,6 @@ struct _PASBackendLDAPPrivate { LDAP *ldap; EList *supported_fields; - EList *supported_auth_methods; /* whether or not there's support for the objectclass we need to store all our additional fields */ @@ -120,6 +119,8 @@ struct _PASBackendLDAPPrivate { gboolean calEntrySupported; gboolean evolutionPersonChecked; + gboolean writable; + /* our operations */ GHashTable *id_to_op; int active_ops; @@ -293,7 +294,7 @@ remove_view (int msgid, LDAPOp *op, PASBookView *view) } static void -view_destroy(gpointer data, GObject *where_object_was) +view_destroy(GtkObject *object, gpointer data) { PASBook *book = (PASBook *)data; PASBackendLDAP *bl; @@ -306,7 +307,7 @@ view_destroy(gpointer data, GObject *where_object_was) while (e_iterator_is_valid (iter)) { PASBackendLDAPBookView *view = (PASBackendLDAPBookView*)e_iterator_get (iter); - if (view->book_view == (PASBookView*)where_object_was) { + if (view->book_view == PAS_BOOK_VIEW(object)) { GNOME_Evolution_Addressbook_Book corba_book; CORBA_Environment ev; @@ -321,7 +322,7 @@ view_destroy(gpointer data, GObject *where_object_was) /* free up the view structure */ g_free (view->search); - g_object_unref (view->card_sexp); + gtk_object_unref (GTK_OBJECT (view->card_sexp)); g_free (view); /* and remove it from our list */ @@ -346,7 +347,7 @@ view_destroy(gpointer data, GObject *where_object_was) e_iterator_next (iter); } - g_object_unref (iter); + gtk_object_unref (GTK_OBJECT (iter)); } @@ -371,7 +372,7 @@ find_book_view (PASBackendLDAP *bl) rv = v->book_view; } - g_object_unref (iter); + gtk_object_unref (GTK_OBJECT (iter)); return rv; } @@ -457,20 +458,20 @@ check_schema_support (PASBackendLDAP *bl) continue; for (j = 0; oc->oc_names[j]; j++) - if (!g_ascii_strcasecmp (oc->oc_names[j], EVOLUTIONPERSON)) { + if (!g_strcasecmp (oc->oc_names[j], EVOLUTIONPERSON)) { g_print ("support found on ldap server for objectclass evolutionPerson\n"); bl->priv->evolutionPersonSupported = TRUE; add_oc_attributes_to_supported_fields (bl, oc); } - else if (!g_ascii_strcasecmp (oc->oc_names[j], CALENTRY)) { + else if (!g_strcasecmp (oc->oc_names[j], CALENTRY)) { g_print ("support found on ldap server for objectclass calEntry\n"); bl->priv->calEntrySupported = TRUE; add_oc_attributes_to_supported_fields (bl, oc); } - else if (!g_ascii_strcasecmp (oc->oc_names[j], INETORGPERSON) - || !g_ascii_strcasecmp (oc->oc_names[j], ORGANIZATIONALPERSON) - || !g_ascii_strcasecmp (oc->oc_names[j], PERSON)) { + else if (!g_strcasecmp (oc->oc_names[j], INETORGPERSON) + || !g_strcasecmp (oc->oc_names[j], ORGANIZATIONALPERSON) + || !g_strcasecmp (oc->oc_names[j], PERSON)) { add_oc_attributes_to_supported_fields (bl, oc); } @@ -487,7 +488,7 @@ check_schema_support (PASBackendLDAP *bl) of draconian acl's that keep subschema reads from working until the user is authed. */ - if (!pas_backend_is_writable (PAS_BACKEND (bl))) { + if (!bl->priv->writable) { g_warning ("subschema read returned nothing before successful auth"); bl->priv->evolutionPersonChecked = FALSE; } @@ -590,25 +591,8 @@ query_ldap_root_dse (PASBackendLDAP *bl) values = ldap_get_values (ldap, resp, "supportedSASLMechanisms"); if (values) { - char *auth_method; - if (bl->priv->supported_auth_methods) - g_object_unref (bl->priv->supported_auth_methods); - bl->priv->supported_auth_methods = e_list_new ((EListCopyFunc)g_strdup, (EListFreeFunc)g_free, NULL); - - auth_method = g_strdup_printf ("ldap/simple-binddn|%s", _("Using Distinguished Name (DN)")); - e_list_append (bl->priv->supported_auth_methods, auth_method); - g_free (auth_method); - - auth_method = g_strdup_printf ("ldap/simple-email|%s", _("Using Email Address")); - e_list_append (bl->priv->supported_auth_methods, auth_method); - g_free (auth_method); - - for (i = 0; values[i]; i++) { - auth_method = g_strdup_printf ("sasl/%s|%s", values[i], values[i]); - e_list_append (bl->priv->supported_auth_methods, auth_method); - g_free (auth_method); + for (i = 0; values[i]; i++) g_message ("supported SASL mechanism: %s", values[i]); - } ldap_value_free (values); } @@ -721,7 +705,6 @@ pas_backend_ldap_connect (PASBackendLDAP *bl) if (!bl->priv->evolutionPersonChecked) check_schema_support (bl); - pas_backend_set_is_loaded (PAS_BACKEND (bl), TRUE); return GNOME_Evolution_Addressbook_BookListener_Success; } else @@ -1051,7 +1034,7 @@ static void add_objectclass_mod (PASBackendLDAP *bl, GPtrArray *mod_array, GList *existing_objectclasses) { #define FIND_INSERT(oc) \ - if (!g_list_find_custom (existing_objectclasses, (oc), (GCompareFunc)g_ascii_strcasecmp)) \ + if (!g_list_find_custom (existing_objectclasses, (oc), (GCompareFunc)g_strcasecmp)) \ g_ptr_array_add (objectclasses, g_strdup ((oc))) #define INSERT(oc) \ g_ptr_array_add (objectclasses, g_strdup ((oc))) @@ -1167,7 +1150,7 @@ create_card_handler (LDAPOp *op, LDAPMessage *res) e_iterator_next (iter); } - g_object_unref (iter); + gtk_object_unref (GTK_OBJECT (iter)); } else { ldap_perror (ldap, "create_card"); @@ -1191,14 +1174,14 @@ create_card_dtor (LDAPOp *op) LDAPCreateOp *create_op = (LDAPCreateOp*)op; g_free (create_op->dn); - g_object_unref (create_op->new_card); + gtk_object_unref (GTK_OBJECT (create_op->new_card)); g_free (create_op); } static void pas_backend_ldap_process_create_card (PASBackend *backend, PASBook *book, - PASCreateCardRequest *req) + PASRequest *req) { LDAPCreateOp *create_op = g_new (LDAPCreateOp, 1); PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend); @@ -1213,9 +1196,9 @@ pas_backend_ldap_process_create_card (PASBackend *backend, book_view = find_book_view (bl); - printf ("vcard = %s\n", req->vcard); + printf ("vcard = %s\n", req->create.vcard); - new_ecard = e_card_new (req->vcard); + new_ecard = e_card_new (req->create.vcard); create_op->new_card = e_card_simple_new (new_ecard); create_op->dn = create_dn_from_ecard (create_op->new_card, bl->priv->ldap_rootdn); @@ -1235,7 +1218,7 @@ pas_backend_ldap_process_create_card (PASBackend *backend, create_op->dn); g_free (create_op->dn); - g_object_unref (create_op->new_card); + gtk_object_unref (GTK_OBJECT(create_op->new_card)); g_free (create_op); return; } @@ -1350,13 +1333,13 @@ remove_card_handler (LDAPOp *op, LDAPMessage *res) bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev); - pas_book_view_notify_remove_1 (view->book_view, remove_op->id); + pas_book_view_notify_remove (view->book_view, remove_op->id); bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev); e_iterator_next (iter); } - g_object_unref (iter); + gtk_object_unref (GTK_OBJECT (iter)); } else { ldap_perror (bl->priv->ldap, "remove_card"); @@ -1379,9 +1362,9 @@ remove_card_dtor (LDAPOp *op) } static void -pas_backend_ldap_process_remove_cards (PASBackend *backend, - PASBook *book, - PASRemoveCardsRequest *req) +pas_backend_ldap_process_remove_card (PASBackend *backend, + PASBook *book, + PASRequest *req) { LDAPRemoveOp *remove_op = g_new (LDAPRemoveOp, 1); PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend); @@ -1391,12 +1374,7 @@ pas_backend_ldap_process_remove_cards (PASBackend *backend, book_view = find_book_view (bl); - /* - ** since we didn't pass "bulk-removes" in our static - ** capabilities, we should only get 1 length lists here, so - ** the id we're deleting is the first and only id in the list. - */ - remove_op->id = g_strdup (req->ids->data); + remove_op->id = g_strdup (req->remove.id); do { book_view_notify_status (book_view, _("Removing card from LDAP server...")); @@ -1482,14 +1460,14 @@ modify_card_modify_handler (LDAPOp *op, LDAPMessage *res) else if (new_match) pas_book_view_notify_add_1 (view->book_view, modify_op->vcard); else /* if (old_match) */ - pas_book_view_notify_remove_1 (view->book_view, e_card_simple_get_id (modify_op->card)); + pas_book_view_notify_remove (view->book_view, e_card_simple_get_id (modify_op->card)); pas_book_view_notify_complete (view->book_view, GNOME_Evolution_Addressbook_BookViewListener_Success); bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view->book_view)), &ev); e_iterator_next (iter); } - g_object_unref (iter); + gtk_object_unref (GTK_OBJECT (iter)); } else { ldap_perror (ldap, "ldap_modify_s"); @@ -1605,17 +1583,17 @@ modify_card_dtor (LDAPOp *op) g_list_free (modify_op->existing_objectclasses); g_free (modify_op->current_vcard); if (modify_op->current_card) - g_object_unref (modify_op->current_card); + gtk_object_unref (GTK_OBJECT (modify_op->current_card)); g_free (modify_op->vcard); if (modify_op->card) - g_object_unref (modify_op->card); + gtk_object_unref (GTK_OBJECT (modify_op->card)); g_free (modify_op); } static void pas_backend_ldap_process_modify_card (PASBackend *backend, PASBook *book, - PASModifyCardRequest *req) + PASRequest *req) { LDAPModifyOp *modify_op = g_new0 (LDAPModifyOp, 1); PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend); @@ -1627,10 +1605,10 @@ pas_backend_ldap_process_modify_card (PASBackend *backend, book_view = find_book_view (bl); - modify_op->vcard = g_strdup (req->vcard); + modify_op->vcard = g_strdup (req->modify.vcard); new_ecard = e_card_new (modify_op->vcard); modify_op->card = e_card_simple_new (new_ecard); - g_object_unref (new_ecard); + gtk_object_unref (GTK_OBJECT (new_ecard)); modify_op->id = e_card_simple_get_id(modify_op->card); ldap = bl->priv->ldap; @@ -1697,7 +1675,7 @@ get_vcard_handler (LDAPOp *op, LDAPMessage *res) GNOME_Evolution_Addressbook_BookListener_Success, vcard); g_free (vcard); - g_object_unref (simple); + gtk_object_unref (GTK_OBJECT (simple)); ldap_op_finished (op); } else if (msg_type == LDAP_RES_SEARCH_RESULT) { @@ -1727,7 +1705,7 @@ get_vcard_dtor (LDAPOp *op) static void pas_backend_ldap_process_get_vcard (PASBackend *backend, PASBook *book, - PASGetVCardRequest *req) + PASRequest *req) { LDAPGetVCardOp *get_vcard_op = g_new0 (LDAPGetVCardOp, 1); PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend); @@ -1739,7 +1717,7 @@ pas_backend_ldap_process_get_vcard (PASBackend *backend, book_view = find_book_view (bl); do { - ldap_error = ldap_search_ext (ldap, req->id, + ldap_error = ldap_search_ext (ldap, req->get_vcard.id, LDAP_SCOPE_BASE, "(objectclass=*)", NULL, 0, NULL, NULL, @@ -1786,7 +1764,7 @@ get_nth(PASCardCursor *cursor, long n, gpointer data) } static void -cursor_destroy(gpointer data, GObject *where_object_was) +cursor_destroy(GtkObject *object, gpointer data) { PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data; @@ -1837,7 +1815,7 @@ get_cursor_handler (LDAPOp *op, LDAPMessage *res) cursor_op->cursor_data->num_elements ++; cursor_op->cursor_data->elements = g_list_prepend (cursor_op->cursor_data->elements, vcard); - g_object_unref (simple); + gtk_object_unref (GTK_OBJECT (simple)); } } } @@ -1852,7 +1830,8 @@ get_cursor_handler (LDAPOp *op, LDAPMessage *res) get_nth, cursor_op->cursor_data); - g_object_weak_ref (G_OBJECT (cursor), cursor_destroy, cursor_op->cursor_data); + gtk_signal_connect(GTK_OBJECT(cursor), "destroy", + GTK_SIGNAL_FUNC(cursor_destroy), cursor_op->cursor_data); cursor_op->responded = TRUE; } @@ -1878,7 +1857,7 @@ get_cursor_dtor (LDAPOp *op) LDAPGetCursorOp *cursor_op = (LDAPGetCursorOp*)op; if (!cursor_op->responded) { - cursor_destroy (cursor_op->cursor_data, NULL); + cursor_destroy (NULL, cursor_op->cursor_data); } g_free (op); @@ -1887,7 +1866,7 @@ get_cursor_dtor (LDAPOp *op) static void pas_backend_ldap_process_get_cursor (PASBackend *backend, PASBook *book, - PASGetCursorRequest *req) + PASRequest *req) { PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend); LDAP *ldap = bl->priv->ldap; @@ -2154,9 +2133,9 @@ anniversary_populate (ECardSimple *card, char **values) { if (values[0]) { ECardDate dt = e_card_date_from_string (values[0]); - g_object_set (card->card, - "anniversary", &dt, - NULL); + gtk_object_set (GTK_OBJECT (card->card), + "anniversary", &dt, + NULL); } } @@ -2166,9 +2145,9 @@ anniversary_ber (ECardSimple *card) ECardDate *dt; struct berval** result = NULL; - g_object_get (card->card, - "anniversary", &dt, - NULL); + gtk_object_get (GTK_OBJECT (card->card), + "anniversary", &dt, + NULL); if (dt) { char *anniversary; @@ -2193,15 +2172,15 @@ anniversary_compare (ECardSimple *ecard1, ECardSimple *ecard2) char *date1 = NULL, *date2 = NULL; gboolean equal; - g_object_get (ecard1->card, - "anniversary", &dt, - NULL); + gtk_object_get (GTK_OBJECT (ecard1->card), + "anniversary", &dt, + NULL); if (dt) date1 = e_card_date_to_string (dt); - g_object_get (ecard2->card, - "anniversary", &dt, - NULL); + gtk_object_get (GTK_OBJECT (ecard2->card), + "anniversary", &dt, + NULL); if (dt) date2 = e_card_date_to_string (dt); @@ -2221,9 +2200,9 @@ birthday_populate (ECardSimple *card, char **values) { if (values[0]) { ECardDate dt = e_card_date_from_string (values[0]); - g_object_set (card->card, - "birth_date", &dt, - NULL); + gtk_object_set (GTK_OBJECT (card->card), + "birth_date", &dt, + NULL); } } @@ -2233,9 +2212,9 @@ birthday_ber (ECardSimple *card) ECardDate *dt; struct berval** result = NULL; - g_object_get (card->card, - "birth_date", &dt, - NULL); + gtk_object_get (GTK_OBJECT (card->card), + "birth_date", &dt, + NULL); if (dt) { char *birthday; @@ -2260,15 +2239,15 @@ birthday_compare (ECardSimple *ecard1, ECardSimple *ecard2) char *date1 = NULL, *date2 = NULL; gboolean equal; - g_object_get (ecard1->card, - "birth_date", &dt, - NULL); + gtk_object_get (GTK_OBJECT (ecard1->card), + "birth_date", &dt, + NULL); if (dt) date1 = e_card_date_to_string (dt); - g_object_get (ecard2->card, - "birth_date", &dt, - NULL); + gtk_object_get (GTK_OBJECT (ecard2->card), + "birth_date", &dt, + NULL); if (dt) date2 = e_card_date_to_string (dt); @@ -2290,9 +2269,9 @@ category_populate (ECardSimple *card, char **values) ECard *ecard; EList *categories; - g_object_get (card, - "card", &ecard, - NULL); + gtk_object_get (GTK_OBJECT (card), + "card", &ecard, + NULL); categories = e_list_new((EListCopyFunc) g_strdup, (EListFreeFunc) g_free, @@ -2301,11 +2280,11 @@ category_populate (ECardSimple *card, char **values) for (i = 0; values[i]; i++) e_list_append (categories, values[i]); - g_object_set (ecard, - "category_list", categories, - NULL); + gtk_object_set (GTK_OBJECT (ecard), + "category_list", categories, + NULL); - g_object_unref (categories); + gtk_object_unref (GTK_OBJECT (categories)); e_card_simple_sync_card (card); } @@ -2319,13 +2298,13 @@ category_ber (ECardSimple *card) ECard *ecard; int i; - g_object_get (card, - "card", &ecard, - NULL); + gtk_object_get (GTK_OBJECT (card), + "card", &ecard, + NULL); - g_object_get (ecard, - "category_list", &categories, - NULL); + gtk_object_get (GTK_OBJECT (ecard), + "category_list", &categories, + NULL); if (e_list_length (categories) != 0) { result = g_new0 (struct berval*, e_list_length (categories) + 1); @@ -2339,7 +2318,7 @@ category_ber (ECardSimple *card) result[i]->bv_len = strlen (category); } - g_object_unref (iterator); + gtk_object_unref (GTK_OBJECT (iterator)); } return result; @@ -2615,12 +2594,10 @@ func_beginswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *da str, str)); } else if (!strcmp (ldap_attr, "fileAs")) { - if (ldap_data->bl->priv->evolutionPersonSupported) - ldap_data->list = g_list_prepend(ldap_data->list, - g_strdup_printf("(fileAs=%s*)", str)); - else - ldap_data->list = g_list_prepend(ldap_data->list, - g_strdup_printf("(sn=%s*)", str)); + ldap_data->list = g_list_prepend(ldap_data->list, + g_strdup_printf( + "(|(fileAs=%s*)(&(!(fileAs=*))(sn=%s*)))", + str, str)); } else { ldap_data->list = g_list_prepend(ldap_data->list, @@ -2781,7 +2758,7 @@ build_card_from_entry (LDAP *ldap, LDAPMessage *e, GList **existing_objectclasse struct prop_info *info = NULL; char **values; - if (existing_objectclasses && !g_ascii_strcasecmp (attr, "objectclass")) { + if (existing_objectclasses && !strcasecmp (attr, "objectclass")) { values = ldap_get_values (ldap, e, attr); for (i = 0; values[i]; i ++) *existing_objectclasses = g_list_append (*existing_objectclasses, g_strdup (values[i])); @@ -2790,7 +2767,7 @@ build_card_from_entry (LDAP *ldap, LDAPMessage *e, GList **existing_objectclasse } else { for (i = 0; i < num_prop_infos; i ++) - if (!g_ascii_strcasecmp (attr, prop_info[i].ldap_attr)) { + if (!g_strcasecmp (attr, prop_info[i].ldap_attr)) { info = &prop_info[i]; break; } @@ -2807,7 +2784,7 @@ build_card_from_entry (LDAP *ldap, LDAPMessage *e, GList **existing_objectclasse } else if (info->prop_type & PROP_TYPE_COMPLEX) { /* if it's a list call the ecard-populate function, - which calls g_object_set to set the property */ + which calls gtk_object_set to set the property */ info->populate_ecard_func(card, values); } @@ -2825,7 +2802,7 @@ build_card_from_entry (LDAP *ldap, LDAPMessage *e, GList **existing_objectclasse e_card_simple_sync_card (card); - g_object_unref (ecard); + gtk_object_unref (GTK_OBJECT (ecard)); return card; } @@ -2891,7 +2868,7 @@ poll_ldap (PASBackendLDAP *bl) } e_iterator_next (iter); } - g_object_unref (iter); + gtk_object_unref (GTK_OBJECT (iter)); return TRUE; } @@ -2902,7 +2879,6 @@ send_pending_adds (LDAPSearchOp *search_op) search_op->num_sent_this_time += search_op->num_pending_adds; pas_book_view_notify_add (search_op->op.view, search_op->pending_adds); g_list_foreach (search_op->pending_adds, (GFunc)g_free, NULL); - g_list_free (search_op->pending_adds); search_op->pending_adds = NULL; search_op->num_pending_adds = 0; } @@ -2968,7 +2944,7 @@ ldap_search_handler (LDAPOp *op, LDAPMessage *res) e_card_simple_get_vcard_assume_utf8 (card)); search_op->num_pending_adds ++; - g_object_unref (card); + gtk_object_unref (GTK_OBJECT(card)); e = ldap_next_entry(ldap, e); } @@ -3094,27 +3070,34 @@ pas_backend_ldap_search (PASBackendLDAP *bl, } static void -ldap_get_view (PASBackend *backend, - PASBook *book, - const char *search, - GNOME_Evolution_Addressbook_BookViewListener listener, - int limit) +pas_backend_ldap_process_get_book_view (PASBackend *backend, + PASBook *book, + PASRequest *req) { PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend); PASBookView *book_view; PASBackendLDAPBookView *view; - book_view = pas_book_view_new (listener); + g_return_if_fail (req->get_book_view.listener != NULL); + + book_view = pas_book_view_new (req->get_book_view.listener); bonobo_object_ref(BONOBO_OBJECT(book)); - g_object_weak_ref (G_OBJECT (book_view), view_destroy, book); + gtk_signal_connect(GTK_OBJECT(book_view), "destroy", + GTK_SIGNAL_FUNC(view_destroy), book); view = g_new0(PASBackendLDAPBookView, 1); view->book_view = book_view; - view->search = g_strdup(search); + view->search = g_strdup(req->get_book_view.search); view->card_sexp = pas_backend_card_sexp_new (view->search); view->blpriv = bl->priv; - view->limit = limit; + + if (req->op == GetCompletionView) { + view->limit = MIN (bl->priv->ldap_limit, 100); + } + else { + view->limit = bl->priv->ldap_limit; + } e_list_append(bl->priv->book_views, view); @@ -3130,155 +3113,92 @@ ldap_get_view (PASBackend *backend, } static void -pas_backend_ldap_process_get_book_view (PASBackend *backend, - PASBook *book, - PASGetBookViewRequest *req) -{ - PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend); - - ldap_get_view (backend, book, req->search, req->listener, - bl->priv->ldap_limit); -} - -static void -pas_backend_ldap_process_get_completion_view (PASBackend *backend, - PASBook *book, - PASGetCompletionViewRequest *req) -{ - PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend); - - ldap_get_view (backend, book, req->search, req->listener, - MIN (bl->priv->ldap_limit, 100)); -} - -static void -pas_backend_ldap_process_get_changes (PASBackend *backend, - PASBook *book, - PASGetChangesRequest *req) -{ - /* FIXME: implement */ -} - -static void pas_backend_ldap_process_check_connection (PASBackend *backend, PASBook *book, - PASCheckConnectionRequest *req) + PASRequest *req) { PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend); pas_book_report_connection (book, bl->priv->connected); } -#define LDAP_SIMPLE_PREFIX "ldap/simple-" -#define SASL_PREFIX "sasl/" - static void pas_backend_ldap_process_authenticate_user (PASBackend *backend, PASBook *book, - PASAuthenticateUserRequest *req) + PASRequest *req) { PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend); int ldap_error; char *dn = NULL; - if (!strncasecmp (req->auth_method, LDAP_SIMPLE_PREFIX, strlen (LDAP_SIMPLE_PREFIX))) { - - if (!strcmp (req->auth_method, "ldap/simple-email")) { - LDAPMessage *res, *e; - char *query = g_strdup_printf ("(mail=%s)", req->user); + if (!strcmp (req->auth_user.auth_method, "ldap/simple-email")) { + LDAPMessage *res, *e; + char *query = g_strdup_printf ("(mail=%s)", req->auth_user.user); - ldap_error = ldap_search_s (bl->priv->ldap, - bl->priv->ldap_rootdn, - bl->priv->ldap_scope, - query, - NULL, 0, &res); - g_free (query); + ldap_error = ldap_search_s (bl->priv->ldap, + bl->priv->ldap_rootdn, + bl->priv->ldap_scope, + query, + NULL, 0, &res); + g_free (query); - if (ldap_error == LDAP_SUCCESS) { - char *entry_dn; + if (ldap_error == LDAP_SUCCESS) { + char *entry_dn; - e = ldap_first_entry (bl->priv->ldap, res); + e = ldap_first_entry (bl->priv->ldap, res); - entry_dn = ldap_get_dn (bl->priv->ldap, e); - dn = g_strdup(entry_dn); + entry_dn = ldap_get_dn (bl->priv->ldap, e); + dn = g_strdup(entry_dn); - ldap_memfree (entry_dn); - ldap_msgfree (res); - } - else { - pas_book_respond_authenticate_user (book, - GNOME_Evolution_Addressbook_BookListener_PermissionDenied); - return; - } - } - else if (!strcmp (req->auth_method, "ldap/simple-binddn")) { - dn = g_strdup (req->user); + ldap_memfree (entry_dn); + ldap_msgfree (res); } - - /* now authenticate against the DN we were either supplied or queried for */ - printf ("simple auth as %s\n", dn); - ldap_error = ldap_simple_bind_s(bl->priv->ldap, - dn, - req->passwd); - - pas_book_respond_authenticate_user (book, - ldap_error_to_response (ldap_error)); - } -#ifdef ENABLE_SASL_BINDS - else if (!strncasecmp (req->auth_method, SASL_PREFIX, strlen (SASL_PREFIX))) { - g_print ("sasl bind (mech = %s) as %s", req->auth_method + strlen (SASL_PREFIX), req->user); - ldap_error = ldap_sasl_bind_s (bl->priv->ldap, - NULL, - req->auth_method + strlen (SASL_PREFIX), - req->passwd, - NULL, - NULL, - NULL); - - if (ldap_error == LDAP_NOT_SUPPORTED) - pas_book_respond_authenticate_user (book, - GNOME_Evolution_Addressbook_BookListener_UnsupportedAuthenticationMethod); - else + else { pas_book_respond_authenticate_user (book, - ldap_error_to_response (ldap_error)); + GNOME_Evolution_Addressbook_BookListener_PermissionDenied); + return; + } } -#endif - else { - pas_book_respond_authenticate_user (book, - GNOME_Evolution_Addressbook_BookListener_UnsupportedAuthenticationMethod); - return; + else if (!strcmp (req->auth_user.auth_method, "ldap/simple-binddn")) { + dn = g_strdup (req->auth_user.user); } - if (ldap_error == LDAP_SUCCESS) { - bl->priv->auth_dn = dn; - bl->priv->auth_passwd = g_strdup (req->passwd); + /* now authenticate against the DN we were either supplied or queried for */ + printf ("authenticating as %s\n", dn); + ldap_error = ldap_simple_bind_s(bl->priv->ldap, + dn, + req->auth_user.passwd); - pas_backend_set_is_writable (backend, TRUE); + bl->priv->auth_dn = dn; + bl->priv->auth_passwd = g_strdup (req->auth_user.passwd); - /* force a requery on the root dse since some ldap - servers are set up such that they don't report - anything (including the schema DN) until the user - is authenticated */ - if (!bl->priv->evolutionPersonChecked) { - ldap_error = query_ldap_root_dse (bl); + pas_book_respond_authenticate_user (book, + ldap_error_to_response (ldap_error)); - if (LDAP_SUCCESS == ldap_error) { - if (!bl->priv->evolutionPersonChecked) - check_schema_support (bl); - } - else - g_warning ("Failed to perform root dse query after authenticating, (ldap_error 0x%02x)", ldap_error); - } + bl->priv->writable = (ldap_error == LDAP_SUCCESS); + + /* if the bind was successful we force a requery on the root + dse since some ldap servers are set up such that they don't + report anything (including the schema DN) until the user is + authenticated */ + if (!bl->priv->evolutionPersonChecked && ldap_error == LDAP_SUCCESS) { + ldap_error = query_ldap_root_dse (bl); - pas_book_report_writable (book, TRUE); + if (LDAP_SUCCESS == ldap_error) { + if (!bl->priv->evolutionPersonChecked) + check_schema_support (bl); + } + else + g_warning ("Failed to perform root dse query after authenticating, (ldap_error 0x%02x)", ldap_error); } + pas_book_report_writable (book, bl->priv->writable); } static void pas_backend_ldap_process_get_supported_fields (PASBackend *backend, PASBook *book, - PASGetSupportedFieldsRequest *req) + PASRequest *req) { PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend); @@ -3289,16 +3209,75 @@ pas_backend_ldap_process_get_supported_fields (PASBackend *backend, } static void -pas_backend_ldap_process_get_supported_auth_methods (PASBackend *backend, - PASBook *book, - PASGetSupportedAuthMethodsRequest *req) +pas_backend_ldap_process_client_requests (PASBook *book) +{ + PASBackend *backend; + PASRequest *req; + + backend = pas_book_get_backend (book); + + req = pas_book_pop_request (book); + if (req == NULL) + return; + + switch (req->op) { + case CreateCard: + pas_backend_ldap_process_create_card (backend, book, req); + break; + + case RemoveCard: + pas_backend_ldap_process_remove_card (backend, book, req); + break; + + case ModifyCard: + pas_backend_ldap_process_modify_card (backend, book, req); + break; + + case CheckConnection: + pas_backend_ldap_process_check_connection (backend, book, req); + break; + + case GetVCard: + pas_backend_ldap_process_get_vcard (backend, book, req); + break; + + case GetCursor: + pas_backend_ldap_process_get_cursor (backend, book, req); + break; + + case GetBookView: + pas_backend_ldap_process_get_book_view (backend, book, req); + break; + + case GetCompletionView: + /* we don't support summaries so completion view requests are the same as book view requests */ + pas_backend_ldap_process_get_book_view (backend, book, req); + break; + + case GetChanges: + /* FIXME: Code this. */ + break; + + case AuthenticateUser: + pas_backend_ldap_process_authenticate_user (backend, book, req); + break; + case GetSupportedFields: + pas_backend_ldap_process_get_supported_fields (backend, book, req); + break; + } + + pas_book_free_request (req); +} + +static void +pas_backend_ldap_book_destroy_cb (PASBook *book, gpointer data) { - PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend); + PASBackendLDAP *backend; - pas_book_respond_get_supported_auth_methods (book, - GNOME_Evolution_Addressbook_BookListener_Success, - bl->priv->supported_auth_methods); + backend = PAS_BACKEND_LDAP (data); + + pas_backend_remove_client (PAS_BACKEND (backend), book); } static GNOME_Evolution_Addressbook_BookListener_CallStatus @@ -3392,7 +3371,75 @@ pas_backend_ldap_get_uri (PASBackend *backend) return bl->priv->uri; } -static char* +static gboolean +pas_backend_ldap_add_client (PASBackend *backend, + GNOME_Evolution_Addressbook_BookListener listener) +{ + PASBackendLDAP *bl; + PASBook *book; + + g_assert (backend != NULL); + g_assert (PAS_IS_BACKEND_LDAP (backend)); + + bl = PAS_BACKEND_LDAP (backend); + + book = pas_book_new (backend, listener); + + if (!book) { + if (!bl->priv->clients) + pas_backend_last_client_gone (backend); + + return FALSE; + } + + gtk_signal_connect (GTK_OBJECT (book), "destroy", + pas_backend_ldap_book_destroy_cb, backend); + + gtk_signal_connect (GTK_OBJECT (book), "requests_queued", + pas_backend_ldap_process_client_requests, NULL); + + bl->priv->clients = g_list_prepend ( + bl->priv->clients, book); + + if (bl->priv->connected) { + pas_book_respond_open ( + book, GNOME_Evolution_Addressbook_BookListener_Success); + } else { + pas_book_respond_open ( + book, GNOME_Evolution_Addressbook_BookListener_OtherError); + } + + pas_book_report_writable (book, bl->priv->writable); + + bonobo_object_unref (BONOBO_OBJECT (book)); + + return TRUE; +} + +static void +pas_backend_ldap_remove_client (PASBackend *backend, + PASBook *book) +{ + PASBackendLDAP *bl; + + g_return_if_fail (backend != NULL); + g_return_if_fail (PAS_IS_BACKEND_LDAP (backend)); + g_return_if_fail (book != NULL); + g_return_if_fail (PAS_IS_BOOK (book)); + + bl = PAS_BACKEND_LDAP (backend); + + /* Disconnect */ + bl->priv->clients = g_list_remove (bl->priv->clients, book); + + /* When all clients go away, notify the parent factory about it so that + * it may decide whether to kill the backend or not. + */ + if (!bl->priv->clients) + pas_backend_last_client_gone (backend); +} + +static char * pas_backend_ldap_get_static_capabilities (PASBackend *backend) { return g_strdup("net"); @@ -3418,10 +3465,10 @@ pas_backend_ldap_new (void) { PASBackendLDAP *backend; - backend = g_object_new (PAS_TYPE_BACKEND_LDAP, NULL); + backend = gtk_type_new (pas_backend_ldap_get_type ()); if (! pas_backend_ldap_construct (backend)) { - g_object_unref (backend); + gtk_object_unref (GTK_OBJECT (backend)); return NULL; } @@ -3440,71 +3487,51 @@ call_dtor (int msgid, LDAPOp *op, gpointer data) } static void -pas_backend_ldap_dispose (GObject *object) +pas_backend_ldap_destroy (GtkObject *object) { PASBackendLDAP *bl; bl = PAS_BACKEND_LDAP (object); - if (bl->priv) { - g_hash_table_foreach_remove (bl->priv->id_to_op, (GHRFunc)call_dtor, NULL); - g_hash_table_destroy (bl->priv->id_to_op); + g_hash_table_foreach_remove (bl->priv->id_to_op, (GHRFunc)call_dtor, NULL); + g_hash_table_destroy (bl->priv->id_to_op); - if (bl->priv->poll_timeout != -1) { - printf ("removing timeout\n"); - g_source_remove (bl->priv->poll_timeout); - } - - g_object_unref (bl->priv->book_views); - - if (bl->priv->supported_fields) - g_object_unref (bl->priv->supported_fields); + if (bl->priv->poll_timeout != -1) { + printf ("removing timeout\n"); + g_source_remove (bl->priv->poll_timeout); + } - if (bl->priv->supported_auth_methods) - g_object_unref (bl->priv->supported_auth_methods); + gtk_object_unref (GTK_OBJECT (bl->priv->book_views)); - g_free (bl->priv->uri); + if (bl->priv->supported_fields) + gtk_object_unref (GTK_OBJECT (bl->priv->supported_fields)); - g_free (bl->priv); - bl->priv = NULL; - } + g_free (bl->priv->uri); - if (G_OBJECT_CLASS (pas_backend_ldap_parent_class)->dispose) - G_OBJECT_CLASS (pas_backend_ldap_parent_class)->dispose (object); + GTK_OBJECT_CLASS (pas_backend_ldap_parent_class)->destroy (object); } static void pas_backend_ldap_class_init (PASBackendLDAPClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); + GtkObjectClass *object_class = (GtkObjectClass *) klass; PASBackendClass *parent_class; /* get client side information (extensions present in the library) */ get_ldap_library_info (); - pas_backend_ldap_parent_class = g_type_class_peek_parent (klass); + pas_backend_ldap_parent_class = gtk_type_class (pas_backend_get_type ()); parent_class = PAS_BACKEND_CLASS (klass); /* Set the virtual methods. */ parent_class->load_uri = pas_backend_ldap_load_uri; parent_class->get_uri = pas_backend_ldap_get_uri; + parent_class->add_client = pas_backend_ldap_add_client; + parent_class->remove_client = pas_backend_ldap_remove_client; parent_class->get_static_capabilities = pas_backend_ldap_get_static_capabilities; - parent_class->create_card = pas_backend_ldap_process_create_card; - parent_class->remove_cards = pas_backend_ldap_process_remove_cards; - parent_class->modify_card = pas_backend_ldap_process_modify_card; - parent_class->check_connection = pas_backend_ldap_process_check_connection; - parent_class->get_vcard = pas_backend_ldap_process_get_vcard; - parent_class->get_cursor = pas_backend_ldap_process_get_cursor; - parent_class->get_book_view = pas_backend_ldap_process_get_book_view; - parent_class->get_completion_view = pas_backend_ldap_process_get_completion_view; - parent_class->get_changes = pas_backend_ldap_process_get_changes; - parent_class->authenticate_user = pas_backend_ldap_process_authenticate_user; - parent_class->get_supported_fields = pas_backend_ldap_process_get_supported_fields; - parent_class->get_supported_auth_methods = pas_backend_ldap_process_get_supported_auth_methods; - - object_class->dispose = pas_backend_ldap_dispose; + object_class->destroy = pas_backend_ldap_destroy; } static void @@ -3526,25 +3553,24 @@ pas_backend_ldap_init (PASBackendLDAP *backend) /** * pas_backend_ldap_get_type: */ -GType +GtkType pas_backend_ldap_get_type (void) { - static GType type = 0; + static GtkType type = 0; if (! type) { - GTypeInfo info = { - sizeof (PASBackendLDAPClass), - NULL, /* base_class_init */ - NULL, /* base_class_finalize */ - (GClassInitFunc) pas_backend_ldap_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ + GtkTypeInfo info = { + "PASBackendLDAP", sizeof (PASBackendLDAP), - 0, /* n_preallocs */ - (GInstanceInitFunc) pas_backend_ldap_init + sizeof (PASBackendLDAPClass), + (GtkClassInitFunc) pas_backend_ldap_class_init, + (GtkObjectInitFunc) pas_backend_ldap_init, + NULL, /* reserved 1 */ + NULL, /* reserved 2 */ + (GtkClassInitFunc) NULL }; - type = g_type_register_static (PAS_TYPE_BACKEND, "PASBackendLDAP", &info, 0); + type = gtk_type_unique (pas_backend_get_type (), &info); } return type; |