[packages/pidgin.git] / gaim-GG-evo.patch

diff -urN gaim-0.78.orig/plugins/gevolution/add_buddy_dialog.c gaim-0.78/plugins/gevolution/add_buddy_dialog.c
--- gaim-0.78.orig/plugins/gevolution/add_buddy_dialog.c	2004-06-02 14:21:12.152999696 +0200
+++ gaim-0.78/plugins/gevolution/add_buddy_dialog.c	2004-06-02 14:35:31.623340344 +0200
@@ -334,18 +334,19 @@
 	{
 		EContact *contact = E_CONTACT(c->data);
 		const char *name;
-		GList *aims, *jabbers, *yahoos, *msns, *icqs;
+		GList *aims, *jabbers, *yahoos, *gadugadus, *msns, *icqs;
 
 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
 
-		aims    = e_contact_get(contact, E_CONTACT_IM_AIM);
-		jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
-		yahoos  = e_contact_get(contact, E_CONTACT_IM_YAHOO);
-		msns    = e_contact_get(contact, E_CONTACT_IM_MSN);
-		icqs    = e_contact_get(contact, E_CONTACT_IM_ICQ);
+		aims       = e_contact_get(contact, E_CONTACT_IM_AIM);
+		jabbers    = e_contact_get(contact, E_CONTACT_IM_JABBER);
+		yahoos     = e_contact_get(contact, E_CONTACT_IM_YAHOO);
+		gadugadus  = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
+		msns       = e_contact_get(contact, E_CONTACT_IM_MSN);
+		icqs       = e_contact_get(contact, E_CONTACT_IM_ICQ);
 
 		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
-			msns == NULL && icqs == NULL)
+			msns == NULL && icqs == NULL && gadugadus == NULL)
 		{
 			GtkTreeIter iter;
 
@@ -358,11 +359,12 @@
 		}
 		else
 		{
-			add_ims(dialog, contact, name, aims,    "prpl-oscar");
-			add_ims(dialog, contact, name, jabbers, "prpl-jabber");
-			add_ims(dialog, contact, name, yahoos,  "prpl-yahoo");
-			add_ims(dialog, contact, name, msns,    "prpl-msn");
-			add_ims(dialog, contact, name, icqs,    "prpl-oscar");
+			add_ims(dialog, contact, name, aims,       "prpl-oscar");
+			add_ims(dialog, contact, name, jabbers,    "prpl-jabber");
+			add_ims(dialog, contact, name, yahoos,     "prpl-yahoo");
+			add_ims(dialog, contact, name, gadugadus,  "prpl-gg");
+			add_ims(dialog, contact, name, msns,       "prpl-msn");
+			add_ims(dialog, contact, name, icqs,       "prpl-oscar");
 		}
 	}
 
@@ -388,7 +390,7 @@
 	{
 		EContact *contact = E_CONTACT(l->data);
 		const char *name;
-		GList *aims, *jabbers, *yahoos, *msns, *icqs;
+		GList *aims, *jabbers, *yahoos, *gadugadus, *msns, *icqs;
 
 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
 
@@ -398,14 +400,15 @@
 			continue;
 		}
 
-		aims    = e_contact_get(contact, E_CONTACT_IM_AIM);
-		jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
-		yahoos  = e_contact_get(contact, E_CONTACT_IM_YAHOO);
-		msns    = e_contact_get(contact, E_CONTACT_IM_MSN);
-		icqs    = e_contact_get(contact, E_CONTACT_IM_ICQ);
+		aims        = e_contact_get(contact, E_CONTACT_IM_AIM);
+		jabbers     = e_contact_get(contact, E_CONTACT_IM_JABBER);
+		yahoos      = e_contact_get(contact, E_CONTACT_IM_YAHOO);
+		gadugadus   = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
+		msns        = e_contact_get(contact, E_CONTACT_IM_MSN);
+		icqs        = e_contact_get(contact, E_CONTACT_IM_ICQ);
 
 		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
