- updated to 1.0.4
[packages/evolution-data-server.git] / evolution-data-server-GG-IM.patch
1 diff -urN evolution-data-server.orig/addressbook/backends/groupwise/e-book-backend-groupwise.c evolution-data-server/addressbook/backends/groupwise/e-book-backend-groupwise.c
2 --- evolution-data-server.orig/addressbook/backends/groupwise/e-book-backend-groupwise.c        2004-06-02 12:31:44.303464592 +0200
3 +++ evolution-data-server/addressbook/backends/groupwise/e-book-backend-groupwise.c     2004-06-02 12:49:41.386723048 +0200
4 @@ -123,6 +123,7 @@
5         GList *aim_list = NULL;
6         GList *icq_list = NULL;
7         GList *yahoo_list = NULL;
8 +       GList *gadugadu_list = NULL;
9         GList *msn_list = NULL;
10         GList *jabber_list = NULL;
11         GList *groupwise_list = NULL;
12 @@ -158,6 +159,10 @@
13                         im_field_id = E_CONTACT_IM_YAHOO;
14                         im_attr_list = &yahoo_list;
15                 }
16 +               else if (g_str_equal (address->service, "gadu-gadu")) {
17 +                       im_field_id = E_CONTACT_IM_GADUGADU;
18 +                       im_attr_list = &gadugadu_list;
19 +               }
20                 else if (g_str_equal (address->service, "jabber")) {
21                         im_field_id = E_CONTACT_IM_JABBER;
22                         im_attr_list = &jabber_list;
23 @@ -180,6 +185,7 @@
24         e_contact_set_attributes (contact, E_CONTACT_IM_JABBER, jabber_list);
25         e_contact_set_attributes (contact, E_CONTACT_IM_ICQ, icq_list);
26         e_contact_set_attributes (contact, E_CONTACT_IM_YAHOO, yahoo_list);
27 +       e_contact_set_attributes (contact, E_CONTACT_IM_GADUGADU, gadugadu_list);
28         e_contact_set_attributes (contact, E_CONTACT_IM_MSN, msn_list);
29         e_contact_set_attributes (contact, E_CONTACT_IM_GROUPWISE, groupwise_list);
30         
31 @@ -187,6 +193,7 @@
32         free_attr_list (jabber_list);
33         free_attr_list (icq_list);
34         free_attr_list (yahoo_list);
35 +       free_attr_list (gadugadu_list);
36         free_attr_list (msn_list);
37         free_attr_list (groupwise_list);
38  }
39 @@ -219,6 +226,7 @@
40    
41         append_ims_to_list (&im_list, contact, "aim", E_CONTACT_IM_AIM);
42         append_ims_to_list (&im_list, contact, "yahoo", E_CONTACT_IM_YAHOO);
43 +       append_ims_to_list (&im_list, contact, "gadu-gadu", E_CONTACT_IM_GADUGADU);
44         append_ims_to_list (&im_list, contact, "icq", E_CONTACT_IM_ICQ);
45         append_ims_to_list (&im_list, contact, "msn", E_CONTACT_IM_MSN);
46         append_ims_to_list (&im_list, contact, "jabber", E_CONTACT_IM_JABBER);
47 @@ -1968,6 +1976,7 @@
48         fields = g_list_append (fields, g_strdup (e_contact_field_name (E_CONTACT_EMAIL_3)));
49         fields = g_list_append (fields, g_strdup (e_contact_field_name (E_CONTACT_IM_ICQ)));
50         fields = g_list_append (fields, g_strdup (e_contact_field_name (E_CONTACT_IM_YAHOO)));
51 +       fields = g_list_append (fields, g_strdup (e_contact_field_name (E_CONTACT_IM_GADUGADU)));
52         fields = g_list_append (fields, g_strdup (e_contact_field_name (E_CONTACT_IM_MSN)));
53         fields = g_list_append (fields, g_strdup (e_contact_field_name (E_CONTACT_IM_JABBER)));
54         fields = g_list_append (fields, g_strdup (e_contact_field_name (E_CONTACT_IM_GROUPWISE)));
55 diff -urN evolution-data-server.orig/addressbook/libebook/e-contact.c evolution-data-server/addressbook/libebook/e-contact.c
56 --- evolution-data-server.orig/addressbook/libebook/e-contact.c 2004-06-02 12:31:44.883376432 +0200
57 +++ evolution-data-server/addressbook/libebook/e-contact.c      2004-06-02 12:41:36.416449736 +0200
58 @@ -155,6 +155,7 @@
59          MULTI_LIST_FIELD (E_CONTACT_IM_GROUPWISE, EVC_X_GROUPWISE, "im_groupwise", N_("Groupwise Id List"),       FALSE),
60         MULTI_LIST_FIELD (E_CONTACT_IM_JABBER,    EVC_X_JABBER,    "im_jabber",    N_("Jabber Id List"),          FALSE),
61         MULTI_LIST_FIELD (E_CONTACT_IM_YAHOO,     EVC_X_YAHOO,     "im_yahoo",     N_("Yahoo! Screen Name List"), FALSE),
62 +       MULTI_LIST_FIELD (E_CONTACT_IM_GADUGADU,  EVC_X_GADUGADU,  "im_gadugadu", N_("Gadu-Gadu Id List"), FALSE),
63         MULTI_LIST_FIELD (E_CONTACT_IM_MSN,       EVC_X_MSN,       "im_msn",       N_("MSN Screen Name List"),    FALSE),
64         MULTI_LIST_FIELD (E_CONTACT_IM_ICQ,       EVC_X_ICQ,       "im_icq",       N_("ICQ Id List"),             FALSE),
65   
66 @@ -182,6 +183,12 @@
67         ATTR_TYPE_STR_FIELD (E_CONTACT_IM_YAHOO_WORK_1,  EVC_X_YAHOO,  "im_yahoo_work_1",  N_("Yahoo! Work Screen Name 1"), FALSE, "WORK", 0),
68         ATTR_TYPE_STR_FIELD (E_CONTACT_IM_YAHOO_WORK_2,  EVC_X_YAHOO,  "im_yahoo_work_2",  N_("Yahoo! Work Screen Name 2"), FALSE, "WORK", 1),
69         ATTR_TYPE_STR_FIELD (E_CONTACT_IM_YAHOO_WORK_3,  EVC_X_YAHOO,  "im_yahoo_work_3",  N_("Yahoo! Work Screen Name 3"), FALSE, "WORK", 2),
70 +       ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GADUGADU_HOME_1,  EVC_X_GADUGADU,  "im_gadugadu_home_1",  N_("Gadu-Gadu Home Id 1"), FALSE, "HOME", 0),
71 +       ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GADUGADU_HOME_2,  EVC_X_GADUGADU,  "im_gadugadu_home_2",  N_("Gadu-Gadu Home Id 2"), FALSE, "HOME", 1),
72 +       ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GADUGADU_HOME_3,  EVC_X_GADUGADU,  "im_gadugadu_home_3",  N_("Gadu-Gadu Home Id 3"), FALSE, "HOME", 2),
73 +       ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GADUGADU_WORK_1,  EVC_X_GADUGADU,  "im_gadugadu_work_1",  N_("Gadu-Gadu Work Id 1"), FALSE, "WORK", 0),
74 +       ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GADUGADU_WORK_2,  EVC_X_GADUGADU,  "im_gadugadu_work_2",  N_("Gadu-Gadu Work Id 2"), FALSE, "WORK", 1),
75 +       ATTR_TYPE_STR_FIELD (E_CONTACT_IM_GADUGADU_WORK_3,  EVC_X_GADUGADU,  "im_gadugadu_work_3",  N_("Gadu-Gadu Work Id 3"), FALSE, "WORK", 2),
76         ATTR_TYPE_STR_FIELD (E_CONTACT_IM_MSN_HOME_1,    EVC_X_MSN,    "im_msn_home_1",    N_("MSN Home Screen Name 1"),    FALSE, "HOME", 0),
77         ATTR_TYPE_STR_FIELD (E_CONTACT_IM_MSN_HOME_2,    EVC_X_MSN,    "im_msn_home_2",    N_("MSN Home Screen Name 2"),    FALSE, "HOME", 1),
78         ATTR_TYPE_STR_FIELD (E_CONTACT_IM_MSN_HOME_3,    EVC_X_MSN,    "im_msn_home_3",    N_("MSN Home Screen Name 3"),    FALSE, "HOME", 2),
79 diff -urN evolution-data-server.orig/addressbook/libebook/e-contact.h evolution-data-server/addressbook/libebook/e-contact.h
80 --- evolution-data-server.orig/addressbook/libebook/e-contact.h 2004-06-02 12:31:44.883376432 +0200
81 +++ evolution-data-server/addressbook/libebook/e-contact.h      2004-06-02 12:44:07.738445296 +0200
82 @@ -128,6 +128,12 @@
83         E_CONTACT_IM_YAHOO_WORK_1,     /* Synthetic string field */
84         E_CONTACT_IM_YAHOO_WORK_2,     /* Synthetic string field */
85         E_CONTACT_IM_YAHOO_WORK_3,     /* Synthetic string field */
86 +       E_CONTACT_IM_GADUGADU_HOME_1,  /* Synthetic string field */
87 +       E_CONTACT_IM_GADUGADU_HOME_2,  /* Synthetic string field */
88 +       E_CONTACT_IM_GADUGADU_HOME_3,  /* Synthetic string field */
89 +       E_CONTACT_IM_GADUGADU_WORK_1,  /* Synthetic string field */
90 +       E_CONTACT_IM_GADUGADU_WORK_2,  /* Synthetic string field */
91 +       E_CONTACT_IM_GADUGADU_WORK_3,  /* Synthetic string field */
92         E_CONTACT_IM_MSN_HOME_1,       /* Synthetic string field */
93         E_CONTACT_IM_MSN_HOME_2,       /* Synthetic string field */
94         E_CONTACT_IM_MSN_HOME_3,       /* Synthetic string field */
95 @@ -166,6 +172,7 @@
96         E_CONTACT_IM_GROUPWISE,  /* Multi-valued */
97         E_CONTACT_IM_JABBER,     /* Multi-valued */
98         E_CONTACT_IM_YAHOO,      /* Multi-valued */
99 +       E_CONTACT_IM_GADUGADU,   /* Multi-valued */
100         E_CONTACT_IM_MSN,        /* Multi-valued */
101         E_CONTACT_IM_ICQ,        /* Multi-valued */
102         
103 diff -urN evolution-data-server.orig/addressbook/libebook/e-vcard.h evolution-data-server/addressbook/libebook/e-vcard.h
104 --- evolution-data-server.orig/addressbook/libebook/e-vcard.h   2004-06-02 12:31:45.544275960 +0200
105 +++ evolution-data-server/addressbook/libebook/e-vcard.h        2004-06-02 12:45:00.322451312 +0200
106 @@ -85,6 +85,7 @@
107  #define EVC_X_VIDEO_URL        "X-EVOLUTION-VIDEO-URL"
108  #define EVC_X_WANTS_HTML       "X-MOZILLA-HTML"
109  #define EVC_X_YAHOO            "X-YAHOO"
110 +#define EVC_X_GADUGADU         "X-GADUGADU"
111  #define EVC_X_GROUPWISE        "X-GROUPWISE"
112  
113  typedef enum {
114 diff -urN evolution-data-server.orig/addressbook/libedata-book/e-book-backend-sexp.c evolution-data-server/addressbook/libedata-book/e-book-backend-sexp.c
115 --- evolution-data-server.orig/addressbook/libedata-book/e-book-backend-sexp.c  2004-06-02 12:31:45.546275656 +0200
116 +++ evolution-data-server/addressbook/libedata-book/e-book-backend-sexp.c       2004-06-02 12:34:22.944347512 +0200
117 @@ -89,6 +89,13 @@
118  }
119  
120  static gboolean
121 +compare_im_gadugadu (EContact *contact, const char *str,
122 +                 char *(*compare)(const char*, const char*))
123 +{
124 +       return compare_im (contact, str, compare, E_CONTACT_IM_GADUGADU);
125 +}
126 +
127 +static gboolean
128  compare_im_jabber (EContact *contact, const char *str,
129                    char *(*compare)(const char*, const char*))
130  {
131 @@ -221,6 +228,7 @@
132         LIST_PROP ( "im_icq",    compare_im_icq ),
133         LIST_PROP ( "im_jabber", compare_im_jabber ),
134         LIST_PROP ( "im_yahoo",  compare_im_yahoo ),
135 +       LIST_PROP ( "im_gadugadu",  compare_im_gadugadu ),
136         LIST_PROP ( "email",     compare_email ),
137         LIST_PROP ( "phone",     compare_phone ),
138         LIST_PROP ( "address",   compare_address ),
This page took 0.079024 seconds and 3 git commands to generate.