[empathy: 5/7] Fix broken logic that caused delivery report spinner to spin forever
- From: Danielle Madeley <daniellem src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 5/7] Fix broken logic that caused delivery report spinner to spin forever
- Date: Thu, 5 May 2011 08:23:04 +0000 (UTC)
commit 24e6b10a9c1795964f0e6e80e074eff24344f64b
Author: Danielle Madeley <danielle madeley collabora co uk>
Date: Wed May 4 09:58:18 2011 +1000
Fix broken logic that caused delivery report spinner to spin forever
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 1808758..72c6beb 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]