- all MS_CLIST_ADD*ITEM services replaced with Menu_Add*Item stubs.

- massive cleanup of the menu-related code

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

1 files changed, 162 insertions, 162 deletions

diff --git a/src/modules/ignore/ignore.cpp b/src/modules/ignore/ignore.cpp
index 17c62f00cd..2c3ca8ba78 100644
--- a/src/modules/ignore/ignore.cpp
+++ b/src/modules/ignore/ignore.cpp
@@ -11,7 +11,7 @@ modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2

 of the License, or (at your option) any later version.

 

-This program is distributed in the hope that it will be useful,

+This program is distributed in the hope that it will be useful, 

 but WITHOUT ANY WARRANTY; without even the implied warranty of

 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 GNU General Public License for more details.

@@ -24,84 +24,84 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #define IGNOREEVENT_MAX  7

 

-static const DWORD ignoreIdToPf1[IGNOREEVENT_MAX]={PF1_IMRECV,PF1_URLRECV,PF1_FILERECV,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF};

-static const DWORD ignoreIdToPf4[IGNOREEVENT_MAX]={0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,PF4_SUPPORTTYPING};

+static const DWORD ignoreIdToPf1[IGNOREEVENT_MAX]={PF1_IMRECV, PF1_URLRECV, PF1_FILERECV, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF};

+static const DWORD ignoreIdToPf4[IGNOREEVENT_MAX]={0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, PF4_SUPPORTTYPING};

 

 static DWORD GetMask(HANDLE hContact)

 {

-	DWORD mask=DBGetContactSettingDword(hContact,"Ignore","Mask1",(DWORD)(-1));

+	DWORD mask=DBGetContactSettingDword(hContact, "Ignore", "Mask1", (DWORD)(-1));

 	if (mask == (DWORD)(-1)) {

 		if (hContact == NULL) mask=0;

 		else {

-			if (DBGetContactSettingByte(hContact,"CList","Hidden",0) || DBGetContactSettingByte(hContact,"CList","NotOnList",0))

-				mask=DBGetContactSettingDword(NULL,"Ignore","Mask1",0);

+			if (DBGetContactSettingByte(hContact, "CList", "Hidden", 0) || DBGetContactSettingByte(hContact, "CList", "NotOnList", 0))

+				mask=DBGetContactSettingDword(NULL, "Ignore", "Mask1", 0);

 			else

-				mask=DBGetContactSettingDword(NULL,"Ignore","Default1",0);

+				mask=DBGetContactSettingDword(NULL, "Ignore", "Default1", 0);

 		}

 	}

 	return mask;

 }

 

-static void SetListGroupIcons(HWND hwndList,HANDLE hFirstItem,HANDLE hParentItem,int *groupChildCount)

+static void SetListGroupIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentItem, int *groupChildCount)

 {

 	int typeOfFirst;

-	int iconOn[IGNOREEVENT_MAX]={1,1,1,1,1,1,1};

-	int childCount[IGNOREEVENT_MAX]={0,0,0,0,0,0,0},i;

+	int iconOn[IGNOREEVENT_MAX]={1, 1, 1, 1, 1, 1, 1};

+	int childCount[IGNOREEVENT_MAX]={0, 0, 0, 0, 0, 0, 0}, i;

 	int iImage;

-	HANDLE hItem,hChildItem;

+	HANDLE hItem, hChildItem;

 

-	typeOfFirst=SendMessage(hwndList,CLM_GETITEMTYPE,(WPARAM)hFirstItem,0);

+	typeOfFirst=SendMessage(hwndList, CLM_GETITEMTYPE, (WPARAM)hFirstItem, 0);

 	//check groups

 	if (typeOfFirst == CLCIT_GROUP) hItem=hFirstItem;

-	else hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTGROUP,(LPARAM)hFirstItem);

+	else hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hFirstItem);

 	while (hItem) {

-		hChildItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_CHILD,(LPARAM)hItem);

-		if (hChildItem) SetListGroupIcons(hwndList,hChildItem,hItem,childCount);

+		hChildItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_CHILD, (LPARAM)hItem);

+		if (hChildItem) SetListGroupIcons(hwndList, hChildItem, hItem, childCount);

 		for (i=0; i < SIZEOF(iconOn); i++)

-			if (iconOn[i] && SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,i) == 0) iconOn[i]=0;

-		hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTGROUP,(LPARAM)hItem);

+			if (iconOn[i] && SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, i) == 0) iconOn[i]=0;

+		hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hItem);

 	}

 	//check contacts

 	if (typeOfFirst == CLCIT_CONTACT) hItem=hFirstItem;

-	else hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hFirstItem);

+	else hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hFirstItem);

 	while (hItem) {

 		for ( i=0; i < SIZEOF(iconOn); i++ ) {

-			iImage=SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,i);

+			iImage=SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, i);

 			if (iconOn[i] && iImage == 0) iconOn[i]=0;

 			if (iImage != 0xFF) childCount[i]++;

 		}

