linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2868
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2012-02-17 21:56:23 +0100
message:
  add missing CRs when logging LF-only chat messages
modified:
  win32/AspectChat.h
  win32/HtmlToRtf.cpp
  win32/HubFrame.cpp
  win32/PrivateFrame.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'win32/AspectChat.h'
--- win32/AspectChat.h	2012-02-12 15:34:48 +0000
+++ win32/AspectChat.h	2012-02-17 20:56:23 +0000
@@ -74,7 +74,7 @@
 
 	/// add a chat message and call addedChat.
 	void addChat(const tstring& message) {
-		addChatRTF(dwt::RichTextBox::rtfEscape(message));
+		addChatPlain(message);
 		t().addedChat(message);
 	}
 
@@ -84,7 +84,7 @@
 		t().addedChat(Text::toT(message.message));
 	}
 
-	/// just add to the chat; don't call addedChat.
+	/// add a plain text message.
 	void addChatPlain(const tstring& message) {
 		addChatRTF(dwt::RichTextBox::rtfEscape(message));
 	}

=== modified file 'win32/HtmlToRtf.cpp'
--- win32/HtmlToRtf.cpp	2012-02-12 15:34:48 +0000
+++ win32/HtmlToRtf.cpp	2012-02-17 20:56:23 +0000
@@ -270,7 +270,7 @@
 }
 
 void Parser::parseDecoration(const string& s) {
-	if(s.find("underline")) {
+	if(s == "underline") {
 		contexts.back().setFlag(Context::Underlined);
 	}
 }

=== modified file 'win32/HubFrame.cpp'
--- win32/HubFrame.cpp	2012-02-12 15:34:48 +0000
+++ win32/HubFrame.cpp	2012-02-17 20:56:23 +0000
@@ -527,7 +527,7 @@
 
 	if(BOOLSETTING(LOG_MAIN_CHAT)) {
 		ParamMap params;
-		params["message"] = [&message] { return Text::fromT(message); };
+		params["message"] = [&message] { return Text::toDOS(Text::fromT(message)); };
 		client->getHubIdentity().getParams(params, "hub", false);
 		params["hubURL"] = [this] { return client->getHubUrl(); };
 		client->getMyIdentity().getParams(params, "my", true);

=== modified file 'win32/PrivateFrame.cpp'
--- win32/PrivateFrame.cpp	2012-02-12 15:34:48 +0000
+++ win32/PrivateFrame.cpp	2012-02-17 20:56:23 +0000
@@ -202,7 +202,7 @@
 
 	if(BOOLSETTING(LOG_PRIVATE_CHAT)) {
 		ParamMap params;
-		params["message"] = [&message] { return Text::fromT(message); };
+		params["message"] = [&message] { return Text::toDOS(Text::fromT(message)); };
 		fillLogParams(params);
 		LOG(LogManager::PM, params);
 	}