Mercurial > pidgin.yaz
diff pidgin/gtkutils.c @ 21560:665e04562de0
This merge has the effect of reverting the hinting code from trunk.
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 17 Nov 2007 00:12:30 +0000 |
| parents | 9fe16ecaa4ab fcb848b2d669 |
| children | 14afe5a92fc2 2a2496044eef 5b0d9e08992d 98604b4bfa3b |
line wrap: on
line diff
--- a/pidgin/gtkutils.c Fri Nov 16 03:39:04 2007 +0000 +++ b/pidgin/gtkutils.c Sat Nov 17 00:12:30 2007 +0000 @@ -1531,26 +1531,26 @@ ft = TRUE; if (im && ft) - purple_request_choice_with_hint(NULL, NULL, + purple_request_choice(NULL, NULL, _("You have dragged an image"), _("You can send this image as a file transfer, " "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_UI_HINT_CONV, data, + data, _("Set as buddy icon"), DND_BUDDY_ICON, _("Send image file"), DND_FILE_TRANSFER, _("Insert in message"), DND_IM_IMAGE, NULL); else if (!(im || ft)) - purple_request_yes_no_with_hint(NULL, NULL, _("You have dragged an image"), + purple_request_yes_no(NULL, NULL, _("You have dragged an image"), _("Would you like to set it as the buddy icon for this user?"), 0, account, who, NULL, - PURPLE_REQUEST_UI_HINT_CONV, data, (GCallback)dnd_set_icon_ok_cb, (GCallback)dnd_set_icon_cancel_cb); + data, (GCallback)dnd_set_icon_ok_cb, (GCallback)dnd_set_icon_cancel_cb); else - purple_request_choice_with_hint(NULL, NULL, + 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")), @@ -1558,7 +1558,7 @@ "OK", (GCallback)dnd_image_ok_callback, "Cancel", (GCallback)dnd_image_cancel_callback, account, who, NULL, - PURPLE_REQUEST_UI_HINT_CONV, data, + data, _("Set as buddy icon"), DND_BUDDY_ICON, (ft ? _("Send image file") : _("Insert in message")), (ft ? DND_FILE_TRANSFER : DND_IM_IMAGE), NULL);