[evolution-data-server/openismus-work] EBookBackendFile: Use E_DATA_BOOK_ERROR instead of client error directly.

[Tristan Van Berkom <tvb src gnome org>]

commit 51f7e79d42f934e3e40b1fe5068e274a2ef26435
Author: Tristan Van Berkom <tristanvb openismus com>
Date:   Thu Jan 24 15:18:06 2013 +0900

    EBookBackendFile: Use E_DATA_BOOK_ERROR instead of client error directly.
    
    Conflicts:
    
    	addressbook/backends/file/e-book-backend-file.c

 addressbook/backends/file/e-book-backend-file.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index eff1034..6b6d8da 100644
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -937,10 +937,10 @@ e_book_backend_file_modify_contacts (EBookBackendSync *backend,
 
 			if (!contact_rev || !old_contact_rev ||
 			    strcmp (contact_rev, old_contact_rev) != 0) {
-				g_set_error (perror, E_CLIENT_ERROR,
-					     E_CLIENT_ERROR_OUT_OF_SYNC,
+				g_set_error (perror, E_DATA_BOOK_ERROR,
+					     E_DATA_BOOK_STATUS_OUT_OF_SYNC,
 					     _("Tried to modify contact '%s' with out of sync revision"),
-					     e_contact_get_const (contact, E_CONTACT_UID));
+					     (gchar *)e_contact_get_const (contact, E_CONTACT_UID));
 
 				status = STATUS_ERROR;