Mercurial > pidgin3 / changeset

--- a/pidgin/plugins/gevolution/add_buddy_dialog.c	Tue Oct 04 12:11:46 2016 -0500
+++ b/pidgin/plugins/gevolution/add_buddy_dialog.c	Fri Sep 30 14:38:48 2016 -0500
@@ -288,21 +288,19 @@
 	{
 		EContact *contact = E_CONTACT(c->data);
 		const char *name;
-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
+		GList *aims, *jabbers, *yahoos, *icqs, *novells, *ggs;
 
 		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);
 		ggs     = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
 
 		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
-			msns == NULL && icqs == NULL && novells == NULL &&
-			ggs == NULL)
+			icqs == NULL && novells == NULL && ggs == NULL)
 		{
 			GtkTreeIter iter;
 
@@ -318,7 +316,6 @@
 			add_ims(dialog, contact, name, aims,    "prpl-aim");
 			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-icq");
 			add_ims(dialog, contact, name, novells, "prpl-novell");
 			add_ims(dialog, contact, name, ggs,     "prpl-gg");
@@ -367,7 +364,7 @@
 	{
 		EContact *contact = E_CONTACT(l->data);
 		const char *name;
-		GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
+		GList *aims, *jabbers, *yahoos, *icqs, *novells, *ggs;
 
 		name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
 
@@ -380,14 +377,12 @@
 		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);
 		ggs     = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
 
 		if (aims == NULL && jabbers == NULL && yahoos == NULL &&
-			msns == NULL && icqs == NULL && novells == NULL &&
-			ggs == NULL)
+			icqs == NULL && novells == NULL && ggs == NULL)
 		{
 			GtkTreeIter iter;
 
@@ -403,7 +398,6 @@
 			add_ims(dialog, contact, name, aims,    "prpl-aim");
 			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-icq");
 			add_ims(dialog, contact, name, novells, "prpl-novell");
 			add_ims(dialog, contact, name, ggs,     "prpl-gg");

--- a/pidgin/plugins/gevolution/gevo-util.c	Tue Oct 04 12:11:46 2016 -0500
+++ b/pidgin/plugins/gevolution/gevo-util.c	Fri Sep 30 14:38:48 2016 -0500
@@ -103,8 +103,6 @@
 		protocol_field = E_CONTACT_IM_AIM;
 	else if (!strcmp(protocol_id, "prpl-icq"))
 		protocol_field = E_CONTACT_IM_ICQ;
-	else if (!strcmp(protocol_id, "prpl-msn"))
-		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-jabber"))
@@ -170,12 +168,7 @@
 		PurpleAccount *account = purple_buddy_get_account(buddy);
 		const char *prpl_id = purple_account_get_protocol_id(account);
 
-		if (!strcmp(prpl_id, "prpl-msn"))
-		{
-			mail = g_strdup(purple_normalize(account,
-										   purple_buddy_get_name(buddy)));
-		}
-		else if (!strcmp(prpl_id, "prpl-yahoo"))
+		if (!strcmp(prpl_id, "prpl-yahoo"))
 		{
 			mail = g_strdup_printf("%s@yahoo.com",
 								   purple_normalize(account,

--- a/pidgin/plugins/gevolution/gevolution.c	Tue Oct 04 12:11:46 2016 -0500
+++ b/pidgin/plugins/gevolution/gevolution.c	Fri Sep 30 14:38:48 2016 -0500
@@ -122,7 +122,6 @@
 	update_ims_from_contact(contact, name, "prpl-aim",    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-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);

--- a/pidgin/plugins/gevolution/new_person_dialog.c	Tue Oct 04 12:11:46 2016 -0500
+++ b/pidgin/plugins/gevolution/new_person_dialog.c	Fri Sep 30 14:38:48 2016 -0500
@@ -149,8 +149,6 @@
 			field = E_CONTACT_IM_YAHOO;
 		else if (!strcmp(im_service, "prpl-jabber"))
 			field = E_CONTACT_IM_JABBER;
-		else if (!strcmp(im_service, "prpl-msn"))
-			field = E_CONTACT_IM_MSN;
 		else if (!strcmp(im_service, "prpl-novell"))
 			field = E_CONTACT_IM_GROUPWISE;
 		else if (!strcmp(im_service, "prpl-gg"))