we don't need that field anymore

5 files changed, 28 insertions, 31 deletions

diff --git a/plugins/NewStory/src/history_array.cpp b/plugins/NewStory/src/history_array.cpp
index c78484dd7a..959de8c8e1 100644
--- a/plugins/NewStory/src/history_array.cpp
+++ b/plugins/NewStory/src/history_array.cpp
@@ -88,7 +88,7 @@ ItemData::~ItemData()
 

 static bool isEqual(const ItemData *p1, const ItemData *p2)

 {

-	if (p1->hContact != p2->hContact)

+	if (p1->dbe.hContact != p2->dbe.hContact)

 		return false;

 	if (p1->dbe.eventType != p2->dbe.eventType)

 		return false;

@@ -226,7 +226,7 @@ int ItemData::calcHeight(int width)
 

 bool ItemData::fetch(void)

 {

-	// if this event is virtual (for example, in group chats), don't try to laod it

+	// if this event is virtual (for example, in group chats), don't try to load it

 	if (!dbe.getEvent())

 		return false;

 

@@ -367,7 +367,6 @@ void ItemData::load(bool bLoadAlways)
 		return;

 

 	m_bLoaded = true;

-	hContact = dbe.hContact; // save true contact

 

 	switch (dbe.eventType) {

 	case EVENTTYPE_MESSAGE:

@@ -418,7 +417,7 @@ void ItemData::load(bool bLoadAlways)
 			CMStringW wszFileName;

 			if (!PathIsAbsoluteW(blob.getName())) {

 				wchar_t buf[MAX_PATH];

-				File::GetReceivedFolder(hContact, buf, _countof(buf));

+				File::GetReceivedFolder(dbe.hContact, buf, _countof(buf));

 				wszFileName = buf;

 			}

 			wszFileName.Append(blob.getName());

@@ -444,15 +443,15 @@ void ItemData::load(bool bLoadAlways)
 				wchar_t wszTime[100];

 				TimeZone_PrintTimeStamp(0, dbei.timestamp, L"D t", wszTime, _countof(wszTime), 0);

 

-				if (Contact::IsGroupChat(hContact) && dbei.szUserId)

+				if (Contact::IsGroupChat(dbe.hContact) && dbei.szUserId)

 					wszNick = Utf2T(dbei.szUserId);

 				else if (dbei.flags & DBEF_SENT) {

-					if (char *szProto = Proto_GetBaseAccountName(hContact))

+					if (char *szProto = Proto_GetBaseAccountName(dbe.hContact))

 						wszNick = ptrW(Contact::GetInfo(CNF_DISPLAY, 0, szProto));

 					else

 						wszNick = TranslateT("I"); // shall never happen

 				}

-				else wszNick = Clist_GetContactDisplayName(hContact, 0);

+				else wszNick = Clist_GetContactDisplayName(dbe.hContact, 0);

 				

 				str.AppendFormat(L"%s %s %s:\n", wszTime, wszNick.c_str(), TranslateT("wrote"));

 

@@ -509,7 +508,7 @@ void HistoryArray::addChatEvent(NewstoryListData *pOwner, SESSION_INFO *si, cons
 	int numItems = getCount();

 	auto &p = allocateItem();

 	p.pOwner = pOwner;

-	p.hContact = si->hContact;

+	p.dbe.hContact = si->hContact;

 

 	if (si->pMI->bDatabase && lin->hEvent) {

 		p.dbe = lin->hEvent;

@@ -576,7 +575,7 @@ bool HistoryArray::addEvent(NewstoryListData *pOwner, MCONTACT hContact, MEVENT
 	if (count == 1) {

 		auto &p = allocateItem();

 		p.pOwner = pOwner;

-		p.hContact = hContact;

+		p.dbe.hContact = hContact;

 		p.dbe = hEvent;

 		if (isChat) {

 			checkGC(p, si);

@@ -593,7 +592,7 @@ bool HistoryArray::addEvent(NewstoryListData *pOwner, MCONTACT hContact, MEVENT
 

 			auto &p = allocateItem();

 			p.pOwner = pOwner;

-			p.hContact = hContact;

+			p.dbe.hContact = hContact;

 			p.dbe = hEvent;

 			if (isChat) {

 				checkGC(p, si);

@@ -623,7 +622,7 @@ void HistoryArray::addResults(NewstoryListData *pOwner, const OBJLIST<SearchResu
 	for (auto &it : pArray) {

 		auto &p = allocateItem();

 		p.pOwner = pOwner;

-		p.hContact = it->hContact;

+		p.dbe.hContact = it->hContact;

 		p.dbe = it->hEvent;

 		p.m_bIsResult = true;

 		pPrev = p.checkPrev(pPrev);

@@ -653,7 +652,7 @@ void HistoryArray::checkGC(ItemData &p, SESSION_INFO *si)
 		else {

 			if (si == nullptr) {

 				MCONTACT hContact = INVALID_CONTACT_ID;

-				auto *szProto = Proto_GetBaseAccountName(p.hContact);

+				auto *szProto = Proto_GetBaseAccountName(p.dbe.hContact);

 

 				if (gcCache.size() == 0) {

 					ptrW wszNick(Contact::GetInfo(CNF_UNIQUEID, 0, szProto));

diff --git a/plugins/NewStory/src/history_array.h b/plugins/NewStory/src/history_array.h
index d56bc7fd2b..3ee5eae9e3 100644
--- a/plugins/NewStory/src/history_array.h
+++ b/plugins/NewStory/src/history_array.h
@@ -12,8 +12,6 @@ CMStringW TplFormatString(int tpl, MCONTACT hContact, ItemData *item);
 

 struct ItemData

 {

-	MCONTACT hContact;

-

 	bool m_bSelected, m_bHighlighted;

 	bool m_bLoaded, m_bIsResult;

 	bool m_bOfflineFile;

@@ -48,7 +46,7 @@ struct ItemData
 	const char* getUrl() const;

 

 	CMStringW formatHtml(const wchar_t *pwszStr = 0);

-	CMStringW formatString() { return TplFormatString(getTemplate(), hContact, this); }

+	CMStringW formatString() { return TplFormatString(getTemplate(), dbe.hContact, this); }

 	CMStringW formatStringEx(wchar_t *sztpl);

 

 	inline wchar_t* getWBuf()

diff --git a/plugins/NewStory/src/history_control.cpp b/plugins/NewStory/src/history_control.cpp
index 6d2b156ecf..f26ce1164c 100644
--- a/plugins/NewStory/src/history_control.cpp
+++ b/plugins/NewStory/src/history_control.cpp
@@ -313,7 +313,7 @@ void NewstoryListData::CopyUrl()
 {

 	if (auto *pItem = GetItem(caret)) {

 		if (pItem->m_bOfflineFile)

-			Srmm_DownloadOfflineFile(pItem->hContact, pItem->dbe.getEvent(), OFD_COPYURL);

+			Srmm_DownloadOfflineFile(pItem->dbe.hContact, pItem->dbe.getEvent(), OFD_COPYURL);

 		else if (auto *pszUrl = pItem->getUrl())

 			Utils_ClipboardCopy(MClipUnicode(Utf2T(pszUrl)));

 	}

@@ -427,7 +427,7 @@ void NewstoryListData::DeleteItems(void)
 void NewstoryListData::Download(int options)

 {

 	if (auto *p = LoadItem(caret))

-		Srmm_DownloadOfflineFile(p->hContact, p->dbe.getEvent(), options);

+		Srmm_DownloadOfflineFile(p->dbe.hContact, p->dbe.getEvent(), options);

 }

 

 void NewstoryListData::EndEditItem(bool bAccept)

@@ -445,7 +445,7 @@ void NewstoryListData::EndEditItem(bool bAccept)
 			GetWindowTextW(hwndEditBox, pItem->wtext, iTextLen+1);

 			pItem->wtext[iTextLen] = 0;

 

-			if (pItem->hContact && pItem->dbe.getEvent()) {

+			if (pItem->dbe.hContact && pItem->dbe.getEvent()) {

 				DBEVENTINFO dbei = pItem->dbe;

 

 				ptrA szUtf(mir_utf8encodeW(pItem->wtext));

@@ -968,7 +968,7 @@ void NewstoryListData::TryUp(int iCount)
 	

 	if (totalCount != 0) {

 		auto *pTop = GetItem(0);

-		hContact = pTop->hContact;

+		hContact = pTop->dbe.hContact;

 		hTopEvent = pTop->dbe.getEvent();

 		if (hTopEvent == 0)

 			return;

@@ -989,7 +989,7 @@ void NewstoryListData::TryUp(int iCount)
 

 		auto *p = items.insert(0);

 		p->pOwner = this;

-		p->hContact = hContact;

+		p->dbe.hContact = hContact;

 		p->dbe = hPrev;

 		totalCount++;

 	}

@@ -1466,7 +1466,7 @@ LRESULT CALLBACK NewstoryListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 			pt.y -= pItem->savedTop;

 

 			if (pItem->m_bOfflineFile) {

-				Srmm_DownloadOfflineFile(pItem->hContact, pItem->dbe.getEvent(), OFD_DOWNLOAD | OFD_RUN);

+				Srmm_DownloadOfflineFile(pItem->dbe.hContact, pItem->dbe.getEvent(), OFD_DOWNLOAD | OFD_RUN);

 				return 0;

 			}

 

diff --git a/plugins/NewStory/src/history_menus.cpp b/plugins/NewStory/src/history_menus.cpp
index 93230a07e4..d8db517b34 100644
--- a/plugins/NewStory/src/history_menus.cpp
+++ b/plugins/NewStory/src/history_menus.cpp
@@ -35,8 +35,8 @@ HMENU NSMenu_Build(NewstoryListData *data, ItemData *item)
 {

 	bool bNotProtected = true;

 	if (item != nullptr)

-		if (auto *szProto = Proto_GetBaseAccountName(item->hContact))

-			bNotProtected = db_get_b(item->hContact, szProto, "Protected") == 0;

+		if (auto *szProto = Proto_GetBaseAccountName(item->dbe.hContact))

+			bNotProtected = db_get_b(item->dbe.hContact, szProto, "Protected") == 0;

 

 	Menu_ShowItem(hmiCopy, bNotProtected);

 	Menu_ShowItem(hmiCopyText, bNotProtected);

@@ -65,11 +65,11 @@ HMENU NSMenu_Build(NewstoryListData *data, ItemData *item)
 		bShowEventActions = item->dbe.getEvent() != 0;

 

 		DB::EventInfo dbei(item->dbe.getEvent());

-		NotifyEventHooks(hEventPreBuildMenu, item->hContact, (LPARAM)&dbei);

+		NotifyEventHooks(hEventPreBuildMenu, item->dbe.hContact, (LPARAM)&dbei);

 

 		if (data->pMsgDlg) {

-			INT_PTR caps = CallProtoService(Proto_GetBaseAccountName(item->hContact), PS_GETCAPS, PFLAGNUM_4, 0);

-			Menu_ShowItem(hmiReply, (caps & PF4_REPLY) != 0 && mir_strlen(dbei.szId) > 0 && !Contact::IsReadonly(item->hContact));

+			INT_PTR caps = CallProtoService(Proto_GetBaseAccountName(item->dbe.hContact), PS_GETCAPS, PFLAGNUM_4, 0);

+			Menu_ShowItem(hmiReply, (caps & PF4_REPLY) != 0 && mir_strlen(dbei.szId) > 0 && !Contact::IsReadonly(item->dbe.hContact));

 		}

 	}

 	else {

diff --git a/plugins/NewStory/src/templates.cpp b/plugins/NewStory/src/templates.cpp
index 1097fd6226..23e5f9dcd4 100644
--- a/plugins/NewStory/src/templates.cpp
+++ b/plugins/NewStory/src/templates.cpp
@@ -247,10 +247,10 @@ CMStringW ItemData::formatHtml(const wchar_t *pwszStr)
 	SMADD_BATCHPARSE sp = {};

 	SMADD_BATCHPARSERES *spRes = nullptr;

 	if (g_plugin.bHasSmileys) {

-		sp.Protocolname = Proto_GetBaseAccountName(hContact);

+		sp.Protocolname = Proto_GetBaseAccountName(dbe.hContact);

 		sp.flag = SAFL_PATH | SAFL_UNICODE;

 		sp.str.w = wszOrigText;

-		sp.hContact = hContact;

+		sp.hContact = dbe.hContact;

 		spRes = (SMADD_BATCHPARSERES *)CallService(MS_SMILEYADD_BATCHPARSE, 0, (LPARAM)&sp);

 	}

 

@@ -453,7 +453,7 @@ CMStringW ItemData::formatStringEx(wchar_t *sztpl)
 	auto &T = templates[tpl];

 	for (auto &it : T.vf)

 		if (it)

-			it(&vars, hContact, this);

+			it(&vars, dbe.hContact, this);

 

 	for (wchar_t *p = sztpl; *p; p++) {

 		if (*p == '%') {

@@ -528,14 +528,14 @@ void vfEvent(TemplateVars *vars, MCONTACT, ItemData *item)
 	//  %N: Nickname

 	if (!item->m_bIsResult && (item->dbe.flags & DBEF_SENT)) {

 		if (!item->wszNick) {

-			char *proto = Proto_GetBaseAccountName(item->hContact);

+			char *proto = Proto_GetBaseAccountName(item->dbe.hContact);

 			ptrW nick(Contact::GetInfo(CNF_DISPLAY, 0, proto));

 			vars->SetNick(nick);

 		}

 		else vars->SetNick(item->wszNick);

 	}

 	else {

-		wchar_t *nick = (item->wszNick) ? item->wszNick : Clist_GetContactDisplayName(item->hContact, 0);

+		wchar_t *nick = (item->wszNick) ? item->wszNick : Clist_GetContactDisplayName(item->dbe.hContact, 0);

 		vars->SetNick(nick);

 	}