- unused module removed from Scriver;

- window data for a chat session is now filled properly

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

1 files changed, 1 insertions, 50 deletions

diff --git a/plugins/Scriver/src/chat/log.cpp b/plugins/Scriver/src/chat/log.cpp
index 613669777d..f13556a494 100644
--- a/plugins/Scriver/src/chat/log.cpp
+++ b/plugins/Scriver/src/chat/log.cpp
@@ -127,7 +127,7 @@ void Log_StreamInEvent(HWND hwndDlg, LOGINFO* lin, SESSION_INFO *si, BOOL bRedra
 		sm.rangeToReplace = bRedraw ? NULL : &newsel;

 		sm.flags = 0;

 		sm.disableRedraw = TRUE;

-		sm.hContact = si->windowData.hContact;

+		sm.hContact = si->hContact;

 		CallService(MS_SMILEYADD_REPLACESMILEYS, 0, (LPARAM)&sm);

 	}

 

@@ -152,52 +152,3 @@ void Log_StreamInEvent(HWND hwndDlg, LOGINFO* lin, SESSION_INFO *si, BOOL bRedra
 		InvalidateRect(hwndRich, NULL, TRUE);

 	}

 }

-

-char* Log_CreateRtfHeader(MODULEINFO *mi, SESSION_INFO *si)

-{

-	int bufferAlloced, bufferEnd, i = 0;

-	int charset = 0;

-	BOOL forceCharset = FALSE;

-

-	// guesstimate amount of memory for the RTF header

-	bufferEnd = 0;

-	bufferAlloced = 4096;

-	char *buffer = (char*)mir_realloc(si->pszHeader, bufferAlloced);

-	buffer[0] = '\0';

-

-	// ### RTF HEADER

-

-	// font table

-	AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "{\\rtf1\\ansi\\deff0{\\fonttbl");

-	for (i = 0; i < OPTIONS_FONTCOUNT; i++)

-		AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "{\\f%u\\fnil\\fcharset%u%S;}", i, (!forceCharset) ? pci->aFonts[i].lf.lfCharSet : charset, pci->aFonts[i].lf.lfFaceName);

-

-	// colour table

-	AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "}{\\colortbl ;");

-

-	for (i = 0; i < OPTIONS_FONTCOUNT; i++)

-		AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "\\red%u\\green%u\\blue%u;", GetRValue(pci->aFonts[i].color), GetGValue(pci->aFonts[i].color), GetBValue(pci->aFonts[i].color));

-

-	for (i = 0; i < mi->nColorCount; i++)

-		AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "\\red%u\\green%u\\blue%u;", GetRValue(mi->crColors[i]), GetGValue(mi->crColors[i]), GetBValue(mi->crColors[i]));

-

-	// new paragraph

-	AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "}\\pard");

-

-	// set tabs and indents

-	int iIndent = 0;

-

-	if (g_Settings.dwIconFlags) {

-		iIndent += (14 * 1440) / g_dat.logPixelSX;

-		AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "\\tx%u", iIndent);

-	}

-	if (g_Settings.ShowTime) {

-		int iSize = (g_Settings.LogTextIndent * 1440) / g_dat.logPixelSX;

-		AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "\\tx%u", iIndent + iSize);

-		if (g_Settings.LogIndentEnabled)

-			iIndent += iSize;

-	}

-	AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "\\fi-%u\\li%u", iIndent, iIndent);

-

-	return buffer;

-}