-			msns == NULL && icqs == NULL)
+			msns == NULL && icqs == NULL && gadugadus == NULL)
 		{
 			GtkTreeIter iter;
 
@@ -418,11 +421,12 @@
 		}
 		else
 		{
-			add_ims(dialog, contact, name, aims,    "prpl-oscar");
-			add_ims(dialog, contact, name, jabbers, "prpl-jabber");
-			add_ims(dialog, contact, name, yahoos,  "prpl-yahoo");
-			add_ims(dialog, contact, name, msns,    "prpl-msn");
-			add_ims(dialog, contact, name, icqs,    "prpl-oscar");
+			add_ims(dialog, contact, name, aims,       "prpl-oscar");
+			add_ims(dialog, contact, name, jabbers,    "prpl-jabber");
+			add_ims(dialog, contact, name, yahoos,     "prpl-yahoo");
+			add_ims(dialog, contact, name, gadugadus,  "prpl-gg");
+			add_ims(dialog, contact, name, msns,       "prpl-msn");
+			add_ims(dialog, contact, name, icqs,       "prpl-oscar");
 		}
 	}
 }
diff -urN gaim-0.78.orig/plugins/gevolution/gevolution.c gaim-0.78/plugins/gevolution/gevolution.c
--- gaim-0.78.orig/plugins/gevolution/gevolution.c	2004-06-02 14:21:12.153999544 +0200
+++ gaim-0.78/plugins/gevolution/gevolution.c	2004-06-02 14:37:47.552675944 +0200
@@ -102,11 +102,12 @@
 
 	name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
 
-	update_ims_from_contact(contact, name, "prpl-oscar",  E_CONTACT_IM_AIM);
-	update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER);
-	update_ims_from_contact(contact, name, "prpl-yahoo",  E_CONTACT_IM_YAHOO);
-	update_ims_from_contact(contact, name, "prpl-msn",    E_CONTACT_IM_MSN);
-	update_ims_from_contact(contact, name, "prpl-oscar",  E_CONTACT_IM_ICQ);
+	update_ims_from_contact(contact, name, "prpl-oscar",  E_CONTACT_IM_AIM);
+	update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER);
+	update_ims_from_contact(contact, name, "prpl-yahoo",  E_CONTACT_IM_YAHOO);
+	update_ims_from_contact(contact, name, "prpl-gg",     E_CONTACT_IM_GADUGADU);
+	update_ims_from_contact(contact, name, "prpl-msn",    E_CONTACT_IM_MSN);
+	update_ims_from_contact(contact, name, "prpl-oscar",  E_CONTACT_IM_ICQ);
 }
 
 static void
diff -urN gaim-0.78.orig/plugins/gevolution/gevo-util.c gaim-0.78/plugins/gevolution/gevo-util.c
--- gaim-0.78.orig/plugins/gevolution/gevo-util.c	2004-06-02 14:21:12.171996808 +0200
+++ gaim-0.78/plugins/gevolution/gevo-util.c	2004-06-02 14:36:36.564467792 +0200
@@ -116,6 +116,8 @@
 		protocol_field = E_CONTACT_IM_MSN;
 	else if (!strcmp(protocol_id, "prpl-yahoo"))
 		protocol_field = E_CONTACT_IM_YAHOO;
+	else if (!strcmp(protocol_id, "prpl-gg"))
+		protocol_field = E_CONTACT_IM_GADUGADU;
 	else if (!strcmp(protocol_id, "prpl-jabber"))
 		protocol_field = E_CONTACT_IM_JABBER;
 
diff -urN gaim-0.78.orig/plugins/gevolution/new_person_dialog.c gaim-0.78/plugins/gevolution/new_person_dialog.c
--- gaim-0.78.orig/plugins/gevolution/new_person_dialog.c	2004-06-02 14:21:12.171996808 +0200
+++ gaim-0.78/plugins/gevolution/new_person_dialog.c	2004-06-02 14:38:35.239426456 +0200
@@ -160,6 +160,8 @@
 		}
 		else if (!strcmp(im_service, "prpl-yahoo"))
 			field = E_CONTACT_IM_YAHOO;
