Mercurial > pidgin.yaz
comparison pidgin/gtkutils.c @ 20342:d4cdca890d8e
applied changes from 4d9fac4aab275ee133ce860edc469e0e5c4734ff
through 68d63cab97f8861a7a080c3103d5e24a31587473
applied changes from 68d63cab97f8861a7a080c3103d5e24a31587473
through f9d3abd0678a04291edd671c4e5d87c7217984bb
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sun, 21 Oct 2007 04:39:02 +0000 |
| parents | 24ce4fcce5b0 |
| children | 0484600ac434 |
comparison
equal
deleted
inserted
replaced
| 20341:754603796c1e | 20342:d4cdca890d8e |
|---|---|
| 1524 if (prpl_info && prpl_info->options & OPT_PROTO_IM_IMAGE) | 1524 if (prpl_info && prpl_info->options & OPT_PROTO_IM_IMAGE) |
| 1525 im = TRUE; | 1525 im = TRUE; |
| 1526 | 1526 |
| 1527 if (prpl_info && prpl_info->can_receive_file) | 1527 if (prpl_info && prpl_info->can_receive_file) |
| 1528 ft = prpl_info->can_receive_file(gc, who); | 1528 ft = prpl_info->can_receive_file(gc, who); |
| 1529 else if (prpl_info && prpl_info->send_file) | |
| 1530 ft = TRUE; | |
| 1529 | 1531 |
| 1530 if (im && ft) | 1532 if (im && ft) |
| 1531 purple_request_choice(NULL, NULL, | 1533 purple_request_choice(NULL, NULL, |
| 1532 _("You have dragged an image"), | 1534 _("You have dragged an image"), |
| 1533 _("You can send this image as a file transfer, " | 1535 _("You can send this image as a file transfer, " |
| 1557 account, who, NULL, | 1559 account, who, NULL, |
| 1558 data, | 1560 data, |
| 1559 _("Set as buddy icon"), DND_BUDDY_ICON, | 1561 _("Set as buddy icon"), DND_BUDDY_ICON, |
| 1560 (ft ? _("Send image file") : _("Insert in message")), (ft ? DND_FILE_TRANSFER : DND_IM_IMAGE), | 1562 (ft ? _("Send image file") : _("Insert in message")), (ft ? DND_FILE_TRANSFER : DND_IM_IMAGE), |
| 1561 NULL); | 1563 NULL); |
| 1564 gdk_pixbuf_unref(pb); | |
| 1562 return; | 1565 return; |
| 1563 } | 1566 } |
| 1564 | 1567 |
| 1565 #ifndef _WIN32 | 1568 #ifndef _WIN32 |
| 1566 /* Are we trying to send a .desktop file? */ | 1569 /* Are we trying to send a .desktop file? */ |