IsStatusConnecting() - useful macro

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

6 files changed, 13 insertions, 13 deletions

diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp
index a6c0126ec2..4357e06315 100644
--- a/plugins/Clist_modern/src/modern_clisttray.cpp
+++ b/plugins/Clist_modern/src/modern_clisttray.cpp
@@ -98,7 +98,7 @@ INT_PTR CListTray_GetGlobalStatus(WPARAM, LPARAM)
 		if (!pcli->pfnGetProtocolVisibility(p.szProto))

 			continue;

 

-		if (p.dwStatus >= ID_STATUS_CONNECTING  && p.dwStatus < ID_STATUS_CONNECTING + MAX_CONNECT_RETRIES) {

+		if (IsStatusConnecting(p.dwStatus)) {

 			connectingCount++;

 			if (connectingCount == 1)

 				g_szConnectingProto = p.szProto;

@@ -472,8 +472,7 @@ int GetGoodAccNum(bool *bDiffers, bool *bConn)
 				d = 2;

 

 			if (bConn)

-				if (   acc[i]->ppro->m_iStatus >= ID_STATUS_CONNECTING

-					&& acc[i]->ppro->m_iStatus <= (ID_STATUS_CONNECTING + MAX_CONNECT_RETRIES))

+				if (IsStatusConnecting(acc[i]->ppro->m_iStatus))

 					*bConn = TRUE;

 		}

 	}

@@ -606,7 +605,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int, int)
 			break;

 

 		iStatus = ProtoCallService(szProto, PS_GETSTATUS, 0, 0);

-		if (g_StatusBarData.bConnectingIcon && (iStatus >= ID_STATUS_CONNECTING) && (iStatus <= (ID_STATUS_CONNECTING + MAX_CONNECT_RETRIES)))

+		if (g_StatusBarData.bConnectingIcon && IsStatusConnecting(iStatus))

 			hIcon = (HICON)CLUI_GetConnectingIconService((WPARAM)szProto, 0);

 		else

 			hIcon = pcli->pfnGetIconFromStatusMode(NULL, szProto, ProtoCallService(szProto, PS_GETSTATUS, 0, 0));

@@ -616,7 +615,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int, int)
 	

 	case TRAY_ICON_MODE_CYCLE:

 		iStatus = ProtoCallService(szChangedProto, PS_GETSTATUS, 0, 0);

-		if (g_StatusBarData.bConnectingIcon && (iStatus >= ID_STATUS_CONNECTING) && (iStatus <= (ID_STATUS_CONNECTING + MAX_CONNECT_RETRIES)))

+		if (g_StatusBarData.bConnectingIcon && IsStatusConnecting(iStatus))

 			hIcon = (HICON)CLUI_GetConnectingIconService((WPARAM)szChangedProto, 0);

 		else if (!bConn)

 			hIcon = pcli->pfnGetIconFromStatusMode(NULL, szChangedProto, ProtoCallService(szChangedProto, PS_GETSTATUS, 0, 0));

@@ -630,7 +629,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int, int)
 				break;

 

 		iStatus = ProtoCallService(szChangedProto, PS_GETSTATUS, 0, 0);

-		if (g_StatusBarData.bConnectingIcon && (iStatus >= ID_STATUS_CONNECTING) && (iStatus <= (ID_STATUS_CONNECTING + MAX_CONNECT_RETRIES)))

+		if (g_StatusBarData.bConnectingIcon && IsStatusConnecting(iStatus))

 			hIcon = (HICON)CLUI_GetConnectingIconService((WPARAM)szChangedProto, 0);

 		else

 			hIcon = pcli->pfnGetIconFromStatusMode(NULL, szChangedProto, ProtoCallService(szChangedProto, PS_GETSTATUS, 0, 0));

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 82f1250257..f4957bd96a 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -2012,7 +2012,7 @@ LRESULT CLUI::OnStatusBarUpdateTimer(UINT msg, WPARAM wParam, LPARAM lParam)
 		else

 			status = CallProtoService(pt->szProto, PS_GETSTATUS, 0, 0);

 

