EClient: Adding E_CLIENT_ERROR_OUT_OF_SYNC
authorTristan Van Berkom <tristanvb@openismus.com>
Thu, 24 Jan 2013 05:56:10 +0000 (14:56 +0900)
committerTristan Van Berkom <tristanvb@openismus.com>
Tue, 29 Jan 2013 07:02:24 +0000 (16:02 +0900)
An error to descibe out of sync data between the client and backend.

addressbook/libebook/e-book-client.c
addressbook/libebook/e-book-types.h
addressbook/libedata-book/e-data-book.c
libedataserver/e-client.c
libedataserver/e-client.h

index c3fc92f..4767464 100644 (file)
@@ -150,6 +150,7 @@ unwrap_dbus_error (GError *error,
                { err ("NotOpened",                             E_CLIENT_ERROR_NOT_OPENED) },
                { err ("UnsupportedField",                      E_CLIENT_ERROR_OTHER_ERROR) },
                { err ("InvalidServerVersion",                  E_CLIENT_ERROR_OTHER_ERROR) },
+               { err ("OutOfSync",                             E_CLIENT_ERROR_OUT_OF_SYNC) },
                { err ("OtherError",                            E_CLIENT_ERROR_OTHER_ERROR) }
        };
        #undef err
index d366f04..f7d896f 100644 (file)
@@ -84,7 +84,8 @@ typedef enum {
        E_DATA_BOOK_STATUS_NO_SPACE,
        E_DATA_BOOK_STATUS_INVALID_ARG,
        E_DATA_BOOK_STATUS_NOT_SUPPORTED,
-       E_DATA_BOOK_STATUS_NOT_OPENED
+       E_DATA_BOOK_STATUS_NOT_OPENED,
+       E_DATA_BOOK_STATUS_OUT_OF_SYNC
 } EDataBookStatus;
 
 #ifndef EDS_DISABLE_DEPRECATED
index 5518e2f..120f1ab 100644 (file)
@@ -435,7 +435,8 @@ e_data_book_status_to_string (EDataBookStatus status)
                { E_DATA_BOOK_STATUS_INVALID_ARG,                       N_("Invalid argument") },
                /* Translators: The string for NOT_SUPPORTED error */
                { E_DATA_BOOK_STATUS_NOT_SUPPORTED,                     N_("Not supported") },
-               { E_DATA_BOOK_STATUS_NOT_OPENED,                        N_("Backend is not opened yet") }
+               { E_DATA_BOOK_STATUS_NOT_OPENED,                        N_("Backend is not opened yet") },
+               { E_DATA_BOOK_STATUS_OUT_OF_SYNC,                       N_("Object is out of sync") }
        };
 
        for (i = 0; i < G_N_ELEMENTS (statuses); i++) {
@@ -477,7 +478,8 @@ e_data_book_error_quark (void)
                { E_DATA_BOOK_STATUS_NO_SPACE,                          ERR_PREFIX "NoSpace" },
                { E_DATA_BOOK_STATUS_INVALID_ARG,                       ERR_PREFIX "InvalidArg" },
                { E_DATA_BOOK_STATUS_NOT_SUPPORTED,                     ERR_PREFIX "NotSupported" },
-               { E_DATA_BOOK_STATUS_NOT_OPENED,                        ERR_PREFIX "NotOpened" }
+               { E_DATA_BOOK_STATUS_NOT_OPENED,                        ERR_PREFIX "NotOpened" },
+               { E_DATA_BOOK_STATUS_OUT_OF_SYNC,                       ERR_PREFIX "OutOfSync" }
        };
 
        #undef ERR_PREFIX
index 576060f..2ae8121 100644 (file)
@@ -168,6 +168,8 @@ e_client_error_to_string (EClientError code)
                return _("Other error");
        case E_CLIENT_ERROR_NOT_OPENED:
                return _("Backend is not opened yet");
+       case E_CLIENT_ERROR_OUT_OF_SYNC:
+               return _("Object is out of sync");
        }
 
        return _("Unknown error");
index 9cee6b6..595d856 100644 (file)
@@ -148,7 +148,8 @@ typedef enum {
        E_CLIENT_ERROR_QUERY_REFUSED,
        E_CLIENT_ERROR_DBUS_ERROR,
        E_CLIENT_ERROR_OTHER_ERROR,
-       E_CLIENT_ERROR_NOT_OPENED
+       E_CLIENT_ERROR_NOT_OPENED,
+       E_CLIENT_ERROR_OUT_OF_SYNC
 } EClientError;
 
 const gchar *  e_client_error_to_string        (EClientError code);