-		hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hItem);

+		hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hItem);

 	}

 	//set icons

 	for ( i=0; i < SIZEOF(iconOn); i++ ) {

-		SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hParentItem,MAKELPARAM(i,childCount[i]?(iconOn[i]?i+3:0):0xFF));

+		SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hParentItem, MAKELPARAM(i, childCount[i]?(iconOn[i]?i+3:0):0xFF));

 		if (groupChildCount) groupChildCount[i]+=childCount[i];

 	}

-	SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hParentItem,MAKELPARAM(IGNOREEVENT_MAX,1));

-	SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hParentItem,MAKELPARAM(IGNOREEVENT_MAX+1,2));

+	SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hParentItem, MAKELPARAM(IGNOREEVENT_MAX, 1));

+	SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hParentItem, MAKELPARAM(IGNOREEVENT_MAX+1, 2));

 }

 

-static void SetAllChildIcons(HWND hwndList,HANDLE hFirstItem,int iColumn,int iImage)

+static void SetAllChildIcons(HWND hwndList, HANDLE hFirstItem, int iColumn, int iImage)

 {

-	int typeOfFirst,iOldIcon;

-	HANDLE hItem,hChildItem;

+	int typeOfFirst, iOldIcon;

+	HANDLE hItem, hChildItem;

 

-	typeOfFirst=SendMessage(hwndList,CLM_GETITEMTYPE,(WPARAM)hFirstItem,0);

+	typeOfFirst=SendMessage(hwndList, CLM_GETITEMTYPE, (WPARAM)hFirstItem, 0);

 	//check groups

 	if (typeOfFirst == CLCIT_GROUP) hItem=hFirstItem;

-	else hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTGROUP,(LPARAM)hFirstItem);

+	else hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hFirstItem);

 	while (hItem) {

-		hChildItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_CHILD,(LPARAM)hItem);

-		if (hChildItem) SetAllChildIcons(hwndList,hChildItem,iColumn,iImage);

-		hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTGROUP,(LPARAM)hItem);

+		hChildItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_CHILD, (LPARAM)hItem);

+		if (hChildItem) SetAllChildIcons(hwndList, hChildItem, iColumn, iImage);

+		hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hItem);

 	}

 	//check contacts

 	if (typeOfFirst == CLCIT_CONTACT) hItem=hFirstItem;

-	else hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hFirstItem);

+	else hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hFirstItem);

 	while (hItem) {

-		iOldIcon=SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,iColumn);

-		if (iOldIcon != 0xFF && iOldIcon != iImage) SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(iColumn,iImage));

-		hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hItem);

+		iOldIcon=SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, iColumn);

+		if (iOldIcon != 0xFF && iOldIcon != iImage) SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn, iImage));

+		hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hItem);

 	}

 }

 

@@ -109,37 +109,37 @@ static void ResetListOptions(HWND hwndList)
 {

 	int i;

 

-	SendMessage(hwndList,CLM_SETBKBITMAP,0,(LPARAM)(HBITMAP)NULL);

-	SendMessage(hwndList,CLM_SETBKCOLOR,GetSysColor(COLOR_WINDOW),0);

-	SendMessage(hwndList,CLM_SETGREYOUTFLAGS,0,0);

-	SendMessage(hwndList,CLM_SETLEFTMARGIN,4,0);

-	SendMessage(hwndList,CLM_SETINDENT,10,0);

-	SendMessage(hwndList,CLM_SETHIDEEMPTYGROUPS,1,0);

+	SendMessage(hwndList, CLM_SETBKBITMAP, 0, (LPARAM)(HBITMAP)NULL);

+	SendMessage(hwndList, CLM_SETBKCOLOR, GetSysColor(COLOR_WINDOW), 0);

+	SendMessage(hwndList, CLM_SETGREYOUTFLAGS, 0, 0);

+	SendMessage(hwndList, CLM_SETLEFTMARGIN, 4, 0);

+	SendMessage(hwndList, CLM_SETINDENT, 10, 0);

+	SendMessage(hwndList, CLM_SETHIDEEMPTYGROUPS, 1, 0);

 	for (i=0;i<=FONTID_MAX;i++)

-		SendMessage(hwndList,CLM_SETTEXTCOLOR,i,GetSysColor(COLOR_WINDOWTEXT));

+		SendMessage(hwndList, CLM_SETTEXTCOLOR, i, GetSysColor(COLOR_WINDOWTEXT));

 }

 

-static void SetIconsForColumn(HWND hwndList,HANDLE hItem,HANDLE hItemAll,int iColumn,int iImage)

+static void SetIconsForColumn(HWND hwndList, HANDLE hItem, HANDLE hItemAll, int iColumn, int iImage)

 {

 	int itemType;

 

-	itemType=SendMessage(hwndList,CLM_GETITEMTYPE,(WPARAM)hItem,0);

+	itemType=SendMessage(hwndList, CLM_GETITEMTYPE, (WPARAM)hItem, 0);

 	if (itemType == CLCIT_CONTACT) {

-		int oldiImage = SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,iColumn);

+		int oldiImage = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, iColumn);

 		if (oldiImage != 0xFF&&oldiImage != iImage)