+		else if (!strcmp(im_service, "prpl-gg"))
+			field = E_CONTACT_IM_GADUGADU;
 		else if (!strcmp(im_service, "prpl-jabber"))
 			field = E_CONTACT_IM_JABBER;
 		else if (!strcmp(im_service, "prpl-msn"))
diff -urN gaim-0.78.orig/src/gtkblist.c gaim-0.78/src/gtkblist.c
--- gaim-0.78.orig/src/gtkblist.c	2004-06-02 14:21:13.721761208 +0200
+++ gaim-0.78/src/gtkblist.c	2004-06-02 14:26:49.642693464 +0200
@@ -1539,12 +1539,13 @@
 {
 	char *temp_vcard;
 	char *s, *c;
-	char *alias    = NULL;
-	GList *aims    = NULL;
-	GList *icqs    = NULL;
-	GList *yahoos  = NULL;
-	GList *msns    = NULL;
-	GList *jabbers = NULL;
+	char *alias    	  = NULL;
+	GList *aims       = NULL;
+	GList *icqs       = NULL;
+	GList *yahoos     = NULL;
+	GList *gadugadus  = NULL;
+	GList *msns    	  = NULL;
+	GList *jabbers 	  = NULL;
 
 	s = temp_vcard = g_strdup(vcard);
 
@@ -1584,7 +1585,7 @@
 			alias = g_strdup(value);
 		else if (!strcmp(field, "X-AIM") || !strcmp(field, "X-ICQ") ||
 				 !strcmp(field, "X-YAHOO") || !strcmp(field, "X-MSN") ||
-				 !strcmp(field, "X-JABBER"))
+				 !strcmp(field, "X-JABBER") || !strcmp(field, "X-GADUGADU"))
 		{
 			char **values = g_strsplit(value, ":", 0);
 			char **im;
@@ -1597,6 +1598,8 @@
 					icqs = g_list_append(icqs, g_strdup(*im));
 				else if (!strcmp(field, "X-YAHOO"))
 					yahoos = g_list_append(yahoos, g_strdup(*im));
+				else if (!strcmp(field, "X-GADUGADU"))
+					gadugadus = g_list_append(gadugadus, g_strdup(*im));	
 				else if (!strcmp(field, "X-MSN"))
 					msns = g_list_append(msns, g_strdup(*im));
 				else if (!strcmp(field, "X-JABBER"))
@@ -1610,7 +1613,7 @@
 	g_free(temp_vcard);
 
 	if (aims == NULL && icqs == NULL && yahoos == NULL &&
-		msns == NULL && jabbers == NULL)
+		msns == NULL && jabbers == NULL && gadugadus == NULL)
 	{
 		if (alias != NULL)
 			g_free(alias);
@@ -1618,11 +1621,12 @@
 		return FALSE;
 	}
 
-	add_buddies_from_vcard("prpl-oscar",  group, aims,    alias);
-	add_buddies_from_vcard("prpl-oscar",  group, icqs,    alias);
-	add_buddies_from_vcard("prpl-yahoo",  group, yahoos,  alias);
-	add_buddies_from_vcard("prpl-msn",    group, msns,    alias);
-	add_buddies_from_vcard("prpl-jabber", group, jabbers, alias);
+	add_buddies_from_vcard("prpl-oscar",  group, aims,      alias);
+	add_buddies_from_vcard("prpl-oscar",  group, icqs,      alias);
+	add_buddies_from_vcard("prpl-yahoo",  group, yahoos,    alias);
+	add_buddies_from_vcard("prpl-gg",     group, gadugadus, alias);
+	add_buddies_from_vcard("prpl-msn",    group, msns,      alias);
+	add_buddies_from_vcard("prpl-jabber", group, jabbers,   alias);
 
 	if (alias != NULL)
 		g_free(alias);
Commit	Line	Data
25dd343f	1	diff -urN gaim-0.78.orig/plugins/gevolution/add_buddy_dialog.c gaim-0.78/plugins/gevolution/add_buddy_dialog.c
	2	--- gaim-0.78.orig/plugins/gevolution/add_buddy_dialog.c 2004-06-02 14:21:12.152999696 +0200
	3	+++ gaim-0.78/plugins/gevolution/add_buddy_dialog.c 2004-06-02 14:35:31.623340344 +0200
	4	@@ -334,18 +334,19 @@
