Merge lp:~majcherlk/widelands/bug-1422072 into lp:widelands

Proposed by Lukasz
Status: Merged
Merged at revision: 7433
Proposed branch: lp:~majcherlk/widelands/bug-1422072
Merge into: lp:widelands
Diff against target: 24 lines (+2/-1)
2 files modified
src/network/nethost.cc (+1/-0)
src/wui/chat_msg_layout.cc (+1/-1)
To merge this branch: bzr merge lp:~majcherlk/widelands/bug-1422072
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+253295@code.launchpad.net

Description of the change

fixing Bug #1422072 Private message improvements

To post a comment you must log in.
Revision history for this message
SirVer (sirver) wrote :

lgtm. merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/network/nethost.cc'
2--- src/network/nethost.cc 2015-02-06 16:37:25 +0000
3+++ src/network/nethost.cc 2015-03-17 23:31:15 +0000
4@@ -1047,6 +1047,7 @@
5 // is host the sender?
6 if (d->localplayername == msg.sender) {
7 ChatMessage err;
8+ err.time = time(nullptr);
9 err.playern = -2; // System message
10 err.sender = "";
11 err.msg = fail;
12
13=== modified file 'src/wui/chat_msg_layout.cc'
14--- src/wui/chat_msg_layout.cc 2015-03-01 09:21:20 +0000
15+++ src/wui/chat_msg_layout.cc 2015-03-17 23:31:15 +0000
16@@ -99,7 +99,7 @@
17 // Personal message handling
18 if (sanitized.compare(0, 3, "/me")) {
19
20- message = (boost::format("%s font-decoration=underline>%s @ %s:</p><p font-size=14 font-face=%s %s")
21+ message = (boost::format("%s font-decoration=underline>%s @ %s:</p><p font-size=14 font-face=%s> %s")
22 % message
23 % chat_message.sender
24 % chat_message.recipient

Subscribers

People subscribed via source and target branches

to status/vote changes: