diff -r 969b74a3e27a -r 4de1981757fc pidgin/plugins/gevolution/gevo-util.c
--- a/pidgin/plugins/gevolution/gevo-util.c	Mon Mar 19 06:11:46 2007 +0000
+++ b/pidgin/plugins/gevolution/gevo-util.c	Mon Mar 19 07:01:17 2007 +0000
@@ -1,5 +1,5 @@
 /*
- * Evolution integration plugin for Gaim
+ * Evolution integration plugin for Purple
  *
  * Copyright (C) 2003 Christian Hammond.
  *
@@ -26,29 +26,29 @@
 #include "gevolution.h"
 
 void
-gevo_add_buddy(GaimAccount *account, const char *group_name,
+gevo_add_buddy(PurpleAccount *account, const char *group_name,
 			   const char *screenname, const char *alias)
 {
-	GaimConversation *conv = NULL;
-	GaimBuddy *buddy;
-	GaimGroup *group;
+	PurpleConversation *conv = NULL;
+	PurpleBuddy *buddy;
+	PurpleGroup *group;
 
-	conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, screenname, account);
+	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, screenname, account);
 
-	if ((group = gaim_find_group(group_name)) == NULL)
+	if ((group = purple_find_group(group_name)) == NULL)
 	{
-		group = gaim_group_new(group_name);
-		gaim_blist_add_group(group, NULL);
+		group = purple_group_new(group_name);
+		purple_blist_add_group(group, NULL);
 	}
 
-	buddy = gaim_buddy_new(account, screenname, alias);
-	gaim_blist_add_buddy(buddy, NULL, group, NULL);
-	gaim_account_add_buddy(account, buddy);
+	buddy = purple_buddy_new(account, screenname, alias);
+	purple_blist_add_buddy(buddy, NULL, group, NULL);
+	purple_account_add_buddy(account, buddy);
 
 	if (conv != NULL)
 	{
-		gaim_buddy_icon_update(gaim_conv_im_get_icon(GAIM_CONV_IM(conv)));
-		gaim_conversation_update(conv, GAIM_CONV_UPDATE_ADD);
+		purple_buddy_icon_update(purple_conv_im_get_icon(PURPLE_CONV_IM(conv)));
+		purple_conversation_update(conv, PURPLE_CONV_UPDATE_ADD);
 	}
 }
 
@@ -56,22 +56,22 @@
 gevo_get_groups(void)
 {
 	GList *list = NULL;
-	GaimGroup *g;
-	GaimBlistNode *gnode;
+	PurpleGroup *g;
+	PurpleBlistNode *gnode;
 
-	if (gaim_get_blist()->root == NULL)
+	if (purple_get_blist()->root == NULL)
 	{
 		list  = g_list_append(list, (gpointer)_("Buddies"));
 	}
 	else
 	{
-		for (gnode = gaim_get_blist()->root;
+		for (gnode = purple_get_blist()->root;
 			 gnode != NULL;
 			 gnode = gnode->next)
 		{
-			if (GAIM_BLIST_NODE_IS_GROUP(gnode))
+			if (PURPLE_BLIST_NODE_IS_GROUP(gnode))
 			{
-				g = (GaimGroup *)gnode;
+				g = (PurpleGroup *)gnode;
 				list = g_list_append(list, g->name);
 			}
 		}
@@ -81,23 +81,23 @@
 }
 
 EContactField
-gevo_prpl_get_field(GaimAccount *account, GaimBuddy *buddy)
+gevo_prpl_get_field(PurpleAccount *account, PurpleBuddy *buddy)
 {
 	EContactField protocol_field = 0;
 	const char *protocol_id;
 
 	g_return_val_if_fail(account != NULL, 0);
 
-	protocol_id = gaim_account_get_protocol_id(account);
+	protocol_id = purple_account_get_protocol_id(account);
 
 	if (!strcmp(protocol_id, "prpl-oscar"))
 	{
-		GaimConnection *gc;
-		GaimPluginProtocolInfo *prpl_info;
+		PurpleConnection *gc;
+		PurplePluginProtocolInfo *prpl_info;
 
-		gc = gaim_account_get_connection(account);
+		gc = purple_account_get_connection(account);
 
-		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
+		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
 
 		if (!strcmp("aim", prpl_info->list_icon(account, buddy)))
 		{
@@ -119,7 +119,7 @@
 }
 
 gboolean
-gevo_prpl_is_supported(GaimAccount *account, GaimBuddy *buddy)
+gevo_prpl_is_supported(PurpleAccount *account, PurpleBuddy *buddy)
 {
 	return (gevo_prpl_get_field(account, buddy) != 0);
 }
@@ -148,7 +148,7 @@
 }
 
 char *
-gevo_get_email_for_buddy(GaimBuddy *buddy)
+gevo_get_email_for_buddy(PurpleBuddy *buddy)
 {
 	EContact *contact;
 	char *mail = NULL;
@@ -163,19 +163,19 @@
 
 	if (mail == NULL)
 	{
-		GaimAccount *account = gaim_buddy_get_account(buddy);
-		const char *prpl_id = gaim_account_get_protocol_id(account);
+		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(gaim_normalize(account,
-										   gaim_buddy_get_name(buddy)));
+			mail = g_strdup(purple_normalize(account,
+										   purple_buddy_get_name(buddy)));
 		}
 		else if (!strcmp(prpl_id, "prpl-yahoo"))
 		{
 			mail = g_strdup_printf("%s@yahoo.com",
-								   gaim_normalize(account,
-												  gaim_buddy_get_name(buddy)));
+								   purple_normalize(account,
+												  purple_buddy_get_name(buddy)));
 		}
 	}