f7957216	5	{
	6	EContact *contact = E_CONTACT(c->data);
	7	const char *name;
25dd343f	8	- GList aims, jabbers, yahoos, msns, *icqs;
25dd343f	9	+ GList aims, jabbers, yahoos, gadugadus, msns, icqs;
f7957216	10
	11	name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
	12
	13	- aims = e_contact_get(contact, E_CONTACT_IM_AIM);
	14	- jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
	15	- yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
	16	- msns = e_contact_get(contact, E_CONTACT_IM_MSN);
	17	- icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
25dd343f	18	+ aims = e_contact_get(contact, E_CONTACT_IM_AIM);
	19	+ jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
	20	+ yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
	21	+ gadugadus = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
	22	+ msns = e_contact_get(contact, E_CONTACT_IM_MSN);
	23	+ icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
f7957216	24
f7957216	25	if (aims == NULL && jabbers == NULL && yahoos == NULL &&
25dd343f	26	- msns == NULL && icqs == NULL)
	27	+ msns == NULL && icqs == NULL && gadugadus == NULL)
	28	{
	29	GtkTreeIter iter;
	30
	31	@@ -358,11 +359,12 @@
	32	}
	33	else
	34	{
	35	- add_ims(dialog, contact, name, aims, "prpl-oscar");
	36	- add_ims(dialog, contact, name, jabbers, "prpl-jabber");
	37	- add_ims(dialog, contact, name, yahoos, "prpl-yahoo");
	38	- add_ims(dialog, contact, name, msns, "prpl-msn");
	39	- add_ims(dialog, contact, name, icqs, "prpl-oscar");
	40	+ add_ims(dialog, contact, name, aims, "prpl-oscar");
	41	+ add_ims(dialog, contact, name, jabbers, "prpl-jabber");
	42	+ add_ims(dialog, contact, name, yahoos, "prpl-yahoo");
f7957216	43	+ add_ims(dialog, contact, name, gadugadus, "prpl-gg");
25dd343f	44	+ add_ims(dialog, contact, name, msns, "prpl-msn");
	45	+ add_ims(dialog, contact, name, icqs, "prpl-oscar");
	46	}
	47	}
	48
	49	@@ -388,7 +390,7 @@
f7957216	50	{
	51	EContact *contact = E_CONTACT(l->data);
	52	const char *name;
25dd343f	53	- GList aims, jabbers, yahoos, msns, *icqs;
25dd343f	54	+ GList aims, jabbers, yahoos, gadugadus, msns, icqs;
f7957216	55
	56	name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
	57
25dd343f	58	@@ -398,14 +400,15 @@
f7957216	59	continue;
	60	}
	61
	62	- aims = e_contact_get(contact, E_CONTACT_IM_AIM);
	63	- jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
	64	- yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
	65	- msns = e_contact_get(contact, E_CONTACT_IM_MSN);
	66	- icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
25dd343f	67	+ aims = e_contact_get(contact, E_CONTACT_IM_AIM);
	68	+ jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
	69	+ yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
	70	+ gadugadus = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
	71	+ msns = e_contact_get(contact, E_CONTACT_IM_MSN);
	72	+ icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
