non-redefined function pfnClcBroadcast made static -> Clist_Broadcast

also its async variant created and published as Clist_BroadcastAsync

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

7 files changed, 37 insertions, 37 deletions

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 3f4efe4d81..5113cd4013 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -55,8 +55,8 @@ int ReloadSkinFolder(WPARAM, LPARAM)
 static int clcHookSmileyAddOptionsChanged(WPARAM, LPARAM)

 {

 	if (MirandaExiting()) return 0;

-	pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

-	pcli->pfnClcBroadcast(INTM_INVALIDATE, 0, 0);

+	Clist_Broadcast(CLM_AUTOREBUILD, 0, 0);

+	Clist_Broadcast(INTM_INVALIDATE, 0, 0);

 	return 0;

 }

 

@@ -91,20 +91,20 @@ static int clcHookIconsChanged(WPARAM, LPARAM)
 

 	g_hListeningToIcon = IcoLib_GetIcon("LISTENING_TO_ICON");

 

-	pcli->pfnClcBroadcast(INTM_INVALIDATE, 0, 0);

+	Clist_Broadcast(INTM_INVALIDATE, 0, 0);

 	AniAva_UpdateOptions();

 	return 0;

 }

 

 static int clcMetaModeChanged(WPARAM, LPARAM)

 {

-	pcli->pfnClcBroadcast(INTM_RELOADOPTIONS, 0, 0);

+	Clist_Broadcast(INTM_RELOADOPTIONS, 0, 0);

 	return 0;

 }

 

 static int clcMetacontactChanged(WPARAM, LPARAM)

 {

-	pcli->pfnClcBroadcast(INTM_NAMEORDERCHANGED, 0, 0);

+	Clist_Broadcast(INTM_NAMEORDERCHANGED, 0, 0);

 	return 0;

 }

 

@@ -125,28 +125,28 @@ static int clcHookSettingChanged(WPARAM hContact, LPARAM lParam)
 	else {

 		if (!strcmp(cws->szModule, "UserInfo")) {

 			if (!strcmp(cws->szSetting, "Timezone"))

-				pcli->pfnClcBroadcast(INTM_TIMEZONECHANGED, hContact, 0);

+				Clist_Broadcast(INTM_TIMEZONECHANGED, hContact, 0);

 		}

 		else if (!strcmp(cws->szModule, "CList")) {

 			if (!strcmp(cws->szSetting, "StatusMsg"))

-				pcli->pfnClcBroadcast(INTM_STATUSMSGCHANGED, hContact, 0);

+				Clist_Broadcast(INTM_STATUSMSGCHANGED, hContact, 0);

 		}

 		else if (!strcmp(cws->szModule, "ContactPhoto")) {

 			if (!strcmp(cws->szSetting, "File"))

-				pcli->pfnClcBroadcast(INTM_AVATARCHANGED, hContact, 0);

+				Clist_Broadcast(INTM_AVATARCHANGED, hContact, 0);

 		}

 		else {

 			if ((!strcmp(cws->szSetting, "XStatusName") || !strcmp(cws->szSetting, "XStatusMsg")))

-				pcli->pfnClcBroadcast(INTM_STATUSMSGCHANGED, hContact, 0);

+				Clist_Broadcast(INTM_STATUSMSGCHANGED, hContact, 0);

 			else if (!strcmp(cws->szSetting, "XStatusId"))

-				pcli->pfnClcBroadcast(INTM_STATUSCHANGED, hContact, 0);

+				Clist_Broadcast(INTM_STATUSCHANGED, hContact, 0);

 			else if (!strcmp(cws->szSetting, "Timezone"))

-				pcli->pfnClcBroadcast(INTM_TIMEZONECHANGED, hContact, 0);

+				Clist_Broadcast(INTM_TIMEZONECHANGED, hContact, 0);

 			else if (!strcmp(cws->szSetting, "ListeningTo"))

-				pcli->pfnClcBroadcast(INTM_STATUSMSGCHANGED, hContact, 0);

+				Clist_Broadcast(INTM_STATUSMSGCHANGED, hContact, 0);

 			else if (!strcmp(cws->szSetting, "Transport") || !strcmp(cws->szSetting, "IsTransported")) {

 				pcli->pfnInvalidateDisplayNameCacheEntry(hContact);

-				pcli->pfnClcBroadcast(CLM_AUTOREBUILD, hContact, 0);

+				Clist_Broadcast(CLM_AUTOREBUILD, hContact, 0);

 			}

 		}

 	}

