Mercurial > pidgin
comparison libpurple/ft.c @ 30578:0accc8adb18a
merge of '2f6318bd834113559a405ec68cdb178f2180b680'
and '64e02b98551e11e093e4649f1516f3aceaa321e2'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sun, 26 Sep 2010 20:16:15 +0000 |
| parents | 1cdae196aac8 |
| children | 485eaf544bb0 |
comparison
equal
deleted
inserted
replaced
| 30577:7b761c8601f7 | 30578:0accc8adb18a |
|---|---|
| 750 g_return_val_if_fail(xfer != NULL, PURPLE_XFER_STATUS_UNKNOWN); | 750 g_return_val_if_fail(xfer != NULL, PURPLE_XFER_STATUS_UNKNOWN); |
| 751 | 751 |
| 752 return xfer->status; | 752 return xfer->status; |
| 753 } | 753 } |
| 754 | 754 |
| 755 /* FIXME: Rename with cancelled for 3.0.0. */ | |
| 755 gboolean | 756 gboolean |
| 756 purple_xfer_is_canceled(const PurpleXfer *xfer) | 757 purple_xfer_is_canceled(const PurpleXfer *xfer) |
| 757 { | 758 { |
| 758 g_return_val_if_fail(xfer != NULL, TRUE); | 759 g_return_val_if_fail(xfer != NULL, TRUE); |
| 759 | 760 |