libebook: Reference address books by UID instead of URI.

Breaks EContact and EVCard APIs, but merely making the names accurate.

diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c
index d0f5920..acab6fc 100644 (file)
--- a/addressbook/libebook/e-contact.c
+++ b/addressbook/libebook/e-contact.c
@@ -125,7 +125,7 @@ static const EContactFieldInfo field_info[] = {
         * preferred user's description (or display name) of the contact. Note 'File' is a verb here. */
        GETSET_FIELD (E_CONTACT_FILE_AS,    EVC_X_FILE_AS, "file_as", N_("File Under"),    FALSE, fileas_getter, fileas_setter),
        /* URI of the book to which the contact belongs to */
-       STRING_FIELD (E_CONTACT_BOOK_URI, EVC_X_BOOK_URI, "book_uri", N_("Book URI"), FALSE),
+       STRING_FIELD (E_CONTACT_BOOK_UID, EVC_X_BOOK_UID, "book_uid", N_("Book UID"), FALSE),
 
        /* Name fields */
        /* FN isn't really a structured field - we use a getter/setter

diff --git a/addressbook/libebook/e-contact.h b/addressbook/libebook/e-contact.h
index bde971c..2ee2858 100644 (file)
--- a/addressbook/libebook/e-contact.h
+++ b/addressbook/libebook/e-contact.h
@@ -40,7 +40,7 @@ typedef enum {
 
        E_CONTACT_UID = 1,       /* string field */
        E_CONTACT_FILE_AS,       /* string field */
-       E_CONTACT_BOOK_URI,      /* string field */
+       E_CONTACT_BOOK_UID,      /* string field */
 
        /* Name fields */
        E_CONTACT_FULL_NAME,     /* string field */

diff --git a/addressbook/libebook/e-vcard.h b/addressbook/libebook/e-vcard.h
index f20eada..ee03ad1 100644 (file)
--- a/addressbook/libebook/e-vcard.h
+++ b/addressbook/libebook/e-vcard.h
@@ -135,7 +135,7 @@ G_BEGIN_DECLS
 #define EVC_X_VIDEO_URL                        "X-EVOLUTION-VIDEO-URL"
 #define EVC_X_WANTS_HTML               "X-MOZILLA-HTML"
 #define EVC_X_YAHOO                    "X-YAHOO"
-#define EVC_X_BOOK_URI                 "X-EVOLUTION-BOOK-URI"
+#define EVC_X_BOOK_UID                 "X-EVOLUTION-BOOK-UID"
 
 /* Constants for Evo contact lists only */