-			SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(iColumn,iImage));

+			SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn, iImage));

 	}

 	else if (itemType == CLCIT_INFO) {

-		if (hItem == hItemAll) SetAllChildIcons(hwndList,hItem,iColumn,iImage);

-		else SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(iColumn,iImage)); //hItemUnknown

+		if (hItem == hItemAll) SetAllChildIcons(hwndList, hItem, iColumn, iImage);

+		else SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn, iImage)); //hItemUnknown

 	}

 	else if (itemType == CLCIT_GROUP) {

-		hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_CHILD,(LPARAM)hItem);

-		if (hItem) SetAllChildIcons(hwndList,hItem,iColumn,iImage);

+		hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_CHILD, (LPARAM)hItem);

+		if (hItem) SetAllChildIcons(hwndList, hItem, iColumn, iImage);

 	}

 }

 

-static void InitialiseItem(HWND hwndList,HANDLE hContact,HANDLE hItem,DWORD proto1Caps,DWORD proto4Caps)

+static void InitialiseItem(HWND hwndList, HANDLE hContact, HANDLE hItem, DWORD proto1Caps, DWORD proto4Caps)

 {

 	DWORD mask;

 	int i;

@@ -147,51 +147,51 @@ static void InitialiseItem(HWND hwndList,HANDLE hContact,HANDLE hItem,DWORD prot
 	mask=GetMask(hContact);

 	for (i=0;i<IGNOREEVENT_MAX;i++)

 		if ((ignoreIdToPf1[i] == 0xFFFFFFFF&&ignoreIdToPf4[i] == 0xFFFFFFFF) || (proto1Caps&ignoreIdToPf1[i]||proto4Caps&ignoreIdToPf4[i]))

-			SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(i,mask&(1<<i)?i+3:0));

-	SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(IGNOREEVENT_MAX,1));

-	SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(IGNOREEVENT_MAX+1,2));

+			SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(i, mask&(1<<i)?i+3:0));

+	SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(IGNOREEVENT_MAX, 1));

+	SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(IGNOREEVENT_MAX+1, 2));

 }

 

-static void SaveItemMask(HWND hwndList,HANDLE hContact,HANDLE hItem,const char *pszSetting)

+static void SaveItemMask(HWND hwndList, HANDLE hContact, HANDLE hItem, const char *pszSetting)

 {

 	DWORD mask;

-	int i,iImage;

+	int i, iImage;

 

 	mask=0;

 	for (i=0;i<IGNOREEVENT_MAX;i++) {

-		iImage=SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(i,0));

+		iImage=SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(i, 0));

 		if (iImage && iImage != 0xFF) mask|=1<<i;

 	}

-	DBWriteContactSettingDword(hContact,"Ignore",pszSetting,mask);

+	DBWriteContactSettingDword(hContact, "Ignore", pszSetting, mask);

 }

 

 static void SetAllContactIcons(HWND hwndList)

 {

-	HANDLE hContact,hItem;

+	HANDLE hContact, hItem;

 	DWORD proto1Caps, proto4Caps;

 	char *szProto;

 

-	hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0);

+	hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

 	do {

-		hItem=(HANDLE)SendMessage(hwndList,CLM_FINDCONTACT,(WPARAM)hContact,0);

-		if (hItem && SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(IGNOREEVENT_MAX,0)) == 0xFF) {

-			szProto=(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO,(WPARAM)hContact,0);

+		hItem=(HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0);

+		if (hItem && SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(IGNOREEVENT_MAX, 0)) == 0xFF) {

+			szProto=(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

 			if (szProto == NULL) proto1Caps=proto4Caps=0;

 			else {

-                proto1Caps=CallProtoService(szProto,PS_GETCAPS,PFLAGNUM_1,0);

-                proto4Caps=CallProtoService(szProto,PS_GETCAPS,PFLAGNUM_4,0);

+                proto1Caps=CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0);

+                proto4Caps=CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0);

             }

-			InitialiseItem(hwndList,hContact,hItem,proto1Caps,proto4Caps);

-			if (!DBGetContactSettingByte(hContact,"CList","Hidden",0))

-				SendMessage(hwndList,CLM_SETCHECKMARK,(WPARAM)hItem,1);

+			InitialiseItem(hwndList, hContact, hItem, proto1Caps, proto4Caps);

+			if (!DBGetContactSettingByte(hContact, "CList", "Hidden", 0))

+				SendMessage(hwndList, CLM_SETCHECKMARK, (WPARAM)hItem, 1);

 		}

-	} while (hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0));