f7957216	73
f7957216	74	if (aims == NULL && jabbers == NULL && yahoos == NULL &&
25dd343f	75	- msns == NULL && icqs == NULL)
	76	+ msns == NULL && icqs == NULL && gadugadus == NULL)
	77	{
	78	GtkTreeIter iter;
	79
	80	@@ -418,11 +421,12 @@
	81	}
	82	else
	83	{
	84	- add_ims(dialog, contact, name, aims, "prpl-oscar");
	85	- add_ims(dialog, contact, name, jabbers, "prpl-jabber");
	86	- add_ims(dialog, contact, name, yahoos, "prpl-yahoo");
	87	- add_ims(dialog, contact, name, msns, "prpl-msn");
	88	- add_ims(dialog, contact, name, icqs, "prpl-oscar");
	89	+ add_ims(dialog, contact, name, aims, "prpl-oscar");
	90	+ add_ims(dialog, contact, name, jabbers, "prpl-jabber");
	91	+ add_ims(dialog, contact, name, yahoos, "prpl-yahoo");
f7957216	92	+ add_ims(dialog, contact, name, gadugadus, "prpl-gg");
25dd343f	93	+ add_ims(dialog, contact, name, msns, "prpl-msn");
	94	+ add_ims(dialog, contact, name, icqs, "prpl-oscar");
	95	}
	96	}
	97	}
	98	diff -urN gaim-0.78.orig/plugins/gevolution/gevolution.c gaim-0.78/plugins/gevolution/gevolution.c
	99	--- gaim-0.78.orig/plugins/gevolution/gevolution.c 2004-06-02 14:21:12.153999544 +0200
	100	+++ gaim-0.78/plugins/gevolution/gevolution.c 2004-06-02 14:37:47.552675944 +0200
	101	@@ -102,11 +102,12 @@
	102
	103	name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
	104
	105	- update_ims_from_contact(contact, name, "prpl-oscar", E_CONTACT_IM_AIM);
	106	- update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER);
	107	- update_ims_from_contact(contact, name, "prpl-yahoo", E_CONTACT_IM_YAHOO);
	108	- update_ims_from_contact(contact, name, "prpl-msn", E_CONTACT_IM_MSN);
	109	- update_ims_from_contact(contact, name, "prpl-oscar", E_CONTACT_IM_ICQ);
	110	+ update_ims_from_contact(contact, name, "prpl-oscar", E_CONTACT_IM_AIM);
	111	+ update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER);
	112	+ update_ims_from_contact(contact, name, "prpl-yahoo", E_CONTACT_IM_YAHOO);
f7957216	113	+ update_ims_from_contact(contact, name, "prpl-gg", E_CONTACT_IM_GADUGADU);
25dd343f	114	+ update_ims_from_contact(contact, name, "prpl-msn", E_CONTACT_IM_MSN);
	115	+ update_ims_from_contact(contact, name, "prpl-oscar", E_CONTACT_IM_ICQ);
	116	}
	117
	118	static void
	119	diff -urN gaim-0.78.orig/plugins/gevolution/gevo-util.c gaim-0.78/plugins/gevolution/gevo-util.c
	120	--- gaim-0.78.orig/plugins/gevolution/gevo-util.c 2004-06-02 14:21:12.171996808 +0200
	121	+++ gaim-0.78/plugins/gevolution/gevo-util.c 2004-06-02 14:36:36.564467792 +0200
	122	@@ -116,6 +116,8 @@
f7957216	123	protocol_field = E_CONTACT_IM_MSN;
	124	else if (!strcmp(protocol_id, "prpl-yahoo"))
	125	protocol_field = E_CONTACT_IM_YAHOO;
	126	+ else if (!strcmp(protocol_id, "prpl-gg"))
	127	+ protocol_field = E_CONTACT_IM_GADUGADU;
	128	else if (!strcmp(protocol_id, "prpl-jabber"))
	129	protocol_field = E_CONTACT_IM_JABBER;
25dd343f	130
	131	diff -urN gaim-0.78.orig/plugins/gevolution/new_person_dialog.c gaim-0.78/plugins/gevolution/new_person_dialog.c
	132	--- gaim-0.78.orig/plugins/gevolution/new_person_dialog.c 2004-06-02 14:21:12.171996808 +0200
	133	+++ gaim-0.78/plugins/gevolution/new_person_dialog.c 2004-06-02 14:38:35.239426456 +0200
	134	@@ -160,6 +160,8 @@
f7957216	135	}
	136	else if (!strcmp(im_service, "prpl-yahoo"))
	137	field = E_CONTACT_IM_YAHOO;
	138	+ else if (!strcmp(im_service, "prpl-gg"))
	139	+ field = E_CONTACT_IM_GADUGADU;
	140	else if (!strcmp(im_service, "prpl-jabber"))
	141	field = E_CONTACT_IM_JABBER;
	142	else if (!strcmp(im_service, "prpl-msn"))
