fixed first run bugs

git-svn-id: http://svn.miranda-ng.org/main/trunk@2832 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 13 insertions, 13 deletions

diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index b71a856eb4..bdde73c971 100755
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
@@ -1823,18 +1823,18 @@ INT_PTR ImportGpGKeys(WPARAM w, LPARAM l)
 }

 

 void fix_line_term(std::string &s)

-{
-	for(std::string::size_type s1 = s.find("\r\r", 0); s1 != string::npos; s1 = s.find("\r\r", s1))
-		s.erase(s1, 1);
-}
-
-void fix_line_term(std::wstring &s)
-{
-	for(std::wstring::size_type s1 = s.find(_T("\r\r"), 0); s1 != wstring::npos; s1 = s.find(_T("\r\r"), s1))
-		s.erase(s1, 1);
-}
-
-void strip_line_term(std::wstring &s)
+{

+	for(std::string::size_type s1 = s.find("\r\r", 0); s1 != string::npos; s1 = s.find("\r\r", s1))

+		s.erase(s1, 1);

+}

+

+void fix_line_term(std::wstring &s)

+{

+	for(std::wstring::size_type s1 = s.find(_T("\r\r"), 0); s1 != wstring::npos; s1 = s.find(_T("\r\r"), s1))

+		s.erase(s1, 1);

+}

+

+void strip_line_term(std::wstring &s)

 {

 	for(std::wstring::size_type i = s.find(_T("\r")); i != std::wstring::npos; i = s.find(_T("\r"), i+1))

 		s.erase(i, 1);

@@ -1842,7 +1842,7 @@ void strip_line_term(std::wstring &s)
 		s.erase(i, 1);

 }

 

-void strip_line_term(std::string &s)
+void strip_line_term(std::string &s)

 {

 	for(std::string::size_type i = s.find("\r"); i != std::string::npos; i = s.find("\r", i+1))

 		s.erase(i, 1);