From 24e6b10a9c1795964f0e6e80e074eff24344f64b Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Wed, 4 May 2011 09:58:18 +1000 Subject: [PATCH] Fix broken logic that caused delivery report spinner to spin forever --- libempathy/empathy-tp-chat.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 18087580..72c6bebf 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); -- 2.39.2