GNOME.org
 

[evolution-data-server] Add Google Talk field to the list of IM information

commit 455ddb3facd596442ad4c07964bff51e921b1ba4
Author: Raul Gutierrez Segales <rgs collabora co uk>
Date:   Wed Aug 24 15:42:31 2011 +0100

    Add Google Talk field to the list of IM information

 .../backends/google/e-book-backend-google.c        |    7 +++++++
 addressbook/libebook/e-contact.c                   |    8 ++++++++
 addressbook/libebook/e-contact.h                   |    8 ++++++++
 addressbook/libebook/e-vcard.h                     |    7 +++++++
 addressbook/libedata-book/e-book-backend-sexp.c    |    8 ++++++++
 .../addressbook/libebook/libebook-sections.txt     |    1 +
 .../addressbook/libebook/tmpl/e-contact.sgml       |    7 +++++++
 .../addressbook/libebook/tmpl/e-vcard.sgml         |    7 +++++++
 8 files changed, 53 insertions(+), 0 deletions(-)
---
diff --git a/addressbook/backends/google/e-book-backend-google.c b/addressbook/backends/google/e-book-backend-google.c
index d76c663..f7e1f19 100644
--- a/addressbook/backends/google/e-book-backend-google.c
+++ b/addressbook/backends/google/e-book-backend-google.c
@@ -2179,6 +2179,7 @@ e_book_backend_google_get_backend_property (EBookBackend *backend, EDataBook *bo
 			E_CONTACT_IM_MSN,
 			E_CONTACT_IM_ICQ,
 			E_CONTACT_IM_SKYPE,
+			E_CONTACT_IM_GOOGLE_TALK,
 			E_CONTACT_IM_GADUGADU,
 			E_CONTACT_IM_GROUPWISE,
 			E_CONTACT_ADDRESS,
@@ -2251,6 +2252,12 @@ e_book_backend_google_get_backend_property (EBookBackend *backend, EDataBook *bo
 			E_CONTACT_IM_SKYPE_WORK_1,
 			E_CONTACT_IM_SKYPE_WORK_2,
 			E_CONTACT_IM_SKYPE_WORK_3,
+			E_CONTACT_IM_GOOGLE_TALK_HOME_1,
+			E_CONTACT_IM_GOOGLE_TALK_HOME_2,
+			E_CONTACT_IM_GOOGLE_TALK_HOME_3,
+			E_CONTACT_IM_GOOGLE_TALK_WORK_1,
+			E_CONTACT_IM_GOOGLE_TALK_WORK_2,
+			E_CONTACT_IM_GOOGLE_TALK_WORK_3,
 			E_CONTACT_SIP,
 			E_CONTACT_ORG,
 			E_CONTACT_ORG_UNIT,
diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c
index 8ea4904..54496c8 100644
--- a/addressbook/libebook/e-contact.c
+++ b/addressbook/libebook/e-contact.c
@@ -289,6 +289,14 @@ static const EContactFieldInfo field_info[] = {
 	MULTI_LIST_FIELD (E_CONTACT_IM_SKYPE,	  EVC_X_SKYPE,     "im_skype",     N_("Skype Name List"),         FALSE),
 
 	MULTI_LIST_FIELD (E_CONTACT_SIP,	  EVC_X_SIP,    "sip",    N_("SIP address"),          FALSE),
+
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GOOGLE_TALK_HOME_1,  EVC_X_GOOGLE_TALK,  "im_google_talk_home_1",  N_("Google Talk Home Name 1"),         FALSE, "HOME", 0),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GOOGLE_TALK_HOME_2,  EVC_X_GOOGLE_TALK,  "im_google_talk_home_2",  N_("Google Talk Home Name 2"),         FALSE, "HOME", 1),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GOOGLE_TALK_HOME_3,  EVC_X_GOOGLE_TALK,  "im_google_talk_home_3",  N_("Google Talk Home Name 3"),         FALSE, "HOME", 2),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GOOGLE_TALK_WORK_1,  EVC_X_GOOGLE_TALK,  "im_google_talk_work_1",  N_("Google Talk Work Name 1"),         FALSE, "WORK", 0),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GOOGLE_TALK_WORK_2,  EVC_X_GOOGLE_TALK,  "im_google_talk_work_2",  N_("Google Talk Work Name 2"),         FALSE, "WORK", 1),
+	ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GOOGLE_TALK_WORK_3,  EVC_X_GOOGLE_TALK,  "im_google_talk_work_3",  N_("Google Talk Work Name 3"),         FALSE, "WORK", 2),
+	MULTI_LIST_FIELD (E_CONTACT_IM_GOOGLE_TALK,	  EVC_X_GOOGLE_TALK,     "im_google_talk",     N_("Google Talk Name List"),         FALSE),
 };
 
 #undef LIST_ELEM_STR_FIELD
