Merge branch 'jb14210' into 'master'

[commhistoryd] Added error message for IM message failure. Fixes JB#14210

See merge request mer-core/commhistory-daemon!24

src/locstrings.h

@@ -113,6 +113,8 @@
 
 //% "SMS sending failed to %1"
 #define txt_qtn_msg_error_sms_sending_failed(STR) qtTrId("qtn_msg_error_sms_sending_failed").arg(STR)
+//% "Message sending failed to %1"
+#define txt_qtn_msg_error_sending_failed(STR) qtTrId("qtn_msg_error_sending_failed").arg(STR)
 //% "SMS sending failed. No message center number found in the sim card."
 #define txt_qtn_msg_error_missing_smsc qtTrId("qtn_msg_error_missing_smsc")
 //% "Fixed dialing active. Sending not allowed to %1."

src/textchannellistener.cpp

@@ -1123,7 +1123,7 @@ void TextChannelListener::handleMessageFailed(const Tp::ReceivedMessage &message
                 recipient = event.recipients().value(0).remoteUid();
             }
 
-            // general error
+            // general sms error
             QString errorMsgToUser = txt_qtn_msg_error_sms_sending_failed(recipient);
             QString category = StrongErrorCategory;
 
@@ -1148,6 +1148,11 @@ void TextChannelListener::handleMessageFailed(const Tp::ReceivedMessage &message
                 errorMsgToUser = txt_qtn_msg_general_does_not_support_offline;
                 category = ErrorCategory;
             }
+            // IM message error
+            else if (event.type() == CommHistory::Event::IMEvent) {
+                errorMsgToUser = txt_qtn_msg_error_sending_failed(recipient);
+                category = ErrorCategory;
+            }
 
             DEBUG() << "error message shown to user:" << errorMsgToUser;
             showErrorNote(errorMsgToUser, category);