diff options
Diffstat (limited to 'src/core/stdmsg')
| -rw-r--r-- | src/core/stdmsg/src/cmdlist.cpp | 4 | ||||
| -rw-r--r-- | src/core/stdmsg/src/cmdlist.h | 6 | ||||
| -rw-r--r-- | src/core/stdmsg/src/globals.cpp | 4 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgdialog.cpp | 10 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msglog.cpp | 4 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgoptions.cpp | 4 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgs.cpp | 36 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgs.h | 6 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgtimedout.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/statusicon.cpp | 8 | ||||
| -rw-r--r-- | src/core/stdmsg/src/statusicon.h | 6 | 
11 files changed, 45 insertions, 45 deletions
diff --git a/src/core/stdmsg/src/cmdlist.cpp b/src/core/stdmsg/src/cmdlist.cpp index 90be69418b..b4a326a5b3 100644 --- a/src/core/stdmsg/src/cmdlist.cpp +++ b/src/core/stdmsg/src/cmdlist.cpp @@ -89,7 +89,7 @@ static VOID CALLBACK MsgTimer(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTi  		MessageFailureProcess(tmlst[i], LPGEN("The message send timed out."));
  }
 -void msgQueue_add(HCONTACT hContact, int id, const TCHAR* szMsg, HANDLE hDbEvent)
 +void msgQueue_add(MCONTACT hContact, int id, const TCHAR* szMsg, HANDLE hDbEvent)
  {
  	TMsgQueue *item = (TMsgQueue*)mir_alloc(sizeof(TMsgQueue));
  	item->hContact = hContact;
 @@ -106,7 +106,7 @@ void msgQueue_add(HCONTACT hContact, int id, const TCHAR* szMsg, HANDLE hDbEvent  }
 -void msgQueue_processack(HCONTACT hContact, int id, BOOL success, const char* szErr)
 +void msgQueue_processack(MCONTACT hContact, int id, BOOL success, const char* szErr)
  {
  	int i;
  	TMsgQueue* item = NULL;
 diff --git a/src/core/stdmsg/src/cmdlist.h b/src/core/stdmsg/src/cmdlist.h index c82cf41666..66d273617c 100644 --- a/src/core/stdmsg/src/cmdlist.h +++ b/src/core/stdmsg/src/cmdlist.h @@ -38,15 +38,15 @@ __inline TCHAR* tcmdlist_getitem(SortedList *list, int ind)  typedef struct _TMsgQueue
  {
  	int id;
 -	HCONTACT hContact;
 +	MCONTACT hContact;
  	TCHAR* szMsg;
  	HANDLE hDbEvent;
  	unsigned ts;
  }
  TMsgQueue;
 -void msgQueue_add(HCONTACT hContact, int id, const TCHAR* szMsg, HANDLE hDbEvent);
 -void msgQueue_processack(HCONTACT hContact, int id, BOOL success, const char* szErr);
 +void msgQueue_add(MCONTACT hContact, int id, const TCHAR* szMsg, HANDLE hDbEvent);
 +void msgQueue_processack(MCONTACT hContact, int id, BOOL success, const char* szErr);
  void msgQueue_init(void);
  void msgQueue_destroy(void);
 diff --git a/src/core/stdmsg/src/globals.cpp b/src/core/stdmsg/src/globals.cpp index 15d5bc126a..71af89163b 100644 --- a/src/core/stdmsg/src/globals.cpp +++ b/src/core/stdmsg/src/globals.cpp @@ -121,7 +121,7 @@ void ReloadGlobals()  static int dbaddedevent(WPARAM wParam, LPARAM lParam)
  {
 -	HCONTACT hContact = (HCONTACT)wParam;
 +	MCONTACT hContact = (MCONTACT)wParam;
  	if (hContact) {
  		HWND h = WindowList_Find(g_dat.hMessageWindowList, hContact);
  		if (h)
 @@ -144,7 +144,7 @@ static int ackevent(WPARAM wParam, LPARAM lParam)  int AvatarChanged(WPARAM wParam, LPARAM lParam)
  {
 -	HCONTACT hContact = (HCONTACT)wParam;
 +	MCONTACT hContact = (MCONTACT)wParam;
  	HWND h = WindowList_Find(g_dat.hMessageWindowList, hContact);
  	if (h) SendMessage(h, HM_AVATARACK, wParam, lParam);
  	return 0;
 diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index 1861bf13af..23a16cc783 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -41,7 +41,7 @@ static const UINT infoLineControls[] = { IDC_PROTOCOL, IDC_NAME };  static const UINT buttonLineControls[] = { IDC_ADD, IDC_USERMENU, IDC_DETAILS, IDC_HISTORY };
  static const UINT sendControls[] = { IDC_MESSAGE };
 -static void NotifyLocalWinEvent(HCONTACT hContact, HWND hwnd, unsigned int type)
 +static void NotifyLocalWinEvent(MCONTACT hContact, HWND hwnd, unsigned int type)
  {
  	if (hContact == NULL || hwnd == NULL)
  		return;
 @@ -58,7 +58,7 @@ static void NotifyLocalWinEvent(HCONTACT hContact, HWND hwnd, unsigned int type)  	NotifyEventHooks(hHookWinEvt, 0, (LPARAM)&mwe);
  }
 -static BOOL IsUtfSendAvailable(HCONTACT hContact)
 +static BOOL IsUtfSendAvailable(MCONTACT hContact)
  {
  	char* szProto = GetContactProto(hContact);
  	if ( szProto == NULL )
 @@ -80,7 +80,7 @@ static int RTL_Detect(const TCHAR *ptszText)  	return 0;
  }
 -HANDLE SendMessageDirect(const TCHAR *szMsg, HCONTACT hContact, char *szProto)
 +HANDLE SendMessageDirect(const TCHAR *szMsg, MCONTACT hContact, char *szProto)
  {
  	if (hContact == NULL)
  		return NULL;
 @@ -1308,7 +1308,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP  		break;
  	case HM_DBEVENTADDED:
 -		if ((HCONTACT)wParam == dat->hContact) {
 +		if ((MCONTACT)wParam == dat->hContact) {
  			HANDLE hDbEvent = (HANDLE)lParam;
  			if (dat->hDbEventFirst == NULL)
  				dat->hDbEventFirst = hDbEvent;
 @@ -1751,7 +1751,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP  		if (hFont != NULL && hFont != (HFONT)SendDlgItemMessage(hwndDlg, IDOK, WM_GETFONT, 0, 0))
  			DeleteObject(hFont);
 -		HCONTACT hContact;
 +		MCONTACT hContact;
  		if (db_get_b(NULL, SRMMMOD, SRMSGSET_SAVEPERCONTACT, SRMSGDEFSET_SAVEPERCONTACT))
  			hContact = dat->hContact;
  		else
 diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp index 4775242489..1aedcf4640 100644 --- a/src/core/stdmsg/src/msglog.cpp +++ b/src/core/stdmsg/src/msglog.cpp @@ -37,7 +37,7 @@ static int logIconBmpSize[ SIZEOF(pLogIconBmpBits) ];  struct LogStreamData
  {
  	int stage;
 -	HCONTACT hContact;
 +	MCONTACT hContact;
  	HANDLE hDbEvent, hDbEventLast;
  	char *buffer;
  	int bufferOffset, bufferLen;
 @@ -263,7 +263,7 @@ int DbEventIsShown(DBEVENTINFO * dbei, SrmmWindowData *dat)  }
  //mir_free() the return value
 -static char *CreateRTFFromDbEvent(SrmmWindowData *dat, HCONTACT hContact, HANDLE hDbEvent, struct LogStreamData *streamData)
 +static char *CreateRTFFromDbEvent(SrmmWindowData *dat, MCONTACT hContact, HANDLE hDbEvent, struct LogStreamData *streamData)
  {
  	char *buffer;
  	int bufferAlloced, bufferEnd;
 diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 511de0a1f1..21728424bb 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -449,7 +449,7 @@ static void RebuildList(HWND hwndDlg, HANDLE hItemNew, HANDLE hItemUnknown)  	if (hItemUnknown && db_get_b(NULL, SRMMMOD, SRMSGSET_TYPINGUNKNOWN, SRMSGDEFSET_TYPINGUNKNOWN))
  		SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM) hItemUnknown, 1);
 -	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 +	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
  		HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM) hContact, 0);
  		if (hItem && db_get_b(hContact, SRMMMOD, SRMSGSET_TYPING, defType))
  			SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM) hItem, 1);
 @@ -464,7 +464,7 @@ static void SaveList(HWND hwndDlg, HANDLE hItemNew, HANDLE hItemUnknown)  	if (hItemUnknown)
  		db_set_b(NULL, SRMMMOD, SRMSGSET_TYPINGUNKNOWN, (BYTE) (SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM) hItemUnknown, 0) ? 1 : 0));
 -	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 +	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
  		HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);
  		if (hItem)
  			db_set_b(hContact, SRMMMOD, SRMSGSET_TYPING, (BYTE) (SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM) hItem, 0) ? 1 : 0));
 diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 256790d429..c448ec70f5 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -59,7 +59,7 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam)  	CallServiceSync(MS_CLIST_REMOVEEVENT, wParam, (LPARAM) 1);
  	/* does a window for the contact exist? */
 -	HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, (HCONTACT)wParam);
 +	HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, (MCONTACT)wParam);
  	if (hwnd) {
  		if (!db_get_b(NULL, SRMMMOD, SRMSGSET_DONOTSTEALFOCUS, SRMSGDEFSET_DONOTSTEALFOCUS)) {
  			ShowWindow(hwnd, SW_RESTORE);
 @@ -78,10 +78,10 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam)  	/* new message */
  	SkinPlaySound("AlertMsg");
 -	char *szProto = GetContactProto((HCONTACT)wParam);
 +	char *szProto = GetContactProto((MCONTACT)wParam);
  	if (szProto && (g_dat.openFlags & SRMMStatusToPf2(CallProtoService(szProto, PS_GETSTATUS, 0, 0)))) {
  		NewMessageWindowLParam newData = { 0 };
 -		newData.hContact = (HCONTACT)wParam;
 +		newData.hContact = (MCONTACT)wParam;
  		newData.noActivate = db_get_b(NULL, SRMMMOD, SRMSGSET_DONOTSTEALFOCUS, SRMSGDEFSET_DONOTSTEALFOCUS);
  		CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_MSG), NULL, DlgProcMessage, (LPARAM)&newData);
  		return 0;
 @@ -89,21 +89,21 @@ static int MessageEventAdded(WPARAM wParam, LPARAM lParam)  	TCHAR toolTip[256], *contactName;
  	CLISTEVENT cle = { sizeof(cle) };
 -	cle.hContact = (HCONTACT)wParam;
 +	cle.hContact = (MCONTACT)wParam;
  	cle.hDbEvent = (HANDLE)lParam;
  	cle.flags = CLEF_TCHAR;
  	cle.hIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE);
  	cle.pszService = "SRMsg/ReadMessage";
 -	contactName = pcli->pfnGetContactDisplayName((HCONTACT)wParam, 0);
 +	contactName = pcli->pfnGetContactDisplayName((MCONTACT)wParam, 0);
  	mir_sntprintf(toolTip, SIZEOF(toolTip), TranslateT("Message from %s"), contactName);
  	cle.ptszTooltip = toolTip;
  	CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cle);
  	return 0;
  }
 -INT_PTR SendMessageCmd(HCONTACT hContact, char* msg, int isWchar)
 +INT_PTR SendMessageCmd(MCONTACT hContact, char* msg, int isWchar)
  {
 -	/* does the HCONTACT's protocol support IM messages? */
 +	/* does the MCONTACT's protocol support IM messages? */
  	char *szProto = GetContactProto(hContact);
  	if (!szProto || (!CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IMSEND))
  		return 1;
 @@ -135,12 +135,12 @@ INT_PTR SendMessageCmd(HCONTACT hContact, char* msg, int isWchar)  static INT_PTR SendMessageCommand_W(WPARAM wParam, LPARAM lParam)
  {
 -	return SendMessageCmd((HCONTACT)wParam, (char*)lParam, TRUE);
 +	return SendMessageCmd((MCONTACT)wParam, (char*)lParam, TRUE);
  }
  static INT_PTR SendMessageCommand(WPARAM wParam, LPARAM lParam)
  {
 -	return SendMessageCmd((HCONTACT)wParam, (char*)lParam, FALSE);
 +	return SendMessageCmd((MCONTACT)wParam, (char*)lParam, FALSE);
  }
  static INT_PTR ReadMessageCommand(WPARAM wParam, LPARAM lParam)
 @@ -159,12 +159,12 @@ static int TypingMessage(WPARAM wParam, LPARAM lParam)  	SkinPlaySound((lParam) ? "TNStart" : "TNStop");
 -	HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, (HCONTACT)wParam);
 +	HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, (MCONTACT)wParam);
  	if (hwnd)
  		SendMessage(hwnd, DM_TYPING, 0, lParam);
  	else if (lParam && (g_dat.flags & SMF_SHOWTYPINGTRAY)) {
  		TCHAR szTip[256];
 -		mir_sntprintf(szTip, SIZEOF(szTip), TranslateT("%s is typing a message"), pcli->pfnGetContactDisplayName((HCONTACT)wParam, 0));
 +		mir_sntprintf(szTip, SIZEOF(szTip), TranslateT("%s is typing a message"), pcli->pfnGetContactDisplayName((MCONTACT)wParam, 0));
  		if (ServiceExists(MS_CLIST_SYSTRAY_NOTIFY) && !(g_dat.flags&SMF_SHOWTYPINGCLIST)) {
  			MIRANDASYSTRAYNOTIFY tn = { sizeof(tn) };
 @@ -177,7 +177,7 @@ static int TypingMessage(WPARAM wParam, LPARAM lParam)  		}
  		else {
  			CLISTEVENT cle = { sizeof(cle) };
 -			cle.hContact = (HCONTACT)wParam;
 +			cle.hContact = (MCONTACT)wParam;
  			cle.hDbEvent = (HANDLE)1;
  			cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR;
  			cle.hIcon = LoadSkinnedIcon( SKINICON_OTHER_TYPING );
 @@ -194,7 +194,7 @@ static int TypingMessage(WPARAM wParam, LPARAM lParam)  static int MessageSettingChanged(WPARAM wParam, LPARAM lParam)
  {
  	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING *) lParam;
 -	HCONTACT hContact = (HCONTACT)wParam;
 +	MCONTACT hContact = (MCONTACT)wParam;
  	if (cws->szModule == NULL) return 0;
 @@ -204,7 +204,7 @@ static int MessageSettingChanged(WPARAM wParam, LPARAM lParam)  		if (cws->szSetting && !strcmp(cws->szSetting, "Timezone"))
  			WindowList_Broadcast(g_dat.hMessageWindowList, DM_NEWTIMEZONE, (WPARAM) cws, 0);
  		else {
 -			char *szProto = GetContactProto((HCONTACT)wParam);
 +			char *szProto = GetContactProto((MCONTACT)wParam);
  			if (szProto && !strcmp(cws->szModule, szProto))
  				WindowList_Broadcast(g_dat.hMessageWindowList, DM_UPDATETITLE, (WPARAM) cws, 0);
  		}
 @@ -215,7 +215,7 @@ static int MessageSettingChanged(WPARAM wParam, LPARAM lParam)  static int ContactDeleted(WPARAM wParam, LPARAM lParam)
  {
  	HWND hwnd;
 -	if (hwnd = WindowList_Find(g_dat.hMessageWindowList, (HCONTACT)wParam))
 +	if (hwnd = WindowList_Find(g_dat.hMessageWindowList, (MCONTACT)wParam))
  		SendMessage(hwnd, WM_CLOSE, 0, 0);
  	return 0;
 @@ -235,7 +235,7 @@ static void RestoreUnreadMessageAlerts(void)  	DBEVENTINFO dbei = { sizeof(dbei) };
 -	for (HCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 +	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
  		HANDLE hDbEvent = db_event_firstUnread(hContact);
  		while (hDbEvent) {
  			autoPopup = 0;
 @@ -315,7 +315,7 @@ static int IconsChanged(WPARAM, LPARAM)  static int PrebuildContactMenu(WPARAM wParam, LPARAM lParam)
  {
 -	HCONTACT hContact = (HCONTACT)wParam;
 +	MCONTACT hContact = (MCONTACT)wParam;
  	if (hContact) {
  		bool bEnabled = false;
  		char *szProto = GetContactProto(hContact);
 @@ -346,7 +346,7 @@ static INT_PTR GetWindowClass(WPARAM wParam, LPARAM lParam)  static INT_PTR SetStatusText(WPARAM wParam, LPARAM lParam)
  {
 -	HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, (HCONTACT)wParam);
 +	HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, (MCONTACT)wParam);
  	if (hwnd == NULL)
  		return 1;
 diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h index 29cbf7520e..c2f4d36e63 100644 --- a/src/core/stdmsg/src/msgs.h +++ b/src/core/stdmsg/src/msgs.h @@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  struct NewMessageWindowLParam
  {
 -	HCONTACT hContact;
 +	MCONTACT hContact;
  	const char *szInitialText;
  	int isWchar;
  	int noActivate;
 @@ -35,7 +35,7 @@ struct NewMessageWindowLParam  struct SrmmWindowData
  {
 -	HCONTACT hContact;
 +	MCONTACT hContact;
  	HANDLE hDbEventFirst, hDbEventLast;
  	HBRUSH hBkgBrush;
  	int splitterPos, originalSplitterPos;
 @@ -117,7 +117,7 @@ INT_PTR CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar  int DbEventIsForMsgWindow(DBEVENTINFO *dbei);
  int DbEventIsShown(DBEVENTINFO * dbei, SrmmWindowData *dat);
  void StreamInEvents(HWND hwndDlg, HANDLE hDbEventFirst, int count, int fAppend);
 -HANDLE SendMessageDirect(const TCHAR *szMsg, HCONTACT hContact, char *szProto);
 +HANDLE SendMessageDirect(const TCHAR *szMsg, MCONTACT hContact, char *szProto);
  void LoadMsgLogIcons(void);
  void FreeMsgLogIcons(void);
 diff --git a/src/core/stdmsg/src/msgtimedout.cpp b/src/core/stdmsg/src/msgtimedout.cpp index f8c8b82f49..b42875447f 100644 --- a/src/core/stdmsg/src/msgtimedout.cpp +++ b/src/core/stdmsg/src/msgtimedout.cpp @@ -28,7 +28,7 @@ typedef struct  	TMsgQueue *item;
  } ErrorDlgParam;
 -INT_PTR SendMessageCmd(HCONTACT hContact, char* msg, int isWchar);
 +INT_PTR SendMessageCmd(MCONTACT hContact, char* msg, int isWchar);
  INT_PTR CALLBACK ErrorDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
  {
 diff --git a/src/core/stdmsg/src/statusicon.cpp b/src/core/stdmsg/src/statusicon.cpp index 060f950aa0..e969085c22 100644 --- a/src/core/stdmsg/src/statusicon.cpp +++ b/src/core/stdmsg/src/statusicon.cpp @@ -26,7 +26,7 @@ HANDLE hHookIconPressedEvt;  static int OnSrmmIconChanged(WPARAM wParam, LPARAM)
  {
 -	HCONTACT hContact = (HCONTACT)wParam;
 +	MCONTACT hContact = (MCONTACT)wParam;
  	if (hContact == NULL)
  		WindowList_Broadcast(g_dat.hMessageWindowList, DM_STATUSICONCHANGE, 0, 0);
  	else {
 @@ -37,7 +37,7 @@ static int OnSrmmIconChanged(WPARAM wParam, LPARAM)  	return 0;
  }
 -void DrawStatusIcons(HCONTACT hContact, HDC hDC, RECT r, int gap)
 +void DrawStatusIcons(MCONTACT hContact, HDC hDC, RECT r, int gap)
  {
  	HICON hIcon;
  	int x = r.left;
 @@ -55,7 +55,7 @@ void DrawStatusIcons(HCONTACT hContact, HDC hDC, RECT r, int gap)  	}
  }
 -void CheckIconClick(HCONTACT hContact, HWND hwndFrom, POINT pt, RECT r, int gap, int click_flags)
 +void CheckIconClick(MCONTACT hContact, HWND hwndFrom, POINT pt, RECT r, int gap, int click_flags)
  {
  	int iconNum = (pt.x - r.left) / (GetSystemMetrics(SM_CXSMICON) + gap);
  	StatusIconData *sid = Srmm_GetNthIcon(hContact, iconNum);
 @@ -88,7 +88,7 @@ int DeinitStatusIcons()  	return 0;
  }
 -int GetStatusIconsCount(HCONTACT hContact)
 +int GetStatusIconsCount(MCONTACT hContact)
  {
  	int nIcon = 0;
  	while ( Srmm_GetNthIcon(hContact, nIcon) != NULL)
 diff --git a/src/core/stdmsg/src/statusicon.h b/src/core/stdmsg/src/statusicon.h index 2da94eab1a..8afbbfb0bb 100644 --- a/src/core/stdmsg/src/statusicon.h +++ b/src/core/stdmsg/src/statusicon.h @@ -7,8 +7,8 @@ extern int status_icon_list_size;  int InitStatusIcons();
  int DeinitStatusIcons();
 -int  GetStatusIconsCount(HCONTACT hContact);
 -void DrawStatusIcons(HCONTACT hContact, HDC hdc, RECT r, int gap);
 -void CheckIconClick(HCONTACT hContact, HWND hwndFrom, POINT pt, RECT r, int gap, int flags);
 +int  GetStatusIconsCount(MCONTACT hContact);
 +void DrawStatusIcons(MCONTACT hContact, HDC hdc, RECT r, int gap);
 +void CheckIconClick(MCONTACT hContact, HWND hwndFrom, POINT pt, RECT r, int gap, int flags);
  #endif
  | 
