Mercurial > pidgin3 / file diff

--- a/pidgin/plugins/gevolution/assoc-buddy.c	Thu Sep 19 17:12:10 2013 +0530
+++ b/pidgin/plugins/gevolution/assoc-buddy.c	Thu Sep 19 20:29:25 2013 +0530
@@ -134,7 +134,6 @@
 {
 	EBook *book;
 	EBookQuery *query;
-	const char *protocol_id;
 	gboolean status;
 	GList *cards, *c;
 	GError *err = NULL;
@@ -188,8 +187,6 @@
 		return;
 	}
 
-	protocol_id = purple_account_get_protocol_id(dialog->buddy->account);
-
 	for (c = cards; c != NULL; c = c->next)
 	{
 		EContact *contact = E_CONTACT(c->data);
@@ -207,7 +204,7 @@
 						   -1);
 
 		/* See if this user has the buddy in its list. */
-		protocol_field = gevo_protocol_get_field(dialog->buddy->account,
+		protocol_field = gevo_protocol_get_field(purple_buddy_get_account(dialog->buddy),
 											 dialog->buddy);
 
 		if (protocol_field > 0)
@@ -218,7 +215,7 @@
 
 			for (l = ims; l != NULL; l = l->next)
 			{
-				if (!strcmp(l->data, dialog->buddy->name))
+				if (!strcmp(l->data, purple_buddy_get_name(dialog->buddy)))
 				{
 					GtkTreeSelection *selection;
 
@@ -256,8 +253,8 @@
 static void
 new_person_cb(GtkWidget *w, GevoAssociateBuddyDialog *dialog)
 {
-	gevo_new_person_dialog_show(dialog->book, NULL, dialog->buddy->account,
-								dialog->buddy->name, NULL, dialog->buddy,
+	gevo_new_person_dialog_show(dialog->book, NULL, purple_buddy_get_account(dialog->buddy),
+								purple_buddy_get_name(dialog->buddy), NULL, dialog->buddy,
 								TRUE);
 
 	delete_win_cb(NULL, NULL, dialog);
@@ -289,13 +286,13 @@
 					   COLUMN_DATA, &contact,
 					   -1);
 
-	protocol_field = gevo_protocol_get_field(dialog->buddy->account, dialog->buddy);
+	protocol_field = gevo_protocol_get_field(purple_buddy_get_account(dialog->buddy), dialog->buddy);
 
 	if (protocol_field == 0)
 		return; /* XXX */
 
 	list = e_contact_get(contact, protocol_field);
-	list = g_list_append(list, g_strdup(dialog->buddy->name));
+	list = g_list_append(list, g_strdup(purple_buddy_get_name(dialog->buddy)));
 
 	e_contact_set(contact, protocol_field, list);