diff --git a/addressbook/libebook/e-contact.h b/addressbook/libebook/e-contact.h
index 729eeeb..1f262b5 100644
--- a/addressbook/libebook/e-contact.h
+++ b/addressbook/libebook/e-contact.h
@@ -207,6 +207,14 @@ typedef enum {
 
 	E_CONTACT_SIP,
 
+	E_CONTACT_IM_GOOGLE_TALK_HOME_1,     /* Synthetic string field */
+	E_CONTACT_IM_GOOGLE_TALK_HOME_2,     /* Synthetic string field */
+	E_CONTACT_IM_GOOGLE_TALK_HOME_3,     /* Synthetic string field */
+	E_CONTACT_IM_GOOGLE_TALK_WORK_1,     /* Synthetic string field */
+	E_CONTACT_IM_GOOGLE_TALK_WORK_2,     /* Synthetic string field */
+	E_CONTACT_IM_GOOGLE_TALK_WORK_3,     /* Synthetic string field */
+	E_CONTACT_IM_GOOGLE_TALK,		/* Multi-valued */
+
 	E_CONTACT_FIELD_LAST,
 	E_CONTACT_FIELD_FIRST        = E_CONTACT_UID,
 
diff --git a/addressbook/libebook/e-vcard.h b/addressbook/libebook/e-vcard.h
index a673714..e365f1d 100644
--- a/addressbook/libebook/e-vcard.h
+++ b/addressbook/libebook/e-vcard.h
@@ -97,6 +97,13 @@ G_BEGIN_DECLS
 #define EVC_X_SKYPE			"X-SKYPE"
 
 /**
+ * EVC_X_GOOGLE_TALK:
+ *
+ * Since: 3.2
+ **/
+#define EVC_X_GOOGLE_TALK		"X-GOOGLE_TALK"
+
+/**
  * EVC_X_SIP:
  *
  * Since: 2.26
diff --git a/addressbook/libedata-book/e-book-backend-sexp.c b/addressbook/libedata-book/e-book-backend-sexp.c
index 7e3fc0d..ea454dd 100644
--- a/addressbook/libedata-book/e-book-backend-sexp.c
+++ b/addressbook/libedata-book/e-book-backend-sexp.c
@@ -85,6 +85,13 @@ compare_im_skype (EContact *contact, const gchar *str,
 }
 
 static gboolean
+compare_im_google_talk (EContact *contact, const gchar *str,
+		gchar *(*compare)(const gchar *, const gchar *))
+{
+	return compare_im (contact, str, compare, E_CONTACT_IM_GOOGLE_TALK);
+}
+
+static gboolean
 compare_im_icq (EContact *contact, const gchar *str,
 		gchar *(*compare)(const gchar *, const gchar *))
 {
@@ -319,6 +326,7 @@ static struct prop_info {
 	LIST_PROP ( "im_aim",    compare_im_aim ),
 	LIST_PROP ( "im_msn",    compare_im_msn ),
 	LIST_PROP ( "im_skype",    compare_im_skype ),
+	LIST_PROP ( "im_google_talk",    compare_im_google_talk ),
 	LIST_PROP ( "im_icq",    compare_im_icq ),
 	LIST_PROP ( "im_jabber", compare_im_jabber ),
 	LIST_PROP ( "im_yahoo",  compare_im_yahoo ),
diff --git a/docs/reference/addressbook/libebook/libebook-sections.txt b/docs/reference/addressbook/libebook/libebook-sections.txt
index 0a7b912..ed17e39 100644
--- a/docs/reference/addressbook/libebook/libebook-sections.txt
+++ b/docs/reference/addressbook/libebook/libebook-sections.txt
@@ -382,6 +382,7 @@ EVC_X_MANAGER
 EVC_X_MSN
 EVC_X_RADIO
 EVC_X_SKYPE
+EVC_X_GOOGLE_TALK
 EVC_X_SIP
 EVC_X_SPOUSE
 EVC_X_TELEX
diff --git a/docs/reference/addressbook/libebook/tmpl/e-contact.sgml b/docs/reference/addressbook/libebook/tmpl/e-contact.sgml
index 5001717..ccdcb22 100644
--- a/docs/reference/addressbook/libebook/tmpl/e-contact.sgml
+++ b/docs/reference/addressbook/libebook/tmpl/e-contact.sgml
@@ -786,6 +786,13 @@ The URI of the contact's calendar.
 @E_CONTACT_IM_SKYPE_WORK_2: 
 @E_CONTACT_IM_SKYPE_WORK_3: 
 @E_CONTACT_IM_SKYPE: 
+ E_CONTACT_IM_GOOGLE_TALK_HOME_1: 
+ E_CONTACT_IM_GOOGLE_TALK_HOME_2: 
+ E_CONTACT_IM_GOOGLE_TALK_HOME_3: 
+ E_CONTACT_IM_GOOGLE_TALK_WORK_1: 
+ E_CONTACT_IM_GOOGLE_TALK_WORK_2: 
+ E_CONTACT_IM_GOOGLE_TALK_WORK_3: 
+ E_CONTACT_IM_GOOGLE_TALK: 
 @E_CONTACT_SIP: 
 @E_CONTACT_FIELD_LAST: 
 @E_CONTACT_FIELD_FIRST: 
diff --git a/docs/reference/addressbook/libebook/tmpl/e-vcard.sgml b/docs/reference/addressbook/libebook/tmpl/e-vcard.sgml
index a079f27..e862487 100644
--- a/docs/reference/addressbook/libebook/tmpl/e-vcard.sgml
+++ b/docs/reference/addressbook/libebook/tmpl/e-vcard.sgml
@@ -866,6 +866,13 @@ MSN ID
 
 
 
+<!-- ##### MACRO EVC_X_GOOGLE_TALK ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO EVC_X_SIP ##### -->
 <para>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]