same. (remodel): same.

2004-06-25  Chris Toshok  <toshok@ximian.com>

        * gui/widgets/e-minicard.c (add_field): same.
        (remodel): same.

        * gui/widgets/e-addressbook-reflow-adapter.c (addressbook_height): same.

        * gui/widgets/eab-popup-control.c (email_table_init): same.
        (contact_picker_init): same.

        * gui/widgets/eab-gui-util.c (eab_contact_save): use
        e_contact_get_const here to plug a leak.
        (eab_contact_list_save): same.
        (eab_send_contact_list_as_attachment): same.

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index a358224..e11d064 100644 (file)
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,14 @@
+2004-06-26  Chris Toshok  <toshok@ximian.com>
+
+       * backends/ldap/e-book-backend-ldap.c (get_ldap_library_info): use
+       ldap_unbind_ext_s.
+       (e_book_backend_ldap_connect): same.
+       (e_book_backend_ldap_dispose): unbind our LDAP* when we're shut
+       down.
+
+       * libedata-book/e-data-book-view.h: add prototype for
+       e_data_book_view_set_thresholds.
+
 2004-06-24  Hans Petter Jansson  <hpj@ximian.com>
 
        See bug #51127.

diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index 6b2d496..31d156a 100644 (file)
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -658,7 +658,7 @@ e_book_backend_ldap_connect (EBookBackendLDAP *bl)
 
        /* close connection first if it's open first */
        if (blpriv->ldap)
-               ldap_unbind_ext (blpriv->ldap, NULL, NULL);
+               ldap_unbind_ext_s (blpriv->ldap, NULL, NULL);
 
        blpriv->ldap = ldap_init (blpriv->ldap_host, blpriv->ldap_port);
 #if defined (DEBUG) && defined (LDAP_OPT_DEBUG_LEVEL)
@@ -684,7 +684,7 @@ e_book_backend_ldap_connect (EBookBackendLDAP *bl)
 
                        if (!bl->priv->ldap_v3 && bl->priv->use_tls == E_BOOK_BACKEND_LDAP_TLS_ALWAYS) {
                                g_message ("TLS not available (fatal version), v3 protocol could not be established (ldap_error 0x%02x)", ldap_error);
-                               ldap_unbind (blpriv->ldap);
+                               ldap_unbind_ext_s (blpriv->ldap, NULL, NULL);
                                blpriv->ldap = NULL;
                                return GNOME_Evolution_Addressbook_TLSNotAvailable;
                        }
@@ -698,7 +698,7 @@ e_book_backend_ldap_connect (EBookBackendLDAP *bl)
                                if (LDAP_SUCCESS != ldap_error) {
                                        if (bl->priv->use_tls == E_BOOK_BACKEND_LDAP_TLS_ALWAYS) {
                                                g_message ("TLS not available (fatal version), (ldap_error 0x%02x)", ldap_error);
-                                               ldap_unbind (blpriv->ldap);
+                                               ldap_unbind_ext_s (blpriv->ldap, NULL, NULL);
                                                blpriv->ldap = NULL;
                                                return GNOME_Evolution_Addressbook_TLSNotAvailable;
                                        }
@@ -3531,6 +3531,9 @@ e_book_backend_ldap_dispose (GObject *object)
                g_static_rec_mutex_unlock (&bl->priv->op_hash_mutex);
                g_static_rec_mutex_free (&bl->priv->op_hash_mutex);
 
+               if (bl->priv->ldap)
+                       ldap_unbind_ext_s (bl->priv->ldap, NULL, NULL);
+
                if (bl->priv->poll_timeout != -1) {
                        printf ("removing timeout\n");
                        g_source_remove (bl->priv->poll_timeout);

diff --git a/addressbook/libedata-book/e-data-book-view.h b/addressbook/libedata-book/e-data-book-view.h
index 7d544d0..564f9dd 100644 (file)
--- a/addressbook/libedata-book/e-data-book-view.h
+++ b/addressbook/libedata-book/e-data-book-view.h
@@ -48,6 +48,10 @@ EDataBookView *e_data_book_view_new                  (EBookBackend
                                                      EBookBackendSExp             *card_sexp,
                                                      int                           max_results);
 
+void              e_data_book_view_set_thresholds    (EDataBookView *book_view,
+                                                     int minimum_grouping_threshold,
+                                                     int maximum_grouping_threshold);
+
 const char*       e_data_book_view_get_card_query    (EDataBookView                *book_view);
 EBookBackendSExp* e_data_book_view_get_card_sexp     (EDataBookView                *book_view);
 int               e_data_book_view_get_max_results   (EDataBookView                *book_view);