Committing on behalf of Milan Crha <mcrha@redhat.com>

2008-07-21  Milan Crha  <mcrha@redhat.com>

       ** Fix for bug #236010

       * backends/ldap/e-book-backend-ldap.c:
       (e_book_backend_ldap_load_source): We cannot check on LDAP server
       whether we have general write access on it, thus report we have
       immediately after loading the source successfully. There will be
       a "Permission Deny" message in case we are wrong.
       * backends/ldap/e-book-backend-ldap.c: (ldap_op_finished):
       Clear the status message when the operation finished.

svn path=/trunk/; revision=9149

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 7459b35..55206d8 100644 (file)
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,15 @@
+2008-07-21  Milan Crha  <mcrha@redhat.com>
+
+       ** Fix for bug #236010
+
+       * backends/ldap/e-book-backend-ldap.c:
+       (e_book_backend_ldap_load_source): We cannot check on LDAP server
+       whether we have general write access on it, thus report we have
+       immediately after loading the source successfully. There will be
+       a "Permission Deny" message in case we are wrong.
+       * backends/ldap/e-book-backend-ldap.c: (ldap_op_finished):
+       Clear the status message when the operation finished.
+
 2008-07-18  Wang Xin  <jedy.wang@sun.com>
 
        ** Fix for bug #540127, commit the patch for shuai.liu@su.com.

diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index 42f5a65..95f3fc6 100644 (file)
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -1087,6 +1087,9 @@ ldap_op_finished (LDAPOp *op)
        g_static_rec_mutex_lock (&bl->priv->op_hash_mutex);
        g_hash_table_remove (bl->priv->id_to_op, &op->id);
 
+       /* clear the status message too */
+       book_view_notify_status (find_book_view (bl), "");
+
        /* should handle errors here */
        g_static_rec_mutex_lock (&eds_ldap_handler_lock);
        if (bl->priv->ldap)
@@ -4864,9 +4867,11 @@ e_book_backend_ldap_load_source (EBookBackend             *backend,
 #endif
 
                return GNOME_Evolution_Addressbook_Success;
-       }
-       else
+       } else {
+               e_book_backend_set_is_writable (backend, TRUE);
+               e_book_backend_notify_writable (backend, TRUE);
                e_book_backend_notify_connection_status (backend, TRUE);
+       }
 
        /* Online */