фиксы перед растаскиванием на части цикла сообщений

1 files changed, 31 insertions, 31 deletions

diff --git a/src/mir_core/mir_core.mk b/src/mir_core/mir_core.mk
index 0e7221d564..4b250f29c7 100644
--- a/src/mir_core/mir_core.mk
+++ b/src/mir_core/mir_core.mk
@@ -62,9 +62,9 @@ AS       := as
 ## User defined environment variables
 ##
 CodeLiteDir:=/usr/share/codelite
-Objects0=$(IntermediateDirectory)/src_Linux_CTimer.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlEdit.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlCheck.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_logger.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_md5.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_mstring.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlCombo.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_sha1.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_db.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlLabel.cpp$(ObjectSuffix) \
-	$(IntermediateDirectory)/src_http.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlData.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_tinyxml2.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_stdafx.cxx$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlButton.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_tinyxml2_utils.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_strutil.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_sha256.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_utf.cpp$(ObjectSuffix) \
-	$(IntermediateDirectory)/src_utils.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_memory.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_fileutil.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_lists.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_bitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_binbuffer.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CDbLink.cpp$(ObjectSuffix) 
+Objects0=$(IntermediateDirectory)/src_Linux_CCtrlCheck.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_logger.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_md5.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_mstring.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlCombo.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_sha1.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_db.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_stdafx.cxx$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlData.cpp$(ObjectSuffix) \
+	$(IntermediateDirectory)/src_tinyxml2.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlButton.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_tinyxml2_utils.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_strutil.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_sha256.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_utf.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_utils.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_memory.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CTimer.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_fileutil.cpp$(ObjectSuffix) \
+	$(IntermediateDirectory)/src_lists.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_bitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_binbuffer.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlEdit.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CDbLink.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_http.cpp$(ObjectSuffix) $(IntermediateDirectory)/src_Linux_CCtrlLabel.cpp$(ObjectSuffix) 
 
 
 
@@ -96,16 +96,6 @@ PreBuild:
 ##
 ## Objects
 ##
-$(IntermediateDirectory)/src_Linux_CTimer.cpp$(ObjectSuffix): src/Linux/CTimer.cpp 
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CTimer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CTimer.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/src_Linux_CTimer.cpp$(PreprocessSuffix): src/Linux/CTimer.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CTimer.cpp$(PreprocessSuffix) src/Linux/CTimer.cpp
-
-$(IntermediateDirectory)/src_Linux_CCtrlEdit.cpp$(ObjectSuffix): src/Linux/CCtrlEdit.cpp 
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CCtrlEdit.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CCtrlEdit.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/src_Linux_CCtrlEdit.cpp$(PreprocessSuffix): src/Linux/CCtrlEdit.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CCtrlEdit.cpp$(PreprocessSuffix) src/Linux/CCtrlEdit.cpp
-
 $(IntermediateDirectory)/src_Linux_CCtrlCheck.cpp$(ObjectSuffix): src/Linux/CCtrlCheck.cpp 
 	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CCtrlCheck.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CCtrlCheck.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/src_Linux_CCtrlCheck.cpp$(PreprocessSuffix): src/Linux/CCtrlCheck.cpp
@@ -141,15 +131,15 @@ $(IntermediateDirectory)/src_db.cpp$(ObjectSuffix): src/db.cpp
 $(IntermediateDirectory)/src_db.cpp$(PreprocessSuffix): src/db.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_db.cpp$(PreprocessSuffix) src/db.cpp
 
