--- a/pidgin/plugins/gevolution/assoc-buddy.c Fri Jan 31 14:47:31 2014 +0100
+++ b/pidgin/plugins/gevolution/assoc-buddy.c Fri Jan 31 16:56:05 2014 +0100
@@ -188,7 +188,8 @@
- prpl_id = purple_account_get_protocol_id(dialog->buddy->account);
+ prpl_id = purple_account_get_protocol_id(purple_buddy_get_account( for (c = cards; c != NULL; c = c->next)
@@ -207,8 +208,9 @@
/* See if this user has the buddy in its list. */
- protocol_field = gevo_prpl_get_field(dialog->buddy->account,
+ protocol_field = gevo_prpl_get_field( + purple_buddy_get_account(dialog->buddy), @@ -218,7 +220,8 @@
for (l = ims; l != NULL; l = l->next)
- if (!strcmp(l->data, dialog->buddy->name))
+ purple_buddy_get_name(dialog->buddy))) GtkTreeSelection *selection;
@@ -256,9 +259,10 @@
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 +293,15 @@
- protocol_field = gevo_prpl_get_field(dialog->buddy->account, dialog->buddy);
+ protocol_field = gevo_prpl_get_field( + purple_buddy_get_account(dialog->buddy), dialog->buddy); 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);
--- a/pidgin/plugins/gevolution/eds-utils.c Fri Jan 31 14:47:31 2014 +0100
+++ b/pidgin/plugins/gevolution/eds-utils.c Fri Jan 31 16:56:05 2014 +0100
@@ -177,7 +177,8 @@
- EContactField protocol_field = gevo_prpl_get_field(buddy->account, buddy);
+ EContactField protocol_field = + gevo_prpl_get_field(purple_buddy_get_account(buddy), buddy); @@ -187,7 +188,8 @@
- queries[1] = e_book_query_field_test(protocol_field, E_BOOK_QUERY_IS, buddy->name);
+ queries[1] = e_book_query_field_test(protocol_field, + E_BOOK_QUERY_IS, purple_buddy_get_name(buddy)); purple_debug_error("evolution", "Error in creating protocol query\n");
@@ -199,7 +201,8 @@
- full_query = e_book_query_field_test(protocol_field, E_BOOK_QUERY_IS, buddy->name);
+ full_query = e_book_query_field_test(protocol_field, + E_BOOK_QUERY_IS, purple_buddy_get_name(buddy)); purple_debug_error("evolution", "Error in creating protocol query\n");
--- a/pidgin/plugins/gevolution/gevo-util.c Fri Jan 31 14:47:31 2014 +0100
+++ b/pidgin/plugins/gevolution/gevo-util.c Fri Jan 31 16:56:05 2014 +0100
@@ -29,7 +29,7 @@
gevo_add_buddy(PurpleAccount *account, const char *group_name,
const char *buddy_name, const char *alias)
- PurpleConversation *conv = NULL;
+ PurpleIMConversation *conv = NULL; @@ -53,8 +53,9 @@
- purple_buddy_icon_update(purple_im_conversation_get_icon(PURPLE_CONV_IM(conv)));
- purple_conversation_update(conv, PURPLE_CONVERSATION_UPDATE_ADD);
+ purple_buddy_icon_update(purple_im_conversation_get_icon(conv)); + purple_conversation_update(PURPLE_CONVERSATION(conv), + PURPLE_CONVERSATION_UPDATE_ADD); @@ -81,7 +82,8 @@
if (PURPLE_IS_GROUP(gnode))
- list = g_list_append(list, g->name);
+ list = g_list_append(list, + (gpointer)purple_group_get_name(g)); --- a/pidgin/plugins/gevolution/gevolution.c Fri Jan 31 14:47:31 2014 +0100
+++ b/pidgin/plugins/gevolution/gevolution.c Fri Jan 31 16:56:05 2014 +0100
@@ -248,14 +248,15 @@
- purple_notify_error(NULL, NULL, _("Unable to send email"),
- _("The evolution executable was not found in the PATH."));
+ purple_notify_error(NULL, NULL, _("Unable to send " + "email"), _("The evolution executable was not " + "found in the PATH."), NULL); purple_notify_error(NULL, NULL, _("Unable to send email"),
- _("An email address was not found for this buddy."));
+ _("An email address was not found for this buddy."), NULL); @@ -515,7 +516,6 @@
static PidginPluginUiInfo ui_info =
get_config_frame, /**< get_config_frame */
--- a/pidgin/plugins/gevolution/new_person_dialog.c Fri Jan 31 14:47:31 2014 +0100
+++ b/pidgin/plugins/gevolution/new_person_dialog.c Fri Jan 31 16:56:05 2014 +0100
@@ -96,7 +96,7 @@
- username = dialog->buddy->name;
+ username = purple_buddy_get_name(dialog->buddy); username = gtk_entry_get_text(GTK_ENTRY(dialog->username));