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

diff -aurN gaim-2.0.0.orig/gtk/plugins/gevolution/add_buddy_dialog.c gaim-2.0.0/gtk/plugins/gevolution/add_buddy_dialog.c
--- gaim-2.0.0.orig/gtk/plugins/gevolution/add_buddy_dialog.c	2005-07-03 08:42:16.000000000 +0200
+++ gaim-2.0.0/gtk/plugins/gevolution/add_buddy_dialog.c	2005-08-02 22:01:50.000000000 +0200
@@ -291,16 +291,17 @@
 	{
 		EContact *contact = E_CONTACT(c->data);
 		const char *name;
-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells;
+		GList *aims, *jabbers, *yahoos, *gadugadus, *msns, *icqs, *novells;
 
 		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);
-		novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+		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);
+		novells		= e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
 
 		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
 			msns == NULL && icqs == NULL && novells == NULL)
@@ -319,6 +320,7 @@
 			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");
 			add_ims(dialog, contact, name, novells, "prpl-novell");
@@ -363,7 +365,7 @@
 	{
 		EContact *contact = E_CONTACT(l->data);
 		const char *name;
-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells;
+		GList *aims, *jabbers, *yahoos, *gadugadus, *msns, *icqs, *novells;
 
 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
 
@@ -373,12 +375,13 @@
 			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);
-		novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+		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);
+		novells		= e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
 
 		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
 			msns == NULL && icqs == NULL && novells == NULL)
@@ -397,6 +400,7 @@
 			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");
 			add_ims(dialog, contact, name, novells, "prpl-novell");
diff -aurN gaim-2.0.0.orig/gtk/plugins/gevolution/gevolution.c gaim-2.0.0/gtk/plugins/gevolution/gevolution.c
--- gaim-2.0.0.orig/gtk/plugins/gevolution/gevolution.c	2005-07-18 09:26:08.000000000 +0200
+++ gaim-2.0.0/gtk/plugins/gevolution/gevolution.c	2005-08-02 22:02:54.000000000 +0200
@@ -112,6 +112,7 @@
 	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);
 	update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE);
diff -aurN gaim-2.0.0.orig/gtk/plugins/gevolution/gevo-util.c gaim-2.0.0/gtk/plugins/gevolution/gevo-util.c
--- gaim-2.0.0.orig/gtk/plugins/gevolution/gevo-util.c	2005-07-03 08:42:16.000000000 +0200
+++ gaim-2.0.0/gtk/plugins/gevolution/gevo-util.c	2005-08-02 22:03:43.000000000 +0200
@@ -110,6 +110,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;
 	else if (!strcmp(protocol_id, "prpl-novell"))
diff -aurN gaim-2.0.0.orig/gtk/plugins/gevolution/new_person_dialog.c gaim-2.0.0/gtk/plugins/gevolution/new_person_dialog.c
--- gaim-2.0.0.orig/gtk/plugins/gevolution/new_person_dialog.c	2005-07-03 08:42:16.000000000 +0200
+++ gaim-2.0.0/gtk/plugins/gevolution/new_person_dialog.c	2005-08-02 22:04:18.000000000 +0200
@@ -150,6 +150,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 -aurN gaim-2.0.0.orig/gtk/gtkblist.c gaim-2.0.0/gtk/gtkblist.c
--- gaim-2.0.0.orig/gtk/gtkblist.c	2005-07-21 07:49:42.000000000 +0200
+++ gaim-2.0.0/gtk/gtkblist.c	2005-08-02 22:09:51.000000000 +0200
@@ -1702,12 +1702,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);
 
@@ -1747,7 +1748,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;
@@ -1760,6 +1761,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"))
@@ -1773,7 +1776,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);
@@ -1781,11 +1784,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
be9750be	1	diff -aurN gaim-2.0.0.orig/gtk/plugins/gevolution/add_buddy_dialog.c gaim-2.0.0/gtk/plugins/gevolution/add_buddy_dialog.c
	2	--- gaim-2.0.0.orig/gtk/plugins/gevolution/add_buddy_dialog.c 2005-07-03 08:42:16.000000000 +0200
	3	+++ gaim-2.0.0/gtk/plugins/gevolution/add_buddy_dialog.c 2005-08-02 22:01:50.000000000 +0200
	4	@@ -291,16 +291,17 @@
f7957216	5	{
	6	EContact *contact = E_CONTACT(c->data);
	7	const char *name;
be9750be	8	- GList aims, jabbers, yahoos, msns, icqs, novells;
be9750be	9	+ GList aims, jabbers, yahoos, gadugadus, msns, icqs, *novells;
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);
be9750be	18	- novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
	19	+ aims = e_contact_get(contact, E_CONTACT_IM_AIM);
	20	+ jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
	21	+ yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
	22	+ gadugadus = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
	23	+ msns = e_contact_get(contact, E_CONTACT_IM_MSN);
	24	+ icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
	25	+ novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
