diff -r e15d91a77cb3 -r bbcb198650b7 pidgin/gtkconv.c --- a/pidgin/gtkconv.c Wed Sep 18 18:24:28 2013 +0200 +++ b/pidgin/gtkconv.c Sat Sep 21 11:54:03 2013 +0200 @@ -880,9 +880,10 @@ if (strcmp(convprotocol, purple_account_get_protocol_id(purple_buddy_get_account(buddy)))) { - purple_notify_error(PIDGIN_CONVERSATION(info->conv), NULL, - _("That buddy is not on the same protocol as this " - "chat."), NULL); + purple_notify_error(PIDGIN_CONVERSATION(info->conv), + NULL, _("That buddy is not on the same protocol" + " as this chat."), NULL, + purple_request_cpar_from_conversation(info->conv)); success = FALSE; } else @@ -904,13 +905,16 @@ { purple_notify_error(PIDGIN_CONVERSATION(info->conv), NULL, _("You are not currently signed on with an account that " - "can invite that buddy."), NULL); + "can invite that buddy."), NULL, NULL); } else if (strcmp(convprotocol, purple_account_get_protocol_id(account))) { - purple_notify_error(PIDGIN_CONVERSATION(info->conv), NULL, - _("That buddy is not on the same protocol as this " - "chat."), NULL); + purple_notify_error( + PIDGIN_CONVERSATION(info->conv), NULL, + _("That buddy is not on the same " + "protocol as this chat."), NULL, + purple_request_cpar_from_account( + account)); success = FALSE; } else @@ -1076,7 +1080,9 @@ gchar *text; if ((fp = g_fopen(filename, "w+")) == NULL) { - purple_notify_error(PIDGIN_CONVERSATION(conv), NULL, _("Unable to open file."), NULL); + purple_notify_error(PIDGIN_CONVERSATION(conv), NULL, + _("Unable to open file."), NULL, + purple_request_cpar_from_conversation(conv)); return; } @@ -2831,7 +2837,7 @@ data = purple_buddy_icon_get_data(icon, &len); if ((len <= 0) || (data == NULL) || !purple_util_write_data_to_file_absolute(filename, data, len)) { - purple_notify_error(gtkconv, NULL, _("Unable to save icon file to disk."), NULL); + purple_notify_error(gtkconv, NULL, _("Unable to save icon file to disk."), NULL, NULL); } } @@ -5617,7 +5623,7 @@ { purple_notify_error(win, NULL, _("You are not currently signed on with an account that " - "can add that buddy."), NULL); + "can add that buddy."), NULL, NULL); } else { /* * If a buddy is dragged to a chat window of the same protocol,