-$(IntermediateDirectory)/src_Linux_CCtrlLabel.cpp$(ObjectSuffix): src/Linux/CCtrlLabel.cpp 
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CCtrlLabel.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CCtrlLabel.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/src_Linux_CCtrlLabel.cpp$(PreprocessSuffix): src/Linux/CCtrlLabel.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CCtrlLabel.cpp$(PreprocessSuffix) src/Linux/CCtrlLabel.cpp
+$(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(ObjectSuffix): src/Linux/CDlgBase.cpp 
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CDlgBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(PreprocessSuffix): src/Linux/CDlgBase.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(PreprocessSuffix) src/Linux/CDlgBase.cpp
 
-$(IntermediateDirectory)/src_http.cpp$(ObjectSuffix): src/http.cpp 
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/http.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_http.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/src_http.cpp$(PreprocessSuffix): src/http.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_http.cpp$(PreprocessSuffix) src/http.cpp
+$(IntermediateDirectory)/src_stdafx.cxx$(ObjectSuffix): src/stdafx.cxx 
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/stdafx.cxx" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_stdafx.cxx$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/src_stdafx.cxx$(PreprocessSuffix): src/stdafx.cxx
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_stdafx.cxx$(PreprocessSuffix) src/stdafx.cxx
 
 $(IntermediateDirectory)/src_Linux_CCtrlData.cpp$(ObjectSuffix): src/Linux/CCtrlData.cpp 
 	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CCtrlData.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CCtrlData.cpp$(ObjectSuffix) $(IncludePath)
@@ -161,16 +151,6 @@ $(IntermediateDirectory)/src_tinyxml2.cpp$(ObjectSuffix): src/tinyxml2.cpp
 $(IntermediateDirectory)/src_tinyxml2.cpp$(PreprocessSuffix): src/tinyxml2.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_tinyxml2.cpp$(PreprocessSuffix) src/tinyxml2.cpp
 
-$(IntermediateDirectory)/src_stdafx.cxx$(ObjectSuffix): src/stdafx.cxx 
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/stdafx.cxx" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_stdafx.cxx$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/src_stdafx.cxx$(PreprocessSuffix): src/stdafx.cxx
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_stdafx.cxx$(PreprocessSuffix) src/stdafx.cxx
-
-$(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(ObjectSuffix): src/Linux/CDlgBase.cpp 
-	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CDlgBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(PreprocessSuffix): src/Linux/CDlgBase.cpp
-	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CDlgBase.cpp$(PreprocessSuffix) src/Linux/CDlgBase.cpp
-
 $(IntermediateDirectory)/src_Linux_CCtrlButton.cpp$(ObjectSuffix): src/Linux/CCtrlButton.cpp 
 	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CCtrlButton.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CCtrlButton.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/src_Linux_CCtrlButton.cpp$(PreprocessSuffix): src/Linux/CCtrlButton.cpp
@@ -206,6 +186,11 @@ $(IntermediateDirectory)/src_memory.cpp$(ObjectSuffix): src/memory.cpp
 $(IntermediateDirectory)/src_memory.cpp$(PreprocessSuffix): src/memory.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_memory.cpp$(PreprocessSuffix) src/memory.cpp
 
+$(IntermediateDirectory)/src_Linux_CTimer.cpp$(ObjectSuffix): src/Linux/CTimer.cpp 
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CTimer.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CTimer.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/src_Linux_CTimer.cpp$(PreprocessSuffix): src/Linux/CTimer.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CTimer.cpp$(PreprocessSuffix) src/Linux/CTimer.cpp
+
 $(IntermediateDirectory)/src_Linux_fileutil.cpp$(ObjectSuffix): src/Linux/fileutil.cpp 
 	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/fileutil.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_fileutil.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/src_Linux_fileutil.cpp$(PreprocessSuffix): src/Linux/fileutil.cpp
@@ -226,6 +211,11 @@ $(IntermediateDirectory)/src_binbuffer.cpp$(ObjectSuffix): src/binbuffer.cpp
 $(IntermediateDirectory)/src_binbuffer.cpp$(PreprocessSuffix): src/binbuffer.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_binbuffer.cpp$(PreprocessSuffix) src/binbuffer.cpp
 
+$(IntermediateDirectory)/src_Linux_CCtrlEdit.cpp$(ObjectSuffix): src/Linux/CCtrlEdit.cpp 
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CCtrlEdit.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CCtrlEdit.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/src_Linux_CCtrlEdit.cpp$(PreprocessSuffix): src/Linux/CCtrlEdit.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CCtrlEdit.cpp$(PreprocessSuffix) src/Linux/CCtrlEdit.cpp
+
 $(IntermediateDirectory)/src_Linux_CCtrlBase.cpp$(ObjectSuffix): src/Linux/CCtrlBase.cpp 
 	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CCtrlBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CCtrlBase.cpp$(ObjectSuffix) $(IncludePath)
 $(IntermediateDirectory)/src_Linux_CCtrlBase.cpp$(PreprocessSuffix): src/Linux/CCtrlBase.cpp
@@ -236,6 +226,16 @@ $(IntermediateDirectory)/src_Linux_CDbLink.cpp$(ObjectSuffix): src/Linux/CDbLink
 $(IntermediateDirectory)/src_Linux_CDbLink.cpp$(PreprocessSuffix): src/Linux/CDbLink.cpp
 	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CDbLink.cpp$(PreprocessSuffix) src/Linux/CDbLink.cpp
 
+$(IntermediateDirectory)/src_http.cpp$(ObjectSuffix): src/http.cpp 
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/http.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_http.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/src_http.cpp$(PreprocessSuffix): src/http.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_http.cpp$(PreprocessSuffix) src/http.cpp
+
+$(IntermediateDirectory)/src_Linux_CCtrlLabel.cpp$(ObjectSuffix): src/Linux/CCtrlLabel.cpp 
+	$(CXX) $(IncludePCH) $(SourceSwitch) "/home/ghazan/miranda-ng/src/mir_core/src/Linux/CCtrlLabel.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_Linux_CCtrlLabel.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/src_Linux_CCtrlLabel.cpp$(PreprocessSuffix): src/Linux/CCtrlLabel.cpp
+	$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_Linux_CCtrlLabel.cpp$(PreprocessSuffix) src/Linux/CCtrlLabel.cpp
+
 ##
 ## Clean
 ##