diff options
| author | Chris Toshok <toshok@ximian.com> | 2004-02-06 07:34:00 +0000 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2004-02-06 07:34:00 +0000 |
| commit | 2759a7dd75fce96d7e7f10ca8d29607d63508c75 (patch) | |
| tree | 818bcf917f75728c2c4415b73bd86f4c0edd0570 /addressbook | |
| parent | 3a22a454fe0e4c16c312cc7762a7b71be91361b3 (diff) | |
| download | evolution-data-server-2759a7dd75fce96d7e7f10ca8d29607d63508c75.tar.gz | |
[ along with previous fixes, this fixes #53129 ]
2004-02-05 Chris Toshok <toshok@ximian.com>
[ along with previous fixes, this fixes #53129 ]
* backends/ldap/e-book-backend-ldap.c (find_book_view): we no
longer use EBookBackendLDAPBookView.
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/backends/ldap/e-book-backend-ldap.c | 24 |
2 files changed, 12 insertions, 19 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 64bd73967..73970ab70 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,12 @@ 2004-02-05 Chris Toshok <toshok@ximian.com> + [ along with previous fixes, this fixes #53129 ] + + * backends/ldap/e-book-backend-ldap.c (find_book_view): we no + longer use EBookBackendLDAPBookView. + +2004-02-05 Chris Toshok <toshok@ximian.com> + * libebook/e-book.c (startup_mainloop): switch from using bonobo_main to using a separate GMainLoop attached to the default context. diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c index a1bbb1be0..a045fe06b 100644 --- a/addressbook/backends/ldap/e-book-backend-ldap.c +++ b/addressbook/backends/ldap/e-book-backend-ldap.c @@ -76,7 +76,6 @@ static gchar *e_book_backend_ldap_build_query (EBookBackendLDAP *bl, const char static EBookBackendClass *e_book_backend_ldap_parent_class; typedef struct _EBookBackendLDAPCursorPrivate EBookBackendLDAPCursorPrivate; -typedef struct _EBookBackendLDAPBookView EBookBackendLDAPBookView; typedef struct LDAPOp LDAPOp; @@ -126,15 +125,6 @@ struct _EBookBackendLDAPCursorPrivate { long num_elements; }; -struct _EBookBackendLDAPBookView { - EDataBookView *book_view; - EBookBackendLDAPPrivate *blpriv; - gchar *search; - int limit; - - LDAPOp *search_op; -}; - typedef void (*LDAPOpHandler)(LDAPOp *op, LDAPMessage *res); typedef void (*LDAPOpDtor)(LDAPOp *op); @@ -370,23 +360,21 @@ book_view_notify_status (EDataBookView *view, const char *status) static EDataBookView* find_book_view (EBookBackendLDAP *bl) { -#if 0 - EIterator *iter = e_list_get_iterator (bl->priv->book_views); + EList *views = e_book_backend_get_book_views (E_BOOK_BACKEND (bl)); + EIterator *iter = e_list_get_iterator (views); EDataBookView *rv = NULL; if (e_iterator_is_valid (iter)) { /* just always use the first book view */ - EBookBackendLDAPBookView *v = (EBookBackendLDAPBookView*)e_iterator_get(iter); + EDataBookView *v = (EDataBookView*)e_iterator_get(iter); if (v) - rv = v->book_view; + rv = v; } g_object_unref (iter); + g_object_unref (views); return rv; -#else - return NULL; -#endif } static void @@ -1547,8 +1535,6 @@ e_book_backend_ldap_modify_contact (EBookBackend *backend, ldap = bl->priv->ldap; - book_view_notify_status (book_view, _("Modifying contact from LDAP server...")); - do { book_view_notify_status (book_view, _("Modifying contact from LDAP server...")); |