25dd343f	143	diff -urN gaim-0.78.orig/src/gtkblist.c gaim-0.78/src/gtkblist.c
	144	--- gaim-0.78.orig/src/gtkblist.c 2004-06-02 14:21:13.721761208 +0200
	145	+++ gaim-0.78/src/gtkblist.c 2004-06-02 14:26:49.642693464 +0200
	146	@@ -1539,12 +1539,13 @@
f7957216	147	{
	148	char *temp_vcard;
	149	char s, c;
	150	- char *alias = NULL;
	151	- GList *aims = NULL;
	152	- GList *icqs = NULL;
	153	- GList *yahoos = NULL;
	154	- GList *msns = NULL;
	155	- GList *jabbers = NULL;
25dd343f	156	+ char *alias = NULL;
	157	+ GList *aims = NULL;
	158	+ GList *icqs = NULL;
	159	+ GList *yahoos = NULL;
	160	+ GList *gadugadus = NULL;
	161	+ GList *msns = NULL;
	162	+ GList *jabbers = NULL;
f7957216	163
	164	s = temp_vcard = g_strdup(vcard);
	165
25dd343f	166	@@ -1584,7 +1585,7 @@
f7957216	167	alias = g_strdup(value);
	168	else if (!strcmp(field, "X-AIM") \|\| !strcmp(field, "X-ICQ") \|\|
	169	!strcmp(field, "X-YAHOO") \|\| !strcmp(field, "X-MSN") \|\|
	170	- !strcmp(field, "X-JABBER"))
	171	+ !strcmp(field, "X-JABBER") \|\| !strcmp(field, "X-GADUGADU"))
	172	{
	173	char **values = g_strsplit(value, ":", 0);
	174	char **im;
25dd343f	175	@@ -1597,6 +1598,8 @@
f7957216	176	icqs = g_list_append(icqs, g_strdup(*im));
	177	else if (!strcmp(field, "X-YAHOO"))
	178	yahoos = g_list_append(yahoos, g_strdup(*im));
	179	+ else if (!strcmp(field, "X-GADUGADU"))
25dd343f	180	+ gadugadus = g_list_append(gadugadus, g_strdup(*im));
f7957216	181	else if (!strcmp(field, "X-MSN"))
	182	msns = g_list_append(msns, g_strdup(*im));
	183	else if (!strcmp(field, "X-JABBER"))
25dd343f	184	@@ -1610,7 +1613,7 @@
f7957216	185	g_free(temp_vcard);
	186
	187	if (aims == NULL && icqs == NULL && yahoos == NULL &&
	188	- msns == NULL && jabbers == NULL)
	189	+ msns == NULL && jabbers == NULL && gadugadus == NULL)
	190	{
	191	if (alias != NULL)
	192	g_free(alias);
25dd343f	193	@@ -1618,11 +1621,12 @@
f7957216	194	return FALSE;
	195	}
	196
	197	- add_buddies_from_vcard("prpl-oscar", group, aims, alias);
	198	- add_buddies_from_vcard("prpl-oscar", group, icqs, alias);
	199	- add_buddies_from_vcard("prpl-yahoo", group, yahoos, alias);
	200	- add_buddies_from_vcard("prpl-msn", group, msns, alias);
	201	- add_buddies_from_vcard("prpl-jabber", group, jabbers, alias);
	202	+ add_buddies_from_vcard("prpl-oscar", group, aims, alias);
	203	+ add_buddies_from_vcard("prpl-oscar", group, icqs, alias);
	204	+ add_buddies_from_vcard("prpl-yahoo", group, yahoos, alias);
	205	+ add_buddies_from_vcard("prpl-gg", group, gadugadus, alias);
	206	+ add_buddies_from_vcard("prpl-msn", group, msns, alias);
	207	+ add_buddies_from_vcard("prpl-jabber", group, jabbers, alias);
	208
	209	if (alias != NULL)
	210	g_free(alias);