+	} while (hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0));

 }

 

 static INT_PTR CALLBACK DlgProcIgnoreOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM lParam)

 {

 	static HICON hIcons[IGNOREEVENT_MAX+2];

-	static HANDLE hItemAll,hItemUnknown;

+	static HANDLE hItemAll, hItemUnknown;

 

 	switch (msg)

 	{

@@ -199,57 +199,57 @@ static INT_PTR CALLBACK DlgProcIgnoreOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM
 			TranslateDialogDefault(hwndDlg);

 			{	HIMAGELIST hIml;

 				int i;

-				hIml=ImageList_Create(GetSystemMetrics(SM_CXSMICON),GetSystemMetrics(SM_CYSMICON),(IsWinVerXPPlus()?ILC_COLOR32:ILC_COLOR16)|ILC_MASK,3+IGNOREEVENT_MAX,3+IGNOREEVENT_MAX);

-				ImageList_AddIcon_IconLibLoaded(hIml,SKINICON_OTHER_SMALLDOT);

-				ImageList_AddIcon_IconLibLoaded(hIml,SKINICON_OTHER_FILLEDBLOB);

-				ImageList_AddIcon_IconLibLoaded(hIml,SKINICON_OTHER_EMPTYBLOB);

-				ImageList_AddIcon_IconLibLoaded(hIml,SKINICON_EVENT_MESSAGE);

-				ImageList_AddIcon_IconLibLoaded(hIml,SKINICON_EVENT_URL);

-				ImageList_AddIcon_IconLibLoaded(hIml,SKINICON_EVENT_FILE);

-				ImageList_AddIcon_IconLibLoaded(hIml,SKINICON_OTHER_USERONLINE);

-				ImageList_AddIcon_IconLibLoaded(hIml,SKINICON_OTHER_MIRANDA);

-				ImageList_AddIcon_IconLibLoaded(hIml,SKINICON_OTHER_ADDCONTACT);

-				ImageList_AddIcon_IconLibLoaded(hIml,SKINICON_OTHER_TYPING);

-

-				SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_SETEXTRAIMAGELIST,0,(LPARAM)hIml);

+				hIml=ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), (IsWinVerXPPlus()?ILC_COLOR32:ILC_COLOR16)|ILC_MASK, 3+IGNOREEVENT_MAX, 3+IGNOREEVENT_MAX);

+				ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_SMALLDOT);

+				ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_FILLEDBLOB);

+				ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_EMPTYBLOB);

+				ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_EVENT_MESSAGE);

+				ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_EVENT_URL);

+				ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_EVENT_FILE);

+				ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_USERONLINE);

+				ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_MIRANDA);

+				ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_ADDCONTACT);

+				ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_TYPING);

+

+				SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_SETEXTRAIMAGELIST, 0, (LPARAM)hIml);

 				for ( i=0; i < SIZEOF(hIcons); i++ )

-					hIcons[i]=ImageList_GetIcon(hIml,1+i,ILD_NORMAL);

+					hIcons[i]=ImageList_GetIcon(hIml, 1+i, ILD_NORMAL);

 			}

 

-			SendDlgItemMessage(hwndDlg,IDC_ALLICON,STM_SETICON,(WPARAM)hIcons[0],0);

-			SendDlgItemMessage(hwndDlg,IDC_NONEICON,STM_SETICON,(WPARAM)hIcons[1],0);

-			SendDlgItemMessage(hwndDlg,IDC_MSGICON,STM_SETICON,(WPARAM)hIcons[2],0);

-			SendDlgItemMessage(hwndDlg,IDC_URLICON,STM_SETICON,(WPARAM)hIcons[3],0);

-			SendDlgItemMessage(hwndDlg,IDC_FILEICON,STM_SETICON,(WPARAM)hIcons[4],0);

-			SendDlgItemMessage(hwndDlg,IDC_ONLINEICON,STM_SETICON,(WPARAM)hIcons[5],0);

-			SendDlgItemMessage(hwndDlg,IDC_AUTHICON,STM_SETICON,(WPARAM)hIcons[6],0);

-			SendDlgItemMessage(hwndDlg,IDC_ADDED,STM_SETICON,(WPARAM)hIcons[7],0);

-			SendDlgItemMessage(hwndDlg,IDC_TYPINGICON,STM_SETICON,(WPARAM)hIcons[8],0);

-

-			if (!SendMessage(GetParent(hwndDlg),PSM_ISEXPERT,0,0)) {

-				SetWindowLongPtr(GetDlgItem(hwndDlg,IDC_LIST),GWL_STYLE,GetWindowLongPtr(GetDlgItem(hwndDlg,IDC_LIST),GWL_STYLE)&~(CLS_CHECKBOXES|CLS_GROUPCHECKBOXES|CLS_SHOWHIDDEN));

-				SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_AUTOREBUILD,0,0);

+			SendDlgItemMessage(hwndDlg, IDC_ALLICON, STM_SETICON, (WPARAM)hIcons[0], 0);

+			SendDlgItemMessage(hwndDlg, IDC_NONEICON, STM_SETICON, (WPARAM)hIcons[1], 0);