f7957216	26
f7957216	27	if (aims == NULL && jabbers == NULL && yahoos == NULL &&
be9750be	28	msns == NULL && icqs == NULL && novells == NULL)
	29	@@ -319,6 +320,7 @@
	30	add_ims(dialog, contact, name, aims, "prpl-oscar");
	31	add_ims(dialog, contact, name, jabbers, "prpl-jabber");
	32	add_ims(dialog, contact, name, yahoos, "prpl-yahoo");
f7957216	33	+ add_ims(dialog, contact, name, gadugadus, "prpl-gg");
be9750be	34	add_ims(dialog, contact, name, msns, "prpl-msn");
	35	add_ims(dialog, contact, name, icqs, "prpl-oscar");
	36	add_ims(dialog, contact, name, novells, "prpl-novell");
	37	@@ -363,7 +365,7 @@
f7957216	38	{
	39	EContact *contact = E_CONTACT(l->data);
	40	const char *name;
be9750be	41	- GList aims, jabbers, yahoos, msns, icqs, novells;
be9750be	42	+ GList aims, jabbers, yahoos, gadugadus, msns, icqs, *novells;
f7957216	43
	44	name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
	45
be9750be	46	@@ -373,12 +375,13 @@
f7957216	47	continue;
	48	}
	49
	50	- aims = e_contact_get(contact, E_CONTACT_IM_AIM);
	51	- jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
	52	- yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
	53	- msns = e_contact_get(contact, E_CONTACT_IM_MSN);
	54	- icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
be9750be	55	- novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
	56	+ aims = e_contact_get(contact, E_CONTACT_IM_AIM);
	57	+ jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
	58	+ yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
	59	+ gadugadus = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
	60	+ msns = e_contact_get(contact, E_CONTACT_IM_MSN);
	61	+ icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
	62	+ novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
f7957216	63
f7957216	64	if (aims == NULL && jabbers == NULL && yahoos == NULL &&
be9750be	65	msns == NULL && icqs == NULL && novells == NULL)
	66	@@ -397,6 +400,7 @@
	67	add_ims(dialog, contact, name, aims, "prpl-oscar");
	68	add_ims(dialog, contact, name, jabbers, "prpl-jabber");
	69	add_ims(dialog, contact, name, yahoos, "prpl-yahoo");
f7957216	70	+ add_ims(dialog, contact, name, gadugadus, "prpl-gg");
be9750be	71	add_ims(dialog, contact, name, msns, "prpl-msn");
	72	add_ims(dialog, contact, name, icqs, "prpl-oscar");
	73	add_ims(dialog, contact, name, novells, "prpl-novell");
	74	diff -aurN gaim-2.0.0.orig/gtk/plugins/gevolution/gevolution.c gaim-2.0.0/gtk/plugins/gevolution/gevolution.c
	75	--- gaim-2.0.0.orig/gtk/plugins/gevolution/gevolution.c 2005-07-18 09:26:08.000000000 +0200
	76	+++ gaim-2.0.0/gtk/plugins/gevolution/gevolution.c 2005-08-02 22:02:54.000000000 +0200
	77	@@ -112,6 +112,7 @@
	78	update_ims_from_contact(contact, name, "prpl-oscar", E_CONTACT_IM_AIM);
	79	update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER);
	80	update_ims_from_contact(contact, name, "prpl-yahoo", E_CONTACT_IM_YAHOO);
f7957216	81	+ update_ims_from_contact(contact, name, "prpl-gg", E_CONTACT_IM_GADUGADU);
be9750be	82	update_ims_from_contact(contact, name, "prpl-msn", E_CONTACT_IM_MSN);
	83	update_ims_from_contact(contact, name, "prpl-oscar", E_CONTACT_IM_ICQ);
	84	update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE);
	85	diff -aurN gaim-2.0.0.orig/gtk/plugins/gevolution/gevo-util.c gaim-2.0.0/gtk/plugins/gevolution/gevo-util.c
	86	--- gaim-2.0.0.orig/gtk/plugins/gevolution/gevo-util.c 2005-07-03 08:42:16.000000000 +0200
	87	+++ gaim-2.0.0/gtk/plugins/gevolution/gevo-util.c 2005-08-02 22:03:43.000000000 +0200
	88	@@ -110,6 +110,8 @@
f7957216	89	protocol_field = E_CONTACT_IM_MSN;
	90	else if (!strcmp(protocol_id, "prpl-yahoo"))
	91	protocol_field = E_CONTACT_IM_YAHOO;
	92	+ else if (!strcmp(protocol_id, "prpl-gg"))
	93	+ protocol_field = E_CONTACT_IM_GADUGADU;
	94	else if (!strcmp(protocol_id, "prpl-jabber"))
	95	protocol_field = E_CONTACT_IM_JABBER;
