From c992cb2fdc11f1cac4bc5cbce26e8e2bb3b57da0 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 26 Jun 2012 16:50:14 +0000
Subject: - microkernel addded; - version bumped to 0.92.2

git-svn-id: http://svn.miranda-ng.org/main/trunk@641 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Scriver/msglog.cpp   |  2 +-
 plugins/Scriver/richutil.cpp | 10 +++++-----
 plugins/Scriver/utils.cpp    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins/Scriver')

diff --git a/plugins/Scriver/msglog.cpp b/plugins/Scriver/msglog.cpp
index eaf139ce02..bb768cbb95 100644
--- a/plugins/Scriver/msglog.cpp
+++ b/plugins/Scriver/msglog.cpp
@@ -111,7 +111,7 @@ TCHAR *GetNickname(HANDLE hContact, const char* szProto) {
 					szName = a2t((char *)ci.pszVal);
 				}
 
-				miranda_sys_free(ci.pszVal);
+				mir_free(ci.pszVal);
 				if (szName != NULL) {
 					return szName;
 				}
diff --git a/plugins/Scriver/richutil.cpp b/plugins/Scriver/richutil.cpp
index 52dff7505f..069d0cfaac 100644
--- a/plugins/Scriver/richutil.cpp
+++ b/plugins/Scriver/richutil.cpp
@@ -100,7 +100,7 @@ void RichUtil_Load(void)
 
 void RichUtil_Unload(void) 
 {
-	li.List_Destroy(&sListInt);
+	List_Destroy(&sListInt);
 	DeleteCriticalSection(&csRich);
 	if (mTheme)
 		FreeLibrary(mTheme);
@@ -118,8 +118,8 @@ int RichUtil_SubClass(HWND hwndEdit)
 		ru->hasUglyBorder = 0;
 
 		EnterCriticalSection(&csRich);
-		if (!li.List_GetIndex(&sListInt, ru, &idx))
-			li.List_Insert(&sListInt, ru, idx);
+		if (!List_GetIndex(&sListInt, ru, &idx))
+			List_Insert(&sListInt, ru, idx);
 		LeaveCriticalSection(&csRich);
 
 		ru->origProc = (WNDPROC)SetWindowLongPtr(ru->hwnd, GWLP_WNDPROC, (LONG_PTR)&RichUtil_Proc);
@@ -137,7 +137,7 @@ static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 	tru.hwnd = hwnd;
 
 	EnterCriticalSection(&csRich);
-	if (li.List_GetIndex(&sListInt, &tru, &idx))
+	if (List_GetIndex(&sListInt, &tru, &idx))
 		ru = (TRichUtil*)sListInt.items[idx];
 	LeaveCriticalSection(&csRich);
 
@@ -242,7 +242,7 @@ static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 			}
 
 			EnterCriticalSection(&csRich);
-			li.List_Remove(&sListInt, idx);
+			List_Remove(&sListInt, idx);
 			LeaveCriticalSection(&csRich);
 
 			mir_free(ru);
diff --git a/plugins/Scriver/utils.cpp b/plugins/Scriver/utils.cpp
index e9a9dacad2..3551119adc 100644
--- a/plugins/Scriver/utils.cpp
+++ b/plugins/Scriver/utils.cpp
@@ -545,7 +545,7 @@ void GetContactUniqueId(struct SrmmWindowData *dat, char *buf, int maxlen) {
         switch (ci.type) {
             case CNFT_ASCIIZ:
                 mir_snprintf(buf, maxlen, "%s", ci.pszVal);
-                miranda_sys_free(ci.pszVal);
+                mir_free(ci.pszVal);
                 break;
             case CNFT_DWORD:
                 mir_snprintf(buf, maxlen, "%u", ci.dVal);
-- 
cgit v1.2.3