+			SendDlgItemMessage(hwndDlg, IDC_MSGICON, STM_SETICON, (WPARAM)hIcons[2], 0);

+			SendDlgItemMessage(hwndDlg, IDC_URLICON, STM_SETICON, (WPARAM)hIcons[3], 0);

+			SendDlgItemMessage(hwndDlg, IDC_FILEICON, STM_SETICON, (WPARAM)hIcons[4], 0);

+			SendDlgItemMessage(hwndDlg, IDC_ONLINEICON, STM_SETICON, (WPARAM)hIcons[5], 0);

+			SendDlgItemMessage(hwndDlg, IDC_AUTHICON, STM_SETICON, (WPARAM)hIcons[6], 0);

+			SendDlgItemMessage(hwndDlg, IDC_ADDED, STM_SETICON, (WPARAM)hIcons[7], 0);

+			SendDlgItemMessage(hwndDlg, IDC_TYPINGICON, STM_SETICON, (WPARAM)hIcons[8], 0);

+

+			if (!SendMessage(GetParent(hwndDlg), PSM_ISEXPERT, 0, 0)) {

+				SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_LIST), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_LIST), GWL_STYLE)&~(CLS_CHECKBOXES|CLS_GROUPCHECKBOXES|CLS_SHOWHIDDEN));

+				SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_AUTOREBUILD, 0, 0);

 			}

 

-			ResetListOptions(GetDlgItem(hwndDlg,IDC_LIST));

-			SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_SETEXTRACOLUMNS,IGNOREEVENT_MAX+2,0);

+			ResetListOptions(GetDlgItem(hwndDlg, IDC_LIST));

+			SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_SETEXTRACOLUMNS, IGNOREEVENT_MAX+2, 0);

 

 			{	CLCINFOITEM cii={0};

 				cii.cbSize=sizeof(cii);

 				cii.flags=CLCIIF_GROUPFONT;

 				cii.pszText=TranslateT("** All contacts **");

-				hItemAll=(HANDLE)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_ADDINFOITEM,0,(LPARAM)&cii);

+				hItemAll=(HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_ADDINFOITEM, 0, (LPARAM)&cii);

 

 				cii.pszText=TranslateT("** Unknown contacts **");

-				hItemUnknown=(HANDLE)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_ADDINFOITEM,0,(LPARAM)&cii);

-				InitialiseItem(GetDlgItem(hwndDlg,IDC_LIST),NULL,hItemUnknown,0xFFFFFFFF,0xFFFFFFFF);

+				hItemUnknown=(HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_ADDINFOITEM, 0, (LPARAM)&cii);

+				InitialiseItem(GetDlgItem(hwndDlg, IDC_LIST), NULL, hItemUnknown, 0xFFFFFFFF, 0xFFFFFFFF);

 			}

 

-			SetAllContactIcons(GetDlgItem(hwndDlg,IDC_LIST));

-			SetListGroupIcons(GetDlgItem(hwndDlg,IDC_LIST),(HANDLE)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_GETNEXTITEM,CLGN_ROOT,0),hItemAll,NULL);

+			SetAllContactIcons(GetDlgItem(hwndDlg, IDC_LIST));

+			SetListGroupIcons(GetDlgItem(hwndDlg, IDC_LIST), (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETNEXTITEM, CLGN_ROOT, 0), hItemAll, NULL);

 			return TRUE;

 		case WM_SETFOCUS:

-			SetFocus(GetDlgItem(hwndDlg,IDC_LIST));

+			SetFocus(GetDlgItem(hwndDlg, IDC_LIST));

 			break;

 		case WM_NOTIFY:

 			switch(((LPNMHDR)lParam)->idFrom) {

@@ -258,13 +258,13 @@ static INT_PTR CALLBACK DlgProcIgnoreOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM
 					{

 						case CLN_NEWCONTACT:

 						case CLN_LISTREBUILT:

-							SetAllContactIcons(GetDlgItem(hwndDlg,IDC_LIST));

+							SetAllContactIcons(GetDlgItem(hwndDlg, IDC_LIST));

 							//fall through

 						case CLN_CONTACTMOVED:

-							SetListGroupIcons(GetDlgItem(hwndDlg,IDC_LIST),(HANDLE)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_GETNEXTITEM,CLGN_ROOT,0),hItemAll,NULL);

+							SetListGroupIcons(GetDlgItem(hwndDlg, IDC_LIST), (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETNEXTITEM, CLGN_ROOT, 0), hItemAll, NULL);

 							break;

 						case CLN_OPTIONSCHANGED:

-							ResetListOptions(GetDlgItem(hwndDlg,IDC_LIST));

+							ResetListOptions(GetDlgItem(hwndDlg, IDC_LIST));

 							break;

 						case CLN_CHECKCHANGED:

 							SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

@@ -276,24 +276,24 @@ static INT_PTR CALLBACK DlgProcIgnoreOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM
 							int iImage;

 

 							if (nm->iColumn == -1) break;

-							hItem=(HANDLE)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_HITTEST,(WPARAM)&hitFlags,MAKELPARAM(nm->pt.x,nm->pt.y));