-		if (!(status >= ID_STATUS_CONNECTING && status <= ID_STATUS_CONNECTING + MAX_CONNECT_RETRIES)) {

+		if (!IsStatusConnecting(status)) {

 			pt->nCycleStartTick = 0;

 			ImageList_Destroy(pt->himlIconList);

 			pt->himlIconList = NULL;

diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp
index 6925b4f189..dba1c45e3a 100644
--- a/plugins/SimpleStatusMsg/src/main.cpp
+++ b/plugins/SimpleStatusMsg/src/main.cpp
@@ -1192,7 +1192,7 @@ static int ProcessProtoAck(WPARAM wParam,LPARAM lParam)
 	if (ack->type != ACKTYPE_STATUS || ack->result != ACKRESULT_SUCCESS || ack->hContact != NULL)

 		return 0;

 

-	if (ack->lParam >= ID_STATUS_CONNECTING && ack->lParam < ID_STATUS_CONNECTING + MAX_CONNECT_RETRIES)

+	if (IsStatusConnecting(ack->lParam))

 		ack->lParam = ID_STATUS_OFFLINE;

 

 	SaveStatusAsCurrent(ack->szModule, (int)ack->lParam);

diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
index 81461cba9b..bb4ff2f96c 100644
--- a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
+++ b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
@@ -605,7 +605,7 @@ static VOID CALLBACK CheckConnectingTimer(HWND, UINT, UINT_PTR, DWORD)
 		TConnectionSettings& cs = connectionSettings[i];
 
 		int curStatus = GetStatus(cs);
-		if (curStatus < MAX_CONNECT_RETRIES) { // connecting
+		if (IsStatusConnecting(curStatus)) { // connecting
 			maxConnectingTime = db_get_dw(NULL, MODULENAME, SETTING_MAXCONNECTINGTIME, 0);
 			if (maxConnectingTime > 0) {
 				if ((unsigned int)maxConnectingTime <= ((GetTickCount() - cs.lastStatusAckTime) / 1000)) {
@@ -633,7 +633,7 @@ static VOID CALLBACK CheckAckStatusTimer(HWND, UINT, UINT_PTR, DWORD)
 		if (curStatus == ID_STATUS_CURRENT || curStatus == ID_STATUS_DISABLED || curStatus == newStatus || newStatus > MAX_STATUS)
 			continue;
 
-		if (newStatus < MAX_CONNECT_RETRIES) { // connecting
+		if (IsStatusConnecting(newStatus)) { // connecting
 			maxConnectingTime = db_get_dw(NULL, MODULENAME, SETTING_MAXCONNECTINGTIME, 0);
 			if (maxConnectingTime > 0)
 				StartTimer(IDT_CHECKCONNECTING, (maxConnectingTime * 1000 - (GetTickCount() - cs.lastStatusAckTime)), FALSE);
@@ -850,7 +850,7 @@ static void CheckContinueslyFunction(void *)
 			if (!IsSuitableProto(protos[i]))
 				continue;
 
-			if (CallProtoService(protos[i]->szModuleName, PS_GETSTATUS, 0, 0) < MAX_CONNECT_RETRIES) {
+			if (IsStatusConnecting(CallProtoService(protos[i]->szModuleName, PS_GETSTATUS, 0, 0))) {
 				log_debugA("CheckContinueslyFunction: %s is connecting", protos[i]->szModuleName);
 				continue; // connecting, leave alone
 			}
diff --git a/plugins/StatusPlugins/commonstatus.cpp b/plugins/StatusPlugins/commonstatus.cpp
index 573ae414ae..1ff0f978de 100644
--- a/plugins/StatusPlugins/commonstatus.cpp
+++ b/plugins/StatusPlugins/commonstatus.cpp
@@ -233,7 +233,8 @@ INT_PTR SetStatusEx(WPARAM wParam, LPARAM)
 		int oldstatus = CallProtoService(szProto, PS_GETSTATUS, 0, 0);

 		// set last status

 		protoSettings[i]->lastStatus = oldstatus;

-		if (oldstatus <= MAX_CONNECT_RETRIES) {// ignore if connecting, but it didn't came this far if it did

+		if (IsStatusConnecting(oldstatus)) {

+			// ignore if connecting, but it didn't came this far if it did

 			log_debugA("CommonStatus: %s is already connecting", szProto);

 			continue;

 		}

diff --git a/plugins/StopSpamPlus/src/services.cpp b/plugins/StopSpamPlus/src/services.cpp
index 2ff1a25d8b..9e9145f2b6 100644
--- a/plugins/StopSpamPlus/src/services.cpp
+++ b/plugins/StopSpamPlus/src/services.cpp
@@ -34,7 +34,7 @@ INT_PTR RemoveTempContacts(WPARAM wParam,LPARAM lParam)
 				DWORD caps = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0);

 				if (caps & PF1_SERVERCLIST) {

 					int status = CallProtoService(szProto, PS_GETSTATUS, 0, 0);

-					if (status == ID_STATUS_OFFLINE || (status >= ID_STATUS_CONNECTING && status < ID_STATUS_CONNECTING + MAX_CONNECT_RETRIES))

+					if (status == ID_STATUS_OFFLINE || IsStatusConnecting(status))

 						// Set a flag so we remember to delete the contact when the protocol goes online the next time

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

 					else