diff options
Diffstat (limited to 'plugins/StatusPlugins/AdvancedAutoAway')
4 files changed, 16 insertions, 16 deletions
diff --git a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp index 9213b915bb..c969b5c98a 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp @@ -146,7 +146,7 @@ void LoadOptions( OBJLIST<TAAAProtoSetting>& loadSettings, BOOL override)  		if (!override) {
  			if (loadSettings[i].optionFlags & FLAG_MONITORMIRANDA)
  				monitorMiranda = TRUE;
 -			else if ( (MyGetLastInputInfo==NULL) || ignoreLockKeys || ignoreSysKeys || ignoreAltCombo || (monitorMouse != monitorKeyboard) )
 +			else if ( (MyGetLastInputInfo==NULL) || ignoreLockKeys || ignoreSysKeys || ignoreAltCombo || (monitorMouse != monitorKeyboard))
  				monitorAll = TRUE;
  	}	}
 @@ -348,7 +348,7 @@ static VOID CALLBACK AutoAwayTimer(HWND hwnd,UINT message,UINT_PTR idEvent,DWORD  			}
  			else if ( ((mouseStationaryTimer < sts1Time) && (!screenSaver) && (!locked)) && 
  				((aas.optionFlags&FLAG_LV2ONINACTIVE) || (!(aas.optionFlags&FLAG_SETNA))) &&
 -				(aas.optionFlags&FLAG_RESET) ) {
 +				(aas.optionFlags&FLAG_RESET)) {
  				/* from STATUS1_SET to SET_ORGSTATUS */
  				changeState(aas, SET_ORGSTATUS);
  			}
 @@ -478,14 +478,14 @@ static LRESULT CALLBACK MirandaMouseHookFunction(int code, WPARAM wParam, LPARAM  static LRESULT CALLBACK MirandaKeyBoardHookFunction(int code, WPARAM wParam, LPARAM lParam)
  {
  	if (code >= 0) {
 -		if (ignoreAltCombo) {//&& ((HIWORD(lParam)&KF_ALTDOWN) || (wParam == VK_MENU)) ) {
 +		if (ignoreAltCombo) {//&& ((HIWORD(lParam)&KF_ALTDOWN) || (wParam == VK_MENU))) {
  			if ( ((GetKeyState(VK_MENU) < 0) || (wParam == VK_MENU)) ||
  				((GetKeyState(VK_TAB) < 0) || (wParam == VK_TAB)) ||
  				((GetKeyState(VK_SHIFT) < 0) || (wParam == VK_SHIFT)) ||
  				((GetKeyState(VK_CONTROL) < 0) || (wParam == VK_CONTROL)) ||
  				((GetKeyState(VK_ESCAPE) < 0) || (wParam == VK_ESCAPE)) ||
  				((GetKeyState(VK_LWIN) < 0) || (wParam == VK_LWIN)) ||
 -				((GetKeyState(VK_RWIN) < 0) || (wParam == VK_RWIN)) ) {
 +				((GetKeyState(VK_RWIN) < 0) || (wParam == VK_RWIN))) {
  				return CallNextHookEx(hMirandaKeyBoardHook, code, wParam, lParam);
  			}
  		}
 @@ -537,14 +537,14 @@ static LRESULT CALLBACK MouseHookFunction(int code, WPARAM wParam, LPARAM lParam  static LRESULT CALLBACK KeyBoardHookFunction(int code, WPARAM wParam, LPARAM lParam)
  {
  	if (code >= 0) {
 -		if (ignoreAltCombo) {//&& ((HIWORD(lParam)&KF_ALTDOWN) || (wParam == VK_MENU)) ) {
 +		if (ignoreAltCombo) {//&& ((HIWORD(lParam)&KF_ALTDOWN) || (wParam == VK_MENU))) {
  			if ( ((GetKeyState(VK_MENU) < 0) || (wParam == VK_MENU)) ||
  				((GetKeyState(VK_TAB) < 0) || (wParam == VK_TAB)) ||
  				((GetKeyState(VK_SHIFT) < 0) || (wParam == VK_SHIFT)) ||
  				((GetKeyState(VK_CONTROL) < 0) || (wParam == VK_CONTROL)) ||
  				((GetKeyState(VK_ESCAPE) < 0) || (wParam == VK_ESCAPE)) ||
  				((GetKeyState(VK_LWIN) < 0) || (wParam == VK_LWIN)) ||
 -				((GetKeyState(VK_RWIN) < 0) || (wParam == VK_RWIN)) ) {
 +				((GetKeyState(VK_RWIN) < 0) || (wParam == VK_RWIN))) {
  				return CallNextHookEx(hKeyBoardHook, code, wParam, lParam);
  			}
  		}
 diff --git a/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp b/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp index 3fd52ffec1..5e85f2d841 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp @@ -43,7 +43,7 @@ INT_PTR CALLBACK DlgProcAutoAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L  			DWORD protoModeMsgFlags = 0;
  			for ( i=0; i < protoCount; i++ ) {
 -				if ( (!(CallProtoService(proto[i]->szModuleName, PS_GETCAPS, (WPARAM)PFLAGNUM_1, 0) & PF1_MODEMSGSEND & ~PF1_INDIVMODEMSG)) )
 +				if ( (!(CallProtoService(proto[i]->szModuleName, PS_GETCAPS, (WPARAM)PFLAGNUM_1, 0) & PF1_MODEMSGSEND & ~PF1_INDIVMODEMSG)))
  					continue;
  				protoModeMsgFlags |= CallProtoService( proto[i]->szModuleName, PS_GETCAPS, PFLAGNUM_3, 0 );
 @@ -77,7 +77,7 @@ INT_PTR CALLBACK DlgProcAutoAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L  		break;
  	case WM_COMMAND:
 -		if ( ((HIWORD(wParam) == EN_CHANGE) || (HIWORD(wParam) == BN_CLICKED)) && ((HWND)lParam == GetFocus()) )
 +		if ( ((HIWORD(wParam) == EN_CHANGE) || (HIWORD(wParam) == BN_CLICKED)) && ((HWND)lParam == GetFocus()))
  			SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
  		switch(LOWORD(wParam)) {
 @@ -144,7 +144,7 @@ INT_PTR CALLBACK DlgProcAutoAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L  			SendMessage(hwndDlg,WM_COMMAND,MAKEWPARAM(IDC_STATUS,CBN_SELCHANGE),0);
  			for ( i=0; i < count; i++ ) {
  				DBWriteContactSettingByte(NULL, MODULENAME, StatusModeToDbSetting(settings[i]->status,SETTING_MSGCUSTOM), (BYTE)settings[i]->useCustom);
 -				if ( (settings[i]->useCustom) && (settings[i]->msg != NULL) && (strlen(settings[i]->msg) > 0) )
 +				if ( (settings[i]->useCustom) && (settings[i]->msg != NULL) && (strlen(settings[i]->msg) > 0))
  					DBWriteContactSettingString(NULL, MODULENAME, StatusModeToDbSetting(settings[i]->status,SETTING_STATUSMSG), settings[i]->msg);
  			}
  			break;
 diff --git a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp index 29b17ac44c..a4101b1b88 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp @@ -187,7 +187,7 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM  					else
  						flags = 0;
  					for(i=0;i<sizeof(statusModeList)/sizeof(statusModeList[0]);i++) {
 -						if ((flags&statusModePf2List[i])  || (statusModePf2List[i] == PF2_OFFLINE) || (bSettingSame) ) {
 +						if ((flags&statusModePf2List[i])  || (statusModePf2List[i] == PF2_OFFLINE) || (bSettingSame)) {
  							lvItem.pszText = ( TCHAR* )CallService( MS_CLIST_GETSTATUSMODEDESCRIPTION, statusModeList[i], GSMDF_TCHAR );
  							lvItem.lParam = ( LPARAM )statusModePf2List[i];
  							ListView_InsertItem(hList,&lvItem);
 @@ -390,7 +390,7 @@ static INT_PTR CALLBACK DlgProcAutoAwayGeneralOpts(HWND hwndDlg, UINT msg, WPARA  		break;
  	case WM_COMMAND:
 -		if (( HIWORD(wParam) == EN_CHANGE || HIWORD(wParam) == BN_CLICKED ) && (HWND)lParam == GetFocus() )
 +		if (( HIWORD(wParam) == EN_CHANGE || HIWORD(wParam) == BN_CLICKED ) && (HWND)lParam == GetFocus())
  			SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
  		switch(LOWORD(wParam)) {
 @@ -494,7 +494,7 @@ static INT_PTR CALLBACK DlgProcAutoAwayTabs(HWND hwndDlg, UINT msg, WPARAM wPara  		break;
  	case WM_NOTIFY:
 -		if ( (((NMHDR*)lParam)->idFrom == IDC_TABS) ) {
 +		if ( (((NMHDR*)lParam)->idFrom == IDC_TABS)) {
  			if (((NMHDR*)lParam)->code == TCN_SELCHANGING) {
  				TCITEM tci;
 diff --git a/plugins/StatusPlugins/AdvancedAutoAway/trigger_aaa.cpp b/plugins/StatusPlugins/AdvancedAutoAway/trigger_aaa.cpp index e803c2dab4..edecc8f947 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/trigger_aaa.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/trigger_aaa.cpp @@ -35,10 +35,10 @@ static int AAAStateChanged(WPARAM wParam, LPARAM lParam) {  			}
  			break;
  		case SET_ORGSTATUS:
 -			if ( (aas->oldState == STATUS1_SET) && (DBGetTriggerSettingByte(triggerID, NULL, MODULENAME, SETTING_LEAVEFIRST, 0)) ) {
 +			if ( (aas->oldState == STATUS1_SET) && (DBGetTriggerSettingByte(triggerID, NULL, MODULENAME, SETTING_LEAVEFIRST, 0))) {
  				bReport = TRUE;;
  			}
 -			if ( (aas->oldState == STATUS2_SET) && (DBGetTriggerSettingByte(triggerID, NULL, MODULENAME, SETTING_LEAVESECOND, 0)) ) {
 +			if ( (aas->oldState == STATUS2_SET) && (DBGetTriggerSettingByte(triggerID, NULL, MODULENAME, SETTING_LEAVESECOND, 0))) {
  				bReport = TRUE;;
  			}
  			break;
 @@ -54,12 +54,12 @@ static int AAAStateChanged(WPARAM wParam, LPARAM lParam) {  				szProto = DBGetContactSettingByte(NULL, MODULENAME, SETTING_SAMESETTINGS, 0)?SETTING_ALL:aas->protocolSetting->szName;
  				_snprintf(setting, sizeof(setting), "%s_Lv1Status", szProto);
 -				if ( (aas->protocolSetting->lastStatus == DBGetContactSettingWord(NULL, MODULENAME, setting, ID_STATUS_AWAY)) && DBGetTriggerSettingByte(triggerID, NULL, MODULENAME, SETTING_LEAVEFIRST, 0) ) {
 +				if ( (aas->protocolSetting->lastStatus == DBGetContactSettingWord(NULL, MODULENAME, setting, ID_STATUS_AWAY)) && DBGetTriggerSettingByte(triggerID, NULL, MODULENAME, SETTING_LEAVEFIRST, 0)) {
  					bReport = TRUE;
  				}
  				_snprintf(setting, sizeof(setting), "%s_Lv2Status", szProto);
 -				if ( (aas->protocolSetting->lastStatus == DBGetContactSettingWord(NULL, MODULENAME, setting, ID_STATUS_NA)) && DBGetTriggerSettingByte(triggerID, NULL, MODULENAME, SETTING_LEAVESECOND, 0) ) {
 +				if ( (aas->protocolSetting->lastStatus == DBGetContactSettingWord(NULL, MODULENAME, setting, ID_STATUS_NA)) && DBGetTriggerSettingByte(triggerID, NULL, MODULENAME, SETTING_LEAVESECOND, 0)) {
  					bReport = TRUE;
  				}
  			}
  | 