+							hItem=(HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_HITTEST, (WPARAM)&hitFlags, MAKELPARAM(nm->pt.x, nm->pt.y));

 							if (hItem == NULL) break;

 							if (!(hitFlags&CLCHT_ONITEMEXTRA)) break;

 							if (nm->iColumn == IGNOREEVENT_MAX) {   //ignore all

 								for (iImage=0;iImage<IGNOREEVENT_MAX;iImage++)

-									SetIconsForColumn(GetDlgItem(hwndDlg,IDC_LIST),hItem,hItemAll,iImage,iImage+3);

+									SetIconsForColumn(GetDlgItem(hwndDlg, IDC_LIST), hItem, hItemAll, iImage, iImage+3);

 							}

 							else if (nm->iColumn == IGNOREEVENT_MAX+1) {	//ignore none

 								for (iImage=0;iImage<IGNOREEVENT_MAX;iImage++)

-									SetIconsForColumn(GetDlgItem(hwndDlg,IDC_LIST),hItem,hItemAll,iImage,0);

+									SetIconsForColumn(GetDlgItem(hwndDlg, IDC_LIST), hItem, hItemAll, iImage, 0);

 							}

 							else {

-								iImage=SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(nm->iColumn,0));

+								iImage=SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nm->iColumn, 0));

 								if (iImage == 0) iImage=nm->iColumn+3;

 								else if (iImage != 0xFF) iImage=0;

-								SetIconsForColumn(GetDlgItem(hwndDlg,IDC_LIST),hItem,hItemAll,nm->iColumn,iImage);

+								SetIconsForColumn(GetDlgItem(hwndDlg, IDC_LIST), hItem, hItemAll, nm->iColumn, iImage);

 							}

-							SetListGroupIcons(GetDlgItem(hwndDlg,IDC_LIST),(HANDLE)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_GETNEXTITEM,CLGN_ROOT,0),hItemAll,NULL);

+							SetListGroupIcons(GetDlgItem(hwndDlg, IDC_LIST), (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETNEXTITEM, CLGN_ROOT, 0), hItemAll, NULL);

 							SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 							break;

 						}

@@ -303,24 +303,24 @@ static INT_PTR CALLBACK DlgProcIgnoreOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM
 					switch (((LPNMHDR)lParam)->code)

 					{

 						case PSN_APPLY:

-						{	HANDLE hContact,hItem;

+						{	HANDLE hContact, hItem;

 

-							hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0);

+							hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

 							do {

-								hItem=(HANDLE)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_FINDCONTACT,(WPARAM)hContact,0);

-								if (hItem) SaveItemMask(GetDlgItem(hwndDlg,IDC_LIST),hContact,hItem,"Mask1");

-								if (SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_GETCHECKMARK,(WPARAM)hItem,0))

-									DBDeleteContactSetting(hContact,"CList","Hidden");

+								hItem=(HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);

+								if (hItem) SaveItemMask(GetDlgItem(hwndDlg, IDC_LIST), hContact, hItem, "Mask1");

+								if (SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETCHECKMARK, (WPARAM)hItem, 0))

+									DBDeleteContactSetting(hContact, "CList", "Hidden");

 								else

-									DBWriteContactSettingByte(hContact,"CList","Hidden",1);

-							} while (hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0));

-							SaveItemMask(GetDlgItem(hwndDlg,IDC_LIST),NULL,hItemAll,"Default1");

-							SaveItemMask(GetDlgItem(hwndDlg,IDC_LIST),NULL,hItemUnknown,"Mask1");

+									DBWriteContactSettingByte(hContact, "CList", "Hidden", 1);

+							} while (hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0));

+							SaveItemMask(GetDlgItem(hwndDlg, IDC_LIST), NULL, hItemAll, "Default1");

+							SaveItemMask(GetDlgItem(hwndDlg, IDC_LIST), NULL, hItemUnknown, "Mask1");

 							return TRUE;

 						}

 						case PSN_EXPERTCHANGED:

-							SetWindowLongPtr(GetDlgItem(hwndDlg,IDC_LIST),GWL_STYLE,((PSHNOTIFY*)lParam)->lParam?GetWindowLongPtr(GetDlgItem(hwndDlg,IDC_LIST),GWL_STYLE)|CLS_CHECKBOXES|CLS_GROUPCHECKBOXES|CLS_SHOWHIDDEN:GetWindowLongPtr(GetDlgItem(hwndDlg,IDC_LIST),GWL_STYLE)&~(CLS_CHECKBOXES|CLS_GROUPCHECKBOXES|CLS_SHOWHIDDEN));

-							SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_AUTOREBUILD,0,0);

+							SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_LIST), GWL_STYLE, ((PSHNOTIFY*)lParam)->lParam?GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_LIST), GWL_STYLE)|CLS_CHECKBOXES|CLS_GROUPCHECKBOXES|CLS_SHOWHIDDEN:GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_LIST), GWL_STYLE)&~(CLS_CHECKBOXES|CLS_GROUPCHECKBOXES|CLS_SHOWHIDDEN));