@@ -178,7 +178,7 @@ static int clcHookBkgndConfigChanged(WPARAM, LPARAM)
 static int clcHookAvatarChanged(WPARAM wParam, LPARAM lParam)

 {

 	if (MirandaExiting()) return 0;

-	pcli->pfnClcBroadcast(INTM_AVATARCHANGED, wParam, lParam);

+	Clist_Broadcast(INTM_AVATARCHANGED, wParam, lParam);

 	return 0;

 }

 

@@ -318,7 +318,7 @@ static LRESULT clcOnCommand(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM
 		switch (LOWORD(wParam)) {

 		case POPUP_GROUPSHOWOFFLINE:

 			Clist_GroupSetFlags(contact->groupId, MAKELPARAM(CLCItems_IsShowOfflineGroup(contact->group) ? 0 : GROUPF_SHOWOFFLINE, GROUPF_SHOWOFFLINE));

-			pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

+			Clist_Broadcast(CLM_AUTOREBUILD, 0, 0);

 			return 0;

 		}

 	}

@@ -1522,7 +1522,7 @@ static LRESULT clcOnIntmStatusChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM
 					if (!contact->bImageIsSpecial && pdnce->getStatus() > ID_STATUS_OFFLINE)

 						contact->iImage = corecli.pfnGetContactIcon(wParam);

 					if (contact->iSubNumber && contact->subcontacts && contact->subcontacts->type == CLCIT_CONTACT)

-						pcli->pfnClcBroadcast(INTM_STATUSCHANGED, contact->subcontacts->hContact, 0); //forward status changing to host meta contact

+						Clist_Broadcast(INTM_STATUSCHANGED, contact->subcontacts->hContact, 0); //forward status changing to host meta contact

 				}

 			}

 		}

@@ -1667,7 +1667,7 @@ int ClcDoProtoAck(ACKDATA *ack)
 					return 0;

 

 			db_set_ws(ack->hContact, "CList", "StatusMsg", (const TCHAR *)ack->lParam);

-			pcli->pfnClcBroadcast(INTM_STATUSCHANGED, ack->hContact, 0);

+			Clist_Broadcast(INTM_STATUSCHANGED, ack->hContact, 0);

 		}

 		else {

 			if (ack->szModule != NULL)

@@ -1680,7 +1680,7 @@ int ClcDoProtoAck(ACKDATA *ack)
 					if (mir_strcmpi(val, ""))

 						db_set_s(ack->hContact, "CList", "StatusMsg", "");

 					else

-						pcli->pfnClcBroadcast(INTM_STATUSCHANGED, ack->hContact, 0);

+						Clist_Broadcast(INTM_STATUSCHANGED, ack->hContact, 0);

 					mir_free(val);

 				}

 			}

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index bce1166c21..6a42da09a6 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -767,8 +767,8 @@ static INT_PTR CALLBACK DlgProcTrayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 

 void ClcOptionsChanged(void)

 {

-	pcli->pfnClcBroadcast(INTM_RELOADOPTIONS, 0, 0);

-	pcli->pfnClcBroadcast(INTM_INVALIDATE, 0, 0);

+	Clist_Broadcast(INTM_RELOADOPTIONS, 0, 0);

+	Clist_Broadcast(INTM_INVALIDATE, 0, 0);

 }

 

 HWND g_hCLUIOptionsWnd = NULL;

diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp
index 08b5b17827..70665ab9cc 100644
--- a/plugins/Clist_modern/src/modern_clistsettings.cpp
+++ b/plugins/Clist_modern/src/modern_clistsettings.cpp
@@ -106,7 +106,7 @@ int MetaStatusChanged(WPARAM hMeta, LPARAM)
 {

 	ClcCacheEntry *pdnce = pcli->pfnGetCacheEntry(hMeta);

 	if (pdnce)

-		pcli->pfnClcBroadcast(INTM_STATUSCHANGED, hMeta, 0);

+		Clist_Broadcast(INTM_STATUSCHANGED, hMeta, 0);

 

 	return 0;

 }

