widelands-dev team mailing list archive

[Lukasz <majcherlk@xxxxxxxxx>]

Lukasz has proposed merging lp:~majcherlk/widelands/bug-1422072 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~majcherlk/widelands/bug-1422072/+merge/253295

fixing Bug #1422072 Private message improvements
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~majcherlk/widelands/bug-1422072 into lp:widelands.

=== modified file 'src/network/nethost.cc'
--- src/network/nethost.cc	2015-02-06 16:37:25 +0000
+++ src/network/nethost.cc	2015-03-17 23:31:15 +0000
@@ -1047,6 +1047,7 @@
 				// is host the sender?
 				if (d->localplayername == msg.sender) {
 					ChatMessage err;
+					err.time = time(nullptr);
 					err.playern = -2; // System message
 					err.sender = "";
 					err.msg = fail;

=== modified file 'src/wui/chat_msg_layout.cc'
--- src/wui/chat_msg_layout.cc	2015-03-01 09:21:20 +0000
+++ src/wui/chat_msg_layout.cc	2015-03-17 23:31:15 +0000
@@ -99,7 +99,7 @@
 		// Personal message handling
 		if (sanitized.compare(0, 3, "/me")) {
 
-			message = (boost::format("%s font-decoration=underline>%s @ %s:</p><p font-size=14 font-face=%s %s")
+			message = (boost::format("%s font-decoration=underline>%s @ %s:</p><p font-size=14 font-face=%s> %s")
 						  % message
 						  % chat_message.sender
 						  % chat_message.recipient