+							SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_AUTOREBUILD, 0, 0);

 							break;

 					}

 					break;

@@ -331,7 +331,7 @@ static INT_PTR CALLBACK DlgProcIgnoreOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM
 			HIMAGELIST hIml;

 			for ( i=0; i < SIZEOF(hIcons); i++ )

 				DestroyIcon(hIcons[i]);

-			hIml=(HIMAGELIST)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_GETEXTRAIMAGELIST,0,0);

+			hIml=(HIMAGELIST)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGELIST, 0, 0);

 			ImageList_Destroy(hIml);

 			break;

 		}

@@ -357,61 +357,61 @@ static int IgnoreOptInitialise(WPARAM wParam, LPARAM)
 	return 0;

 }

 

-static INT_PTR IsIgnored(WPARAM wParam,LPARAM lParam)

+static INT_PTR IsIgnored(WPARAM wParam, LPARAM lParam)

 {

 	DWORD mask=GetMask((HANDLE)wParam);

 	if (lParam<1 || lParam>IGNOREEVENT_MAX) return 1;

 	return (mask>>(lParam-1))&1;

 }

 

-static INT_PTR Ignore(WPARAM wParam,LPARAM lParam)

+static INT_PTR Ignore(WPARAM wParam, LPARAM lParam)

 {

 	DWORD mask=GetMask((HANDLE)wParam);

 	if ((lParam<1 || lParam>IGNOREEVENT_MAX) && lParam != IGNOREEVENT_ALL) return 1;

 	if (lParam == IGNOREEVENT_ALL) mask=(1<<IGNOREEVENT_MAX)-1;

 	else mask|=1<<(lParam-1);

-	DBWriteContactSettingDword((HANDLE)wParam,"Ignore","Mask1",mask);

+	DBWriteContactSettingDword((HANDLE)wParam, "Ignore", "Mask1", mask);

 	return 0;

 }

 

-static INT_PTR Unignore(WPARAM wParam,LPARAM lParam)

+static INT_PTR Unignore(WPARAM wParam, LPARAM lParam)

 {

 	DWORD mask=GetMask((HANDLE)wParam);

 	if ((lParam<1 || lParam>IGNOREEVENT_MAX) && lParam != IGNOREEVENT_ALL) return 1;

 	if (lParam == IGNOREEVENT_ALL) mask=0;

 	else mask&=~(1<<(lParam-1));

-	DBWriteContactSettingDword((HANDLE)wParam,"Ignore","Mask1",mask);

+	DBWriteContactSettingDword((HANDLE)wParam, "Ignore", "Mask1", mask);

 	return 0;

 }

 

 static int IgnoreContactAdded(WPARAM wParam, LPARAM)

 {

-	CallService(MS_PROTO_ADDTOCONTACT,wParam,(LPARAM)"Ignore");

+	CallService(MS_PROTO_ADDTOCONTACT, wParam, (LPARAM)"Ignore");

 	return 0;

 }

 

-static INT_PTR IgnoreRecvMessage(WPARAM wParam,LPARAM lParam)

+static INT_PTR IgnoreRecvMessage(WPARAM wParam, LPARAM lParam)

 {

-	if (IsIgnored((WPARAM)((CCSDATA*)lParam)->hContact,IGNOREEVENT_MESSAGE)) return 1;

-	return CallService(MS_PROTO_CHAINRECV,wParam,lParam);

+	if (IsIgnored((WPARAM)((CCSDATA*)lParam)->hContact, IGNOREEVENT_MESSAGE)) return 1;

+	return CallService(MS_PROTO_CHAINRECV, wParam, lParam);

 }

 

-static INT_PTR IgnoreRecvUrl(WPARAM wParam,LPARAM lParam)

+static INT_PTR IgnoreRecvUrl(WPARAM wParam, LPARAM lParam)

 {

-	if (IsIgnored((WPARAM)((CCSDATA*)lParam)->hContact,IGNOREEVENT_URL)) return 1;

-	return CallService(MS_PROTO_CHAINRECV,wParam,lParam);

+	if (IsIgnored((WPARAM)((CCSDATA*)lParam)->hContact, IGNOREEVENT_URL)) return 1;

+	return CallService(MS_PROTO_CHAINRECV, wParam, lParam);

 }

 

-static INT_PTR IgnoreRecvFile(WPARAM wParam,LPARAM lParam)

+static INT_PTR IgnoreRecvFile(WPARAM wParam, LPARAM lParam)

 {

-	if (IsIgnored((WPARAM)((CCSDATA*)lParam)->hContact,IGNOREEVENT_FILE)) return 1;

-	return CallService(MS_PROTO_CHAINRECV,wParam,lParam);

+	if (IsIgnored((WPARAM)((CCSDATA*)lParam)->hContact, IGNOREEVENT_FILE)) return 1;

+	return CallService(MS_PROTO_CHAINRECV, wParam, lParam);

 }

 

