[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=af23122

The following commit has been merged in the master branch:
commit af23122598e5af67df522d0dc5d3734ea5ff87f5
Author: Ahmed Ibrahim Khalil <ahmedibrahimkhali at gmail.com>
Date:   Tue Apr 3 00:11:33 2012 +0200

    Displayed a message to the user that tells him the contact is blocked
    
    BUG: 297188
---
 lib/chat-widget.cpp | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index cfbb74b..8d11823 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -476,12 +476,23 @@ void ChatWidget::handleIncomingMessage(const Tp::ReceivedMessage &message)
                 switch (reportDetails.error()) {
                 case Tp::ChannelTextSendErrorOffline:
                     if (reportDetails.hasEchoedMessage()) {
-                        text = i18n("Delivery of the message \"%1\" "
-                                    "failed because the remote contact is offline",
-                                    reportDetails.echoedMessage().text());
+                        if(message.sender()->isBlocked()) {
+                            text = i18n("Delivery of the message \"%1\" "
+                                        "failed because the remote contact is blocked",
+                                        reportDetails.echoedMessage().text());
+                         } else {
+                            text = i18n("Delivery of the message \"%1\" "
+                                        "failed because the remote contact is offline",
+                                        reportDetails.echoedMessage().text());
+                         }
                     } else {
-                        text = i18n("Delivery of a message failed "
-                                    "because the remote contact is offline");
+                        if(message.sender()->isBlocked()) {
+                            text = i18n("Delivery of a message failed "
+                                        "because the remote contact is blocked");
+                        } else {
+                            text = i18n("Delivery of a message failed "
+                                        "because the remote contact is offline");
+                        }
                     }
                     break;
                 case Tp::ChannelTextSendErrorInvalidContact:

-- 
ktp-text-ui packaging