diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-05-04 07:58:18 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-05-05 15:31:19 +0800 |
| commit | 24e6b10a9c1795964f0e6e80e074eff24344f64b (patch) | |
| tree | 3579741dcb818377716ac8ac0e05c720916b7cf5 /libempathy | |
| parent | 3e22736f0211a0bb668218243bc4764435f62a58 (diff) | |
| download | gsoc2013-empathy-24e6b10a9c1795964f0e6e80e074eff24344f64b.tar gsoc2013-empathy-24e6b10a9c1795964f0e6e80e074eff24344f64b.tar.gz gsoc2013-empathy-24e6b10a9c1795964f0e6e80e074eff24344f64b.tar.bz2 gsoc2013-empathy-24e6b10a9c1795964f0e6e80e074eff24344f64b.tar.lz gsoc2013-empathy-24e6b10a9c1795964f0e6e80e074eff24344f64b.tar.xz gsoc2013-empathy-24e6b10a9c1795964f0e6e80e074eff24344f64b.tar.zst gsoc2013-empathy-24e6b10a9c1795964f0e6e80e074eff24344f64b.zip | |
Fix broken logic that caused delivery report spinner to spin forever
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 18087580b..72c6bebf0 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -101,13 +101,14 @@ tp_chat_set_delivery_status (EmpathyTpChat *self, EmpathyDeliveryStatus delivery_status) { EmpathyTpChatPriv *priv = GET_PRIV (self); + TpDeliveryReportingSupportFlags flags = + tp_text_channel_get_delivery_reporting_support ( + TP_TEXT_CHANNEL (priv->channel)); /* channel must support receiving failures and successes */ if (!tp_str_empty (token) && - tp_text_channel_get_delivery_reporting_support ( - TP_TEXT_CHANNEL (priv->channel)) & - (TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_FAILURES | - TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_SUCCESSES)) { + flags & TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_FAILURES && + flags & TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_SUCCESSES) { DEBUG ("Delivery status (%s) = %u", token, delivery_status); |