-static INT_PTR IgnoreRecvAuth(WPARAM wParam,LPARAM lParam)

+static INT_PTR IgnoreRecvAuth(WPARAM wParam, LPARAM lParam)

 {

-	if (IsIgnored((WPARAM)((CCSDATA*)lParam)->hContact,IGNOREEVENT_AUTHORIZATION)) return 1;

-	return CallService(MS_PROTO_CHAINRECV,wParam,lParam);

+	if (IsIgnored((WPARAM)((CCSDATA*)lParam)->hContact, IGNOREEVENT_AUTHORIZATION)) return 1;

+	return CallService(MS_PROTO_CHAINRECV, wParam, lParam);

 }

 

 static int IgnoreAddedNotify(WPARAM, LPARAM lParam)

@@ -421,7 +421,7 @@ static int IgnoreAddedNotify(WPARAM, LPARAM lParam)
 		HANDLE hContact;

 		

 		hContact=*((PHANDLE)(dbei->pBlob+sizeof(DWORD)));

-		if (CallService(MS_DB_CONTACT_IS,(WPARAM)hContact,0) && IsIgnored((WPARAM)hContact,IGNOREEVENT_YOUWEREADDED)) 

+		if (CallService(MS_DB_CONTACT_IS, (WPARAM)hContact, 0) && IsIgnored((WPARAM)hContact, IGNOREEVENT_YOUWEREADDED)) 

 			return 1;

 	}

 	return 0;

@@ -431,7 +431,7 @@ static int IgnoreModernOptInit(WPARAM wParam, LPARAM)
 {

 	static int iBoldControls[] =

 	{

-		IDC_TXT_TITLE1, IDC_TXT_TITLE2, IDC_TXT_TITLE3,

+		IDC_TXT_TITLE1, IDC_TXT_TITLE2, IDC_TXT_TITLE3, 

 		MODERNOPT_CTRL_LAST

 	};

 

@@ -456,26 +456,26 @@ int LoadIgnoreModule(void)
 	pd.cbSize=sizeof(pd);

 	pd.szName="Ignore";

 	pd.type=PROTOTYPE_IGNORE;

-	CallService(MS_PROTO_REGISTERMODULE,0,(LPARAM)&pd);

+	CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);

 

-	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0);

+	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

 	while ( hContact != NULL ) {

-		if (!CallService(MS_PROTO_ISPROTOONCONTACT,(WPARAM)hContact,(LPARAM)"Ignore")) 

-			CallService(MS_PROTO_ADDTOCONTACT,(WPARAM)hContact,(LPARAM)"Ignore");

-		hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0);

+		if (!CallService(MS_PROTO_ISPROTOONCONTACT, (WPARAM)hContact, (LPARAM)"Ignore")) 

+			CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, (LPARAM)"Ignore");

+		hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

 	}

 

-	CreateServiceFunction("Ignore"PSR_MESSAGE,IgnoreRecvMessage);

-	CreateServiceFunction("Ignore"PSR_URL,IgnoreRecvUrl);

-	CreateServiceFunction("Ignore"PSR_FILE,IgnoreRecvFile);

-	CreateServiceFunction("Ignore"PSR_AUTH,IgnoreRecvAuth);

-	CreateServiceFunction(MS_IGNORE_ISIGNORED,IsIgnored);

-	CreateServiceFunction(MS_IGNORE_IGNORE,Ignore);

-	CreateServiceFunction(MS_IGNORE_UNIGNORE,Unignore);

+	CreateServiceFunction("Ignore"PSR_MESSAGE, IgnoreRecvMessage);

+	CreateServiceFunction("Ignore"PSR_URL, IgnoreRecvUrl);

+	CreateServiceFunction("Ignore"PSR_FILE, IgnoreRecvFile);

+	CreateServiceFunction("Ignore"PSR_AUTH, IgnoreRecvAuth);

+	CreateServiceFunction(MS_IGNORE_ISIGNORED, IsIgnored);

+	CreateServiceFunction(MS_IGNORE_IGNORE, Ignore);

+	CreateServiceFunction(MS_IGNORE_UNIGNORE, Unignore);

 

-	HookEvent(ME_DB_CONTACT_ADDED,IgnoreContactAdded);

-	HookEvent(ME_DB_EVENT_FILTER_ADD,IgnoreAddedNotify);

+	HookEvent(ME_DB_CONTACT_ADDED, IgnoreContactAdded);

+	HookEvent(ME_DB_EVENT_FILTER_ADD, IgnoreAddedNotify);

 	HookEvent(ME_MODERNOPT_INITIALIZE, IgnoreModernOptInit);

-	HookEvent(ME_OPT_INITIALISE,IgnoreOptInitialise);

+	HookEvent(ME_OPT_INITIALISE, IgnoreOptInitialise);

 	return 0;

 }