crazy problems require crazy solutions

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

4 files changed, 7 insertions, 10 deletions

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index cbcd8c270a..e32ff87438 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -1362,7 +1362,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 			si->wState &= ~GC_EVENT_HIGHLIGHT;

 

 			if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, 0))

-				CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)"chaticon");

+				CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)GC_FAKE_EVENT);

 		}

 

 		SendMessage(hwndDlg, GC_FIXTABICONS, 0, 0);

@@ -1490,7 +1490,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 

 		case SESSION_TERMINATE:

 			if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, 0))

-				CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)"chaticon");

+				CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)GC_FAKE_EVENT);

 			si->wState &= ~STATE_TALK;

 			db_set_w(si->hContact, si->pszModule, "ApparentMode", (LPARAM)0);

 			SendMessage(hwndDlg, GC_CLOSEWINDOW, 0, 0);

@@ -1629,7 +1629,7 @@ LABEL_SHOWWINDOW:
 		if (db_get_w(si->hContact, si->pszModule, "ApparentMode", 0) != 0)

 			db_set_w(si->hContact, si->pszModule, "ApparentMode", (LPARAM)0);

 		if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, 0))

-			CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)"chaticon");

+			CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)GC_FAKE_EVENT);

 		break;

 

 	case WM_NOTIFY:

diff --git a/plugins/TabSRMM/src/chat/chat.h b/plugins/TabSRMM/src/chat/chat.h
index 5515358a5f..025a854983 100644
--- a/plugins/TabSRMM/src/chat/chat.h
+++ b/plugins/TabSRMM/src/chat/chat.h
@@ -178,7 +178,6 @@ TCHAR*        Chat_DoRtfToTags(char* pszRtfText, SESSION_INFO *si);
 

 #include "chat_resource.h"

 

-extern char *szChatIconString;

 extern char szIndicators[];

 

 #define DEFLOGFILENAME _T("%miranda_logpath%\\%proto%\\%userid%.log")

diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp
index c3da2d9b1c..be3f0d826b 100644
--- a/plugins/TabSRMM/src/chat/tools.cpp
+++ b/plugins/TabSRMM/src/chat/tools.cpp
@@ -33,8 +33,6 @@
 

 #include "..\commonheaders.h"

 

-char *szChatIconString = "chaticon";

-

 int GetRichTextLength(HWND hwnd)

 {

 	GETTEXTLENGTHEX gtl;

@@ -59,7 +57,7 @@ static void TSAPI Chat_DismissPopup(const SESSION_INFO *si, HWND hwndPopup)
 {

 	if (si->hContact)

 		if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, 0))

-			CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)szChatIconString);

+			CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)GC_FAKE_EVENT);

 

 	if (si->hWnd && KillTimer(si->hWnd, TIMERID_FLASHWND))

 		FlashWindow(si->hWnd, FALSE);

diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index 4ef037a93c..ec32faac47 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -278,7 +278,7 @@ static void Chat_UpdateWindowState(TWindowData *dat, UINT msg)
 		if (db_get_w(si->hContact, si->pszModule , "ApparentMode", 0) != 0)

 			db_set_w(si->hContact, si->pszModule , "ApparentMode", 0);

 		if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, 0))

-			CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)szChatIconString);

+			CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)GC_FAKE_EVENT);

 

 		SendMessage(hwndDlg, GC_UPDATETITLE, 0, 1);

 		dat->dwTickLastEvent = 0;

@@ -2378,7 +2378,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 

 		case SESSION_TERMINATE:

 			if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, 0))

-				CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)szChatIconString);

+				CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)GC_FAKE_EVENT);

 

 			si->wState &= ~STATE_TALK;

 			dat->bWasDeleted = 1;

@@ -3534,7 +3534,7 @@ LABEL_SHOWWINDOW:
 

 	case WM_DESTROY:

 		if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->hContact, 0))

-			CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)szChatIconString);

+			CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->hContact, (LPARAM)GC_FAKE_EVENT);

 		si->wState &= ~STATE_TALK;

 		si->hWnd = NULL;

 		si->dat = NULL;