warning fixes

4 files changed, 7 insertions, 9 deletions

diff --git a/plugins/Scriver/src/cmdlist.h b/plugins/Scriver/src/cmdlist.h
index 5495f5f103..9b83a6f293 100644
--- a/plugins/Scriver/src/cmdlist.h
+++ b/plugins/Scriver/src/cmdlist.h
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 struct TCmdList

 {

 	MCONTACT hContact;

-	char *szCmd;

 	BOOL temporary;

+	char *szCmd;

 	TCmdList *next, *prev;

 };

 

diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp
index 85862fe33a..908a6269b1 100644
--- a/plugins/Scriver/src/msglog.cpp
+++ b/plugins/Scriver/src/msglog.cpp
@@ -97,14 +97,12 @@ int DbEventIsShown(DBEVENTINFO &dbei)
 {

 	switch (dbei.eventType) {

 	case EVENTTYPE_MESSAGE:

+	case EVENTTYPE_FILE:

 		return 1;

 

 	case EVENTTYPE_JABBER_CHATSTATES:

 	case EVENTTYPE_JABBER_PRESENCE:

 		return 0;

-

-	case EVENTTYPE_FILE:

-		return 1;

 	}

 

 	return DbEventIsCustomForMsgWindow(&dbei);

@@ -388,7 +386,7 @@ static void AppendWithCustomLinks(EventData *evt, int style, CMStringA &buf)
 

 	BOOL isAnsii = (evt->dwFlags & IEEDF_UNICODE_TEXT) == 0;

 	WCHAR *wText;

-	size_t len, laststart = 0;

+	size_t len;

 	if (isAnsii) {

 		len = mir_strlen(evt->pszText);

 		wText = mir_a2u(evt->pszText);

@@ -398,9 +396,9 @@ static void AppendWithCustomLinks(EventData *evt, int style, CMStringA &buf)
 		len = (int)mir_wstrlen(evt->pszTextW);

 	}

 

-	if (len - laststart > 0) {

+	if (len > 0) {

 		buf.AppendFormat("%s ", SetToStyle(style));

-		AppendUnicodeOrAnsiiToBufferL(buf, wText + laststart, len - laststart, isAnsii);

+		AppendUnicodeOrAnsiiToBufferL(buf, wText, len, isAnsii);

 	}

 

 	if (isAnsii)

diff --git a/plugins/Scriver/src/msgs.h b/plugins/Scriver/src/msgs.h
index 4139351b64..f7b11640b2 100644
--- a/plugins/Scriver/src/msgs.h
+++ b/plugins/Scriver/src/msgs.h
@@ -277,7 +277,6 @@ class CErrorDlg : public CDlgBase
 	ptrW m_wszText;

 	CMStringW m_wszName, m_wszDescr;

 	MessageSendQueueItem *m_queueItem;

-	HWND m_hwndParent;

 

 	CCtrlButton m_btnOk, m_btnCancel;

 

diff --git a/plugins/Scriver/src/msgtimedout.cpp b/plugins/Scriver/src/msgtimedout.cpp
index c003ab2913..02a6778fee 100644
--- a/plugins/Scriver/src/msgtimedout.cpp
+++ b/plugins/Scriver/src/msgtimedout.cpp
@@ -27,12 +27,13 @@ CErrorDlg::CErrorDlg(const wchar_t *pwszDescr, HWND hWnd, MessageSendQueueItem *
 	: CDlgBase(g_plugin, IDD_MSGSENDERROR),

 	m_wszText(mir_utf8decodeW(pItem->sendBuffer)),

 	m_wszDescr(pwszDescr != nullptr ? pwszDescr : TranslateT("An unknown error has occurred.")),

-	m_hwndParent(hWnd),

 	m_queueItem(pItem),

 

 	m_btnOk(this, IDOK),

 	m_btnCancel(this, IDCANCEL)

 {

+	SetParent(hWnd);

+

 	const wchar_t *pwszName = Clist_GetContactDisplayName(pItem->hContact);

 	if (pwszName)

 		m_wszName.Format(L"%s - %s", TranslateT("Send error"), pwszName);