@@ -139,7 +139,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam)
 			if ((db_get_w(NULL, "CList", "SecondLineType", 0) == TEXT_STATUS_MESSAGE || db_get_w(NULL, "CList", "ThirdLineType", 0) == TEXT_STATUS_MESSAGE) && pdnce->hContact && pdnce->m_pszProto)

 				amRequestAwayMsg(hContact);

 

-			pcli->pfnClcBroadcast(INTM_STATUSCHANGED, hContact, 0);

+			Clist_Broadcast(INTM_STATUSCHANGED, hContact, 0);

 		}

 		else if (!strcmp(cws->szModule, META_PROTO) && !memcmp(cws->szSetting, "Status", 6)) { // Status0..N for metacontacts

 			if (pcli->hwndContactTree && g_flag_bOnModulesLoadedCalled)

@@ -161,7 +161,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam)
 	if (!strcmp(cws->szModule, "CList")) {

 		// name is null or (setting is myhandle)

 		if (!strcmp(cws->szSetting, "Rate"))

-			pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

+			Clist_Broadcast(CLM_AUTOREBUILD, 0, 0);

 

 		else if (!strcmp(cws->szSetting, "NotOnList"))

 			pdnce->NotOnList = cws->value.bVal;

@@ -174,11 +174,11 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam)
 			if (cws->value.type == DBVT_DELETED || cws->value.bVal == 0)

 				pcli->pfnChangeContactIcon(hContact, pcli->pfnIconFromStatusMode(pdnce->m_pszProto, pdnce->getStatus(), hContact));

 

-			pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

