aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-22 22:42:11 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-28 21:14:00 +0800
commit09a20a54f5b7384ab93388cb8642dcd8959daf98 (patch)
tree6005ffe4bd72b2d6847e4cadc8b5d3e3c7b98859
parent9a353a3f7a9a0528161516c544c6375c53d5f3cc (diff)
downloadgsoc2013-empathy-09a20a54f5b7384ab93388cb8642dcd8959daf98.tar
gsoc2013-empathy-09a20a54f5b7384ab93388cb8642dcd8959daf98.tar.gz
gsoc2013-empathy-09a20a54f5b7384ab93388cb8642dcd8959daf98.tar.bz2
gsoc2013-empathy-09a20a54f5b7384ab93388cb8642dcd8959daf98.tar.lz
gsoc2013-empathy-09a20a54f5b7384ab93388cb8642dcd8959daf98.tar.xz
gsoc2013-empathy-09a20a54f5b7384ab93388cb8642dcd8959daf98.tar.zst
gsoc2013-empathy-09a20a54f5b7384ab93388cb8642dcd8959daf98.zip
don't ignore TP_DELIVERY_STATUS_TEMPORARILY_FAILED delivery report
We should display an error message as well if not the user will assume the message has been sent and the spinner keeps spinning. https://bugzilla.gnome.org/show_bug.cgi?id=664564
-rw-r--r--libempathy/empathy-tp-chat.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index d34f581ef..96eda77b8 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -365,7 +365,8 @@ handle_delivery_report (EmpathyTpChat *self,
tp_chat_set_delivery_status (self, delivery_token,
EMPATHY_DELIVERY_STATUS_NONE);
goto out;
- } else if (delivery_status != TP_DELIVERY_STATUS_PERMANENTLY_FAILED) {
+ } else if (delivery_status != TP_DELIVERY_STATUS_PERMANENTLY_FAILED &&
+ delivery_status != TP_DELIVERY_STATUS_TEMPORARILY_FAILED) {
goto out;
}