be9750be	96	else if (!strcmp(protocol_id, "prpl-novell"))
	97	diff -aurN gaim-2.0.0.orig/gtk/plugins/gevolution/new_person_dialog.c gaim-2.0.0/gtk/plugins/gevolution/new_person_dialog.c
	98	--- gaim-2.0.0.orig/gtk/plugins/gevolution/new_person_dialog.c 2005-07-03 08:42:16.000000000 +0200
	99	+++ gaim-2.0.0/gtk/plugins/gevolution/new_person_dialog.c 2005-08-02 22:04:18.000000000 +0200
	100	@@ -150,6 +150,8 @@
f7957216	101	}
	102	else if (!strcmp(im_service, "prpl-yahoo"))
	103	field = E_CONTACT_IM_YAHOO;
	104	+ else if (!strcmp(im_service, "prpl-gg"))
	105	+ field = E_CONTACT_IM_GADUGADU;
	106	else if (!strcmp(im_service, "prpl-jabber"))
	107	field = E_CONTACT_IM_JABBER;
	108	else if (!strcmp(im_service, "prpl-msn"))
be9750be	109	diff -aurN gaim-2.0.0.orig/gtk/gtkblist.c gaim-2.0.0/gtk/gtkblist.c
	110	--- gaim-2.0.0.orig/gtk/gtkblist.c 2005-07-21 07:49:42.000000000 +0200
	111	+++ gaim-2.0.0/gtk/gtkblist.c 2005-08-02 22:09:51.000000000 +0200
	112	@@ -1702,12 +1702,13 @@
f7957216	113	{
	114	char *temp_vcard;
	115	char s, c;
	116	- char *alias = NULL;
	117	- GList *aims = NULL;
	118	- GList *icqs = NULL;
	119	- GList *yahoos = NULL;
	120	- GList *msns = NULL;
	121	- GList *jabbers = NULL;
be9750be	122	+ char *alias = NULL;
	123	+ GList *aims = NULL;
	124	+ GList *icqs = NULL;
	125	+ GList *yahoos = NULL;
	126	+ GList *gadugadus = NULL;
	127	+ GList *msns = NULL;
	128	+ GList *jabbers = NULL;
f7957216	129
	130	s = temp_vcard = g_strdup(vcard);
	131
be9750be	132	@@ -1747,7 +1748,7 @@
f7957216	133	alias = g_strdup(value);
	134	else if (!strcmp(field, "X-AIM") \|\| !strcmp(field, "X-ICQ") \|\|
	135	!strcmp(field, "X-YAHOO") \|\| !strcmp(field, "X-MSN") \|\|
	136	- !strcmp(field, "X-JABBER"))
	137	+ !strcmp(field, "X-JABBER") \|\| !strcmp(field, "X-GADUGADU"))
	138	{
	139	char **values = g_strsplit(value, ":", 0);
	140	char **im;
be9750be	141	@@ -1760,6 +1761,8 @@
f7957216	142	icqs = g_list_append(icqs, g_strdup(*im));
	143	else if (!strcmp(field, "X-YAHOO"))
	144	yahoos = g_list_append(yahoos, g_strdup(*im));
	145	+ else if (!strcmp(field, "X-GADUGADU"))
be9750be	146	+ gadugadus = g_list_append(gadugadus, g_strdup(*im));
f7957216	147	else if (!strcmp(field, "X-MSN"))
	148	msns = g_list_append(msns, g_strdup(*im));
	149	else if (!strcmp(field, "X-JABBER"))
be9750be	150	@@ -1773,7 +1776,7 @@
f7957216	151	g_free(temp_vcard);
	152
	153	if (aims == NULL && icqs == NULL && yahoos == NULL &&
	154	- msns == NULL && jabbers == NULL)
	155	+ msns == NULL && jabbers == NULL && gadugadus == NULL)
	156	{
	157	if (alias != NULL)
	158	g_free(alias);
be9750be	159	@@ -1781,11 +1784,12 @@
f7957216	160	return FALSE;
	161	}
	162
	163	- add_buddies_from_vcard("prpl-oscar", group, aims, alias);
	164	- add_buddies_from_vcard("prpl-oscar", group, icqs, alias);
	165	- add_buddies_from_vcard("prpl-yahoo", group, yahoos, alias);
	166	- add_buddies_from_vcard("prpl-msn", group, msns, alias);
	167	- add_buddies_from_vcard("prpl-jabber", group, jabbers, alias);
	168	+ add_buddies_from_vcard("prpl-oscar", group, aims, alias);
	169	+ add_buddies_from_vcard("prpl-oscar", group, icqs, alias);
	170	+ add_buddies_from_vcard("prpl-yahoo", group, yahoos, alias);
	171	+ add_buddies_from_vcard("prpl-gg", group, gadugadus, alias);
	172	+ add_buddies_from_vcard("prpl-msn", group, msns, alias);
	173	+ add_buddies_from_vcard("prpl-jabber", group, jabbers, alias);
	174
	175	if (alias != NULL)
	176	g_free(alias);