+			Clist_Broadcast(CLM_AUTOREBUILD, 0, 0);

 		}

 		else if (!strcmp(cws->szSetting, "noOffline")) {

 			pdnce->m_bNoHiddenOffline = cws->value.bVal;

-			pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

+			Clist_Broadcast(CLM_AUTOREBUILD, 0, 0);

 		}

 	}

 	else if (!strcmp(cws->szModule, "Protocol")) {

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 7b51d0edeb..37723a8279 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -170,7 +170,7 @@ int CLUI::OnEvent_ModulesLoaded(WPARAM, LPARAM)
 

 int CLUI::OnEvent_FontReload(WPARAM wParam, LPARAM lParam)

 {

-	pcli->pfnClcBroadcast(INTM_RELOADOPTIONS, wParam, lParam);

+	Clist_Broadcast(INTM_RELOADOPTIONS, wParam, lParam);

 

 	g_CluiData.dwKeyColor = db_get_dw(NULL, "ModernSettings", "KeyColor", (DWORD)SETTING_KEYCOLOR_DEFAULT);

 

@@ -225,7 +225,7 @@ INT_PTR CLUI::Service_Menu_ShowContactAvatar(WPARAM hContact, LPARAM)
 {

 	db_set_b(hContact, "CList", "HideContactAvatar", 0);

 

-	pcli->pfnClcBroadcast(INTM_AVATARCHANGED, hContact, 0);

+	Clist_Broadcast(INTM_AVATARCHANGED, hContact, 0);

 	return 0;

 }

 

@@ -233,7 +233,7 @@ INT_PTR CLUI::Service_Menu_HideContactAvatar(WPARAM hContact, LPARAM)
 {

 	db_set_b(hContact, "CList", "HideContactAvatar", 1);

 

-	pcli->pfnClcBroadcast(INTM_AVATARCHANGED, hContact, 0);

+	Clist_Broadcast(INTM_AVATARCHANGED, hContact, 0);

 	return 0;

 }

 

@@ -2029,7 +2029,7 @@ LRESULT CLUI::OnDelayedSizingTimer(UINT, WPARAM, LPARAM)
 	if (mutex_bDelayedSizing && !mutex_bDuringSizing) {

 		mutex_bDelayedSizing = 0;

 		KillTimer(m_hWnd, TM_DELAYEDSIZING);

-		pcli->pfnClcBroadcast(INTM_SCROLLBARCHANGED, 0, 0);

+		Clist_Broadcast(INTM_SCROLLBARCHANGED, 0, 0);

 	}

 	return TRUE;

 }

diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp
index 89722dc765..3c116d4b84 100644
--- a/plugins/Clist_modern/src/modern_skinopt.cpp
+++ b/plugins/Clist_modern/src/modern_skinopt.cpp
@@ -155,7 +155,7 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 
 				ske_LoadSkinFromIniFile(sd->File, FALSE);
 				ske_LoadSkinFromDB();
-				pcli->pfnClcBroadcast(INTM_RELOADOPTIONS, 0, 0);
+				Clist_Broadcast(INTM_RELOADOPTIONS, 0, 0);
 				Sync(CLUIFrames_OnClistResize_mod, 0, 0);
 				ske_RedrawCompleteWindow();
 				Sync(CLUIFrames_OnClistResize_mod, 0, 0);
@@ -233,9 +233,9 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 		switch (((LPNMHDR)lParam)->idFrom) {
 		case 0:
 			if (((LPNMHDR)lParam)->code == PSN_APPLY) {
-				pcli->pfnClcBroadcast(INTM_RELOADOPTIONS, 0, 0);
+				Clist_Broadcast(INTM_RELOADOPTIONS, 0, 0);
 				NotifyEventHooks(g_CluiData.hEventBkgrChanged, 0, 0);
-				pcli->pfnClcBroadcast(INTM_INVALIDATE, 0, 0);
+				Clist_Broadcast(INTM_INVALIDATE, 0, 0);
 				RedrawWindow(GetParent(pcli->hwndContactTree), NULL, NULL, RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN);
 			}
 			break;
@@ -485,7 +485,7 @@ INT_PTR SvcApplySkin(WPARAM, LPARAM lParam)
 {
 	ske_LoadSkinFromIniFile((TCHAR *)lParam, FALSE);
 	ske_LoadSkinFromDB();
-	pcli->pfnClcBroadcast(INTM_RELOADOPTIONS, 0, 0);
+	Clist_Broadcast(INTM_RELOADOPTIONS, 0, 0);
 	Sync(CLUIFrames_OnClistResize_mod, 0, 0);
 	ske_RedrawCompleteWindow();
 	Sync(CLUIFrames_OnClistResize_mod, 0, 0);
diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp
index b5521a6c89..4eca4f67b4 100644
--- a/plugins/Clist_modern/src/modern_statusbar.cpp
+++ b/plugins/Clist_modern/src/modern_statusbar.cpp
@@ -819,7 +819,7 @@ LRESULT CALLBACK ModernStatusProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
 

 						ApplyViewMode(filterName);

 					}

-					pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

+					Clist_Broadcast(CLM_AUTOREBUILD, 0, 0);

 					cliInvalidateRect(hwnd, NULL, FALSE);

 					SetCapture(NULL);

 					return 0;

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index 4e9b144911..0afc589a10 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -625,7 +625,7 @@ void DeleteViewMode(char * szName)
 

 	if (!mir_strcmp(g_CluiData.current_viewmode, szName) && mir_strlen(szName) == mir_strlen(g_CluiData.current_viewmode)) {

 		g_CluiData.bFilterEffective = 0;

-		pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

+		Clist_Broadcast(CLM_AUTOREBUILD, 0, 0);

 		SetWindowText(hwndSelector, TranslateT("All contacts"));

 	}

 

@@ -1242,7 +1242,7 @@ void ApplyViewMode(const char *Name, bool onlySelector)
 		if (g_CluiData.bOldUseGroups != (BYTE)-1)

 			CallService(MS_CLIST_SETUSEGROUPS, (WPARAM)g_CluiData.bOldUseGroups, 0);

 

-		pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

+		Clist_Broadcast(CLM_AUTOREBUILD, 0, 0);

 		KillTimer(g_hwndViewModeFrame, TIMERID_VIEWMODEEXPIRE);

 		SetDlgItemText(g_hwndViewModeFrame, IDC_SELECTMODE, TranslateT("All contacts"));

 		if (g_CluiData.boldHideOffline != (BYTE)-1)

@@ -1362,7 +1362,7 @@ void ApplyViewMode(const char *Name, bool onlySelector)
 

 	SetWindowText(hwndSelector, ptrT(mir_utf8decodeW((Name[0] == 13) ? Name + 1 : Name)));

 

-	pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0);

+	Clist_Broadcast(CLM_AUTOREBUILD, 0, 0);

 	cliInvalidateRect(pcli->hwndStatus, NULL, FALSE);

 }