diff -r e093c956c5e5 -r c0aef3b64c56 pidgin/gtkutils.c --- a/pidgin/gtkutils.c Sat Sep 07 02:30:39 2013 +0530 +++ b/pidgin/gtkutils.c Thu Sep 12 19:08:48 2013 +0530 @@ -1512,7 +1512,7 @@ "embed it into this message, or use it as the buddy icon for this user."), DND_FILE_TRANSFER, _("OK"), (GCallback)dnd_image_ok_callback, _("Cancel"), (GCallback)dnd_image_cancel_callback, - account, who, NULL, + purple_request_cpar_from_account(account), data, _("Set as buddy icon"), DND_BUDDY_ICON, _("Send image file"), DND_FILE_TRANSFER, @@ -1522,17 +1522,17 @@ purple_request_yes_no(NULL, NULL, _("You have dragged an image"), _("Would you like to set it as the buddy icon for this user?"), PURPLE_DEFAULT_ACTION_NONE, - account, who, NULL, + purple_request_cpar_from_account(account), data, (GCallback)dnd_set_icon_ok_cb, (GCallback)dnd_set_icon_cancel_cb); else purple_request_choice(NULL, NULL, _("You have dragged an image"), (ft ? _("You can send this image as a file transfer, or use it as the buddy icon for this user.") : _("You can insert this image into this message, or use it as the buddy icon for this user")), - (ft ? DND_FILE_TRANSFER : DND_IM_IMAGE), + GINT_TO_POINTER(ft ? DND_FILE_TRANSFER : DND_IM_IMAGE), _("OK"), (GCallback)dnd_image_ok_callback, _("Cancel"), (GCallback)dnd_image_cancel_callback, - account, who, NULL, + purple_request_cpar_from_account(account), data, _("Set as buddy icon"), DND_BUDDY_ICON, (ft ? _("Send image file") : _("Insert in message")), (ft ? DND_FILE_TRANSFER : DND_IM_IMAGE), @@ -3356,9 +3356,9 @@ return TRUE; conv = gtkconv->active_conv; purple_request_file(conv, _("Save File"), NULL, TRUE, - G_CALLBACK(savefile_write_cb), G_CALLBACK(g_free), - purple_conversation_get_account(conv), NULL, conv, - (gpointer)g_strdup(url)); + G_CALLBACK(savefile_write_cb), G_CALLBACK(g_free), + purple_request_cpar_from_conversation(conv), + (gpointer)g_strdup(url)); return TRUE; }