summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPalo Kisa <palo.kisa@gmail.com>2016-03-21 11:34:24 +0100
committerPalo Kisa <palo.kisa@gmail.com>2016-03-21 11:34:24 +0100
commit83e716bb59acdab1d6b4f2066e41225627df6871 (patch)
tree291bec7685f03eddf9a7727287f60794193ba8ad
parent685b0c917a867b024200991caedbf839e535b960 (diff)
downloadtwinkle-83e716bb59acdab1d6b4f2066e41225627df6871.tar
twinkle-83e716bb59acdab1d6b4f2066e41225627df6871.tar.gz
twinkle-83e716bb59acdab1d6b4f2066e41225627df6871.tar.lz
twinkle-83e716bb59acdab1d6b4f2066e41225627df6871.tar.xz
twinkle-83e716bb59acdab1d6b4f2066e41225627df6871.zip
gui: Fix info message handling
-rw-r--r--src/gui/gui.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 0e91e58..752ae96 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -1487,7 +1487,7 @@ void t_gui::cb_invalid_reg_resp(t_user *user_config, const t_response *r, const
QString s;
emit mw_display_header();
- qApp->translate("GUI", "%1, registration failed: %2 %3")
+ s = qApp->translate("GUI", "%1, registration failed: %2 %3")
.arg(user_config->get_profile_name().c_str())
.arg(r->code)
.arg(r->reason.c_str());
@@ -2689,9 +2689,8 @@ bool t_gui::cb_message_request(t_user *user_config, t_request *r) {
// Set error message if attachment could not be saved
if (failed_to_save_attachment) {
- QString s = qApp->translate("GUI", "Failed to save message attachment: %1");
- s.arg(attachment_error_msg.c_str());
- session->set_error(s.toStdString());
+ QString s = qApp->translate("GUI", "Failed to save message attachment: %1").arg(attachment_error_msg.c_str());
+ session->set_error(s.toStdString());
}
unlock();