Mercurial > pidgin3 / file diff

--- a/pidgin/plugins/gevolution/gevo-util.c	Sun Sep 01 05:01:14 2013 +0530
+++ b/pidgin/plugins/gevolution/gevo-util.c	Sun Sep 01 14:24:24 2013 +0530
@@ -99,19 +99,19 @@
 
 	protocol_id = purple_account_get_protocol_id(account);
 
-	if (!strcmp(protocol_id, "prpl-aim"))
+	if (!strcmp(protocol_id, "aim"))
 		protocol_field = E_CONTACT_IM_AIM;
-	else if (!strcmp(protocol_id, "prpl-icq"))
+	else if (!strcmp(protocol_id, "icq"))
 		protocol_field = E_CONTACT_IM_ICQ;
-	else if (!strcmp(protocol_id, "prpl-msn"))
+	else if (!strcmp(protocol_id, "msn"))
 		protocol_field = E_CONTACT_IM_MSN;
-	else if (!strcmp(protocol_id, "prpl-yahoo"))
+	else if (!strcmp(protocol_id, "yahoo"))
 		protocol_field = E_CONTACT_IM_YAHOO;
-	else if (!strcmp(protocol_id, "prpl-jabber"))
+	else if (!strcmp(protocol_id, "jabber"))
 		protocol_field = E_CONTACT_IM_JABBER;
-	else if (!strcmp(protocol_id, "prpl-novell"))
+	else if (!strcmp(protocol_id, "novell"))
 		protocol_field = E_CONTACT_IM_GROUPWISE;
-	else if (!strcmp(protocol_id, "prpl-gg"))
+	else if (!strcmp(protocol_id, "gg"))
 		protocol_field = E_CONTACT_IM_GADUGADU;
 
 	return protocol_field;
@@ -170,12 +170,12 @@
 		PurpleAccount *account = purple_buddy_get_account(buddy);
 		const char *protocol_id = purple_account_get_protocol_id(account);
 
-		if (!strcmp(protocol_id, "prpl-msn"))
+		if (!strcmp(protocol_id, "msn"))
 		{
 			mail = g_strdup(purple_normalize(account,
 										   purple_buddy_get_name(buddy)));
 		}
-		else if (!strcmp(protocol_id, "prpl-yahoo"))
+		else if (!strcmp(protocol_id, "yahoo"))
 		{
 			mail = g_strdup_printf("%s@yahoo.com",
 								   purple_normalize(account,