pidgin: d0cbcbb1: Add GG support to gevolution.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: d0cbcbb1a25505fd8801dd556c1ec42e98414c9a
Parent:   c73e6d48fa9b26d72abc3e41b80eb7e004f40062
Author:   deryni at pidgin.im
Date:     08/23/10 01:07:37
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d0cbcbb1a25505fd8801dd556c1ec42e98414c9a

Changelog: 

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.

Changes against parent c73e6d48fa9b26d72abc3e41b80eb7e004f40062

  patched  ChangeLog
  patched  pidgin/plugins/gevolution/add_buddy_dialog.c
  patched  pidgin/plugins/gevolution/gevo-util.c
  patched  pidgin/plugins/gevolution/gevolution.c
  patched  pidgin/plugins/gevolution/new_person_dialog.c

-------------- next part --------------
============================================================
--- ChangeLog	3aeab0b919d2d169ce511a4656988c84fc3eb2cb
+++ ChangeLog	f2c281fe8f54be537f5ea038dbf54eab4d3ddf74
@@ -4,6 +4,10 @@ version 2.7.4 (MM/DD/YYYY):
 	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
============================================================
--- pidgin/plugins/gevolution/add_buddy_dialog.c	10f6fcc2130808e1c754bfc740e22ef1b9b3318d
+++ pidgin/plugins/gevolution/add_buddy_dialog.c	8342068a07a9a2d60f7422d22b72da99a7d691f2
@@ -289,7 +289,7 @@ populate_treeview(GevoAddBuddyDialog *di
 	{
 		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 @@ populate_treeview(GevoAddBuddyDialog *di
 		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 @@ populate_treeview(GevoAddBuddyDialog *di
 			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 @@ search_changed_cb(GtkEntry *entry, GevoA
 	{
 		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 @@ search_changed_cb(GtkEntry *entry, GevoA
 		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 @@ search_changed_cb(GtkEntry *entry, GevoA
 			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");
 		}
 	}
 }
============================================================
--- pidgin/plugins/gevolution/gevo-util.c	cf4d5cb1baf39fc60862eb4a0a6f42305a711781
+++ pidgin/plugins/gevolution/gevo-util.c	ff52dd1bfe12040161e43eb3a8272b9b1018d989
@@ -111,6 +111,8 @@ gevo_prpl_get_field(PurpleAccount *accou
 		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;
 }
============================================================
--- pidgin/plugins/gevolution/gevolution.c	628b0d63f40b58cd151607270fa7165c5196495d
+++ pidgin/plugins/gevolution/gevolution.c	0e9c8439a1254c470087bb6bcf2321525c5b774d
@@ -125,6 +125,7 @@ update_buddies_from_contact(EContact *co
 	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
============================================================
--- pidgin/plugins/gevolution/new_person_dialog.c	41a0a97e858d6942ca14fec5ac9f7240443a8ad1
+++ pidgin/plugins/gevolution/new_person_dialog.c	a8f26ad12cb80e3adeedfedd43b31b7d8135383b
@@ -153,6 +153,8 @@ add_cb(GtkWidget *w, GevoNewPersonDialog
 			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)
 		{