4 files changed, 62 insertions, 14 deletions

diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index 74b8613d3d..a42a1fa499 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -1330,30 +1330,43 @@ pas_backend_file_load_uri (PASBackend             *backend,
 {
 	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
 	char           *filename;
+	gboolean       writable = FALSE;
+	GList          *l;
 
 	g_assert (bf->priv->loaded == FALSE);
 
 	filename = pas_backend_file_extract_path_from_uri (uri);
 
 	bf->priv->file_db = dbopen (filename, O_RDWR, 0666, DB_HASH, NULL);
-	if (bf->priv->file_db == NULL) {
-		bf->priv->file_db = dbopen (filename, O_RDWR | O_CREAT, 0666, DB_HASH, NULL);
+	if (bf->priv->file_db) {
+		writable = TRUE;
+	}
+	else {
+		/* try to open the file read-only */
+		bf->priv->file_db = dbopen (filename, O_RDONLY, 0666, DB_HASH, NULL);
 
-		if (bf->priv->file_db) {
-			char *create_initial_file;
-			char *dir;
+		if (!bf->priv->file_db) {
+			/* lastly, try and create the file */
+			bf->priv->file_db = dbopen (filename, O_RDWR | O_CREAT, 0666, DB_HASH, NULL);
 
-			dir = g_dirname(filename);
-			create_initial_file = g_concat_dir_and_file(dir, "create-initial");
+			if (bf->priv->file_db) {
+				char *create_initial_file;
+				char *dir;
 
-			if (g_file_exists(create_initial_file)) {
-				char *id;
-				id = do_create(backend, INITIAL_VCARD, NULL);
-				g_free (id);
-			}
+				dir = g_dirname(filename);
+				create_initial_file = g_concat_dir_and_file(dir, "create-initial");
+
+				if (g_file_exists(create_initial_file)) {
+					char *id;
+					id = do_create(backend, INITIAL_VCARD, NULL);
+					g_free (id);
+				}
 
-			g_free(create_initial_file);
-			g_free(dir);
+				g_free(create_initial_file);
+				g_free(dir);
+
+				writable = TRUE;
+			}
 		}
 	}
 
@@ -1369,6 +1382,13 @@ pas_backend_file_load_uri (PASBackend             *backend,
 	} else
 		return FALSE;
 
+	/* report the writable status of the book to all its clients */
+	for (l = bf->priv->clients; l; l = g_list_next (l)) {
+		PASBook *book = l->data;
+
+		pas_book_report_writable (book, writable);
+	}
+
 	return TRUE;
 }
 
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
index 0478c59ece..0fb5347ca3 100644
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ b/addressbook/backend/pas/pas-backend-ldap.c
@@ -2036,6 +2036,9 @@ pas_backend_ldap_process_authenticate_user (PASBackend *backend,
 	pas_book_respond_authenticate_user (book,
 				    ldap_error_to_response (ldap_error));
 
+	if (ldap_error == LDAP_SUCCESS)
+		pas_book_report_writable (book, TRUE);
+
 	if (!bl->priv->evolutionPersonChecked)
 		check_schema_support (bl);
 }
diff --git a/addressbook/backend/pas/pas-book.c b/addressbook/backend/pas/pas-book.c
index 6add0987fc..d115e9062f 100644
--- a/addressbook/backend/pas/pas-book.c
+++ b/addressbook/backend/pas/pas-book.c
@@ -656,6 +656,28 @@ pas_book_report_connection (PASBook  *book,
 	CORBA_exception_free (&ev);
 }
 
+/**
+ * pas_book_report_writable:
+ */
+void
+pas_book_report_writable (PASBook                           *book,
+			  gboolean                           writable)
+{
+	CORBA_Environment ev;
+
+	CORBA_exception_init (&ev);
+
+	GNOME_Evolution_Addressbook_BookListener_notifyWritable (
+		book->priv->listener, (CORBA_boolean) writable, &ev);
+
+	if (ev._major != CORBA_NO_EXCEPTION) {
+		g_warning ("pas_book_report_writable: Exception "
+			   "responding to BookListener!\n");
+	}
+
+	CORBA_exception_free (&ev);
+}
+
 static gboolean
 pas_book_construct (PASBook                *book,
 		    PASBackend             *backend,
diff --git a/addressbook/backend/pas/pas-book.h b/addressbook/backend/pas/pas-book.h
index 1d401d33a4..12c780e282 100644
--- a/addressbook/backend/pas/pas-book.h
+++ b/addressbook/backend/pas/pas-book.h
@@ -100,6 +100,9 @@ void                    pas_book_respond_get_changes    (PASBook
 void                    pas_book_report_connection      (PASBook                           *book,
 							 gboolean                           connected);
 
+void                    pas_book_report_writable        (PASBook                           *book,
+							 gboolean                           writable);
+
 gboolean                pas_book_can_write              (PASBook                           *book);
 gboolean                pas_book_can_write_card         (PASBook                           *book,
 							 const char                        *id);