# HG changeset patch
# User Etan Reisner <pidgin@unreliablesource.net>
# Date 1282540057 0
# Node ID 3e06c30b75bb19e7c0ea8304c39cfe84748a6586
# Parent  6854cca5e2f7541da66d72bd4b8ff122fffd7440
Add GG support to gevolution.
rekkanoryo feels that we require a new enough GLib/GTK+ that the
time that this was added to evolution is irrelevant.

Fixes #10709.

committer: Elliott Sales de Andrade <qulogic@pidgin.im>

diff -r 6854cca5e2f7 -r 3e06c30b75bb ChangeLog
--- a/ChangeLog	Mon Aug 23 03:28:50 2010 +0000
+++ b/ChangeLog	Mon Aug 23 05:07:37 2010 +0000
@@ -4,6 +4,10 @@
 	General:
 	* Fix search path for Tk when compiling on Debian Squeeze. (#12465)
 
+	Pidgin:
+	* Add support for the Gadu-Gadu protocol in the gevolution plugin to
+	  provide Evolution integration with contacts with GG IDs. (#10709)
+
 version 2.7.3 (08/10/2010):
 	General:
 	* Use silent build rules for automake >1.11. You can enable verbose
diff -r 6854cca5e2f7 -r 3e06c30b75bb pidgin/plugins/gevolution/add_buddy_dialog.c
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c	Mon Aug 23 03:28:50 2010 +0000
+++ b/pidgin/plugins/gevolution/add_buddy_dialog.c	Mon Aug 23 05:07:37 2010 +0000
@@ -289,7 +289,7 @@
 	{
 		EContact *contact = E_CONTACT(c->data);
 		const char *name;
-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells;
+		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
 
 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
 
@@ -299,9 +299,11 @@
 		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);
+		ggs     = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
 
 		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
-			msns == NULL && icqs == NULL && novells == NULL)
+			msns == NULL && icqs == NULL && novells == NULL &&
+			ggs == NULL)
 		{
 			GtkTreeIter iter;
 
@@ -320,6 +322,7 @@
 			add_ims(dialog, contact, name, msns,    "prpl-msn");
 			add_ims(dialog, contact, name, icqs,    "prpl-icq");
 			add_ims(dialog, contact, name, novells, "prpl-novell");
+			add_ims(dialog, contact, name, ggs,     "prpl-gg");
 		}
 	}
 
@@ -365,7 +368,7 @@
 	{
 		EContact *contact = E_CONTACT(l->data);
 		const char *name;
-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells;
+		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
 
 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
 
@@ -381,9 +384,11 @@
 		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);
+		ggs     = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
 
 		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
-			msns == NULL && icqs == NULL && novells == NULL)
+			msns == NULL && icqs == NULL && novells == NULL &&
+			ggs == NULL)
 		{
 			GtkTreeIter iter;
 
@@ -402,6 +407,7 @@
 			add_ims(dialog, contact, name, msns,    "prpl-msn");
 			add_ims(dialog, contact, name, icqs,    "prpl-icq");
 			add_ims(dialog, contact, name, novells, "prpl-novell");
+			add_ims(dialog, contact, name, ggs,     "prpl-gg");
 		}
 	}
 }
diff -r 6854cca5e2f7 -r 3e06c30b75bb pidgin/plugins/gevolution/gevo-util.c
--- a/pidgin/plugins/gevolution/gevo-util.c	Mon Aug 23 03:28:50 2010 +0000
+++ b/pidgin/plugins/gevolution/gevo-util.c	Mon Aug 23 05:07:37 2010 +0000
@@ -111,6 +111,8 @@
 		protocol_field = E_CONTACT_IM_JABBER;
 	else if (!strcmp(protocol_id, "prpl-novell"))
 		protocol_field = E_CONTACT_IM_GROUPWISE;
+	else if (!strcmp(protocol_id, "prpl-gg"))
+		protocol_field = E_CONTACT_IM_GADUGADU;
 
 	return protocol_field;
 }
diff -r 6854cca5e2f7 -r 3e06c30b75bb pidgin/plugins/gevolution/gevolution.c
--- a/pidgin/plugins/gevolution/gevolution.c	Mon Aug 23 03:28:50 2010 +0000
+++ b/pidgin/plugins/gevolution/gevolution.c	Mon Aug 23 05:07:37 2010 +0000
@@ -125,6 +125,7 @@
 	update_ims_from_contact(contact, name, "prpl-msn",    E_CONTACT_IM_MSN);
 	update_ims_from_contact(contact, name, "prpl-icq",    E_CONTACT_IM_ICQ);
 	update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE);
+	update_ims_from_contact(contact, name, "prpl-gg",     E_CONTACT_IM_GADUGADU);
 }
 
 static void
diff -r 6854cca5e2f7 -r 3e06c30b75bb pidgin/plugins/gevolution/new_person_dialog.c
--- a/pidgin/plugins/gevolution/new_person_dialog.c	Mon Aug 23 03:28:50 2010 +0000
+++ b/pidgin/plugins/gevolution/new_person_dialog.c	Mon Aug 23 05:07:37 2010 +0000
@@ -153,6 +153,8 @@
 			field = E_CONTACT_IM_MSN;
 		else if (!strcmp(im_service, "prpl-novell"))
 			field = E_CONTACT_IM_GROUPWISE;
+		else if (!strcmp(im_service, "prpl-gg"))
+			field = E_CONTACT_IM_GADUGADU;
 
 		if (field > 0)
 		{