From 055d4460e17344248c7364afc5d19deeda39d644 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 1 Jan 2014 12:32:05 +0000 Subject: copyright update for year 2014 git-svn-id: http://svn.miranda-ng.org/main/trunk@7438 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- .../Chess4Net/MI/MirandaINC/newpluginapi.h | 7 +- plugins/!NotAdopted/SmartAutoAway/autoaway.cpp | 84 +++++++++++----------- plugins/!NotAdopted/SmartAutoAway/dlgproc.cpp | 32 ++++----- plugins/!NotAdopted/SmartAutoAway/globals.cpp | 8 +-- plugins/!NotAdopted/SmartAutoAway/idle.cpp | 50 ++++++------- plugins/!NotAdopted/SmartAutoAway/idleMenu.cpp | 5 +- plugins/!NotAdopted/SmartAutoAway/idleMessages.cpp | 35 ++++----- plugins/!NotAdopted/SmartAutoAway/reconnect.cpp | 33 ++++----- plugins/!NotAdopted/SmartAutoAway/saa.cpp | 5 +- plugins/!NotAdopted/SmartAutoAway/saamain.cpp | 23 +++--- plugins/!NotAdopted/SmartAutoAway/saani.cpp | 5 +- plugins/!NotAdopted/mDynDNS/m_mDynDNS.h | 9 +-- plugins/!NotAdopted/rps/rps.cpp | 28 ++++---- 13 files changed, 164 insertions(+), 160 deletions(-) (limited to 'plugins/!NotAdopted') diff --git a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/newpluginapi.h b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/newpluginapi.h index bd937757f8..6a2a200a41 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/newpluginapi.h +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/newpluginapi.h @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2008 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -197,7 +198,7 @@ typedef struct { #define SetHookDefaultForHookableEvent(a,b) pluginLink->SetHookDefaultForHookableEvent(a,b) #define CreateServiceFunctionParam(a,b,c) pluginLink->CreateServiceFunctionParam(a,b,c) #define NotifyEventHooksDirect(a,b,c) pluginLink->NotifyEventHooksDirect(a,b,c) - #if MIRANDA_VER >= 0x800 + #if MIRANDA_VER >= 0x800 #define CallProtoService(a,b,c,d) pluginLink->CallProtoService(a,b,c,d) #define CallContactService(a,b,c,d) pluginLink->CallContactService(a,b,c,d) #define HookEventParam(a,b,c) pluginLink->HookEventParam(a,b,c) diff --git a/plugins/!NotAdopted/SmartAutoAway/autoaway.cpp b/plugins/!NotAdopted/SmartAutoAway/autoaway.cpp index 817e4b2369..1480bdc90f 100644 --- a/plugins/!NotAdopted/SmartAutoAway/autoaway.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/autoaway.cpp @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2006 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-06 Miranda ICQ/IM project, +all portions of this codebase are copyrighted to the people listed in contributors.txt. This program is free software; you can redistribute it and/or @@ -37,7 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //#define ME_IDLE_CHANGED "Miranda/SmartIdle/Changed" //static HANDLE hIdleEvent = NULL; - + #define allprotomodes 0x03FF //0000 0011 1111 1111; #define aa_OnlyIfBitsDefault 0x01BB01B8 //2 x 0000 0001 1011 1011; @@ -120,7 +121,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) } else { //... lite if IDF_LONG is not set if (curIdleStatus > 0) return 0; // we are already sleeping... curIdleStatus = 1; - } + } } else { // we are going to awake if (curIdleStatus == 0) return 0; // we are already awake... curIdleStatus = 0; @@ -132,17 +133,17 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) db_set_dw(NULL,AA_MODULE,AA_LASTIDLETIME,(DWORD)lastIdleEventTime); } } switch (curIdleStatus) { - case 0: + case 0: xModifyMenu(0,CMIF_CHECKED); xModifyMenu(1,0); xModifyMenu(2,0); break; - case 1: + case 1: xModifyMenu(0,0); xModifyMenu(1,CMIF_CHECKED); xModifyMenu(2,0); break; - case 2: + case 2: xModifyMenu(0,0); xModifyMenu(1,CMIF_GRAYED); xModifyMenu(2,CMIF_CHECKED); @@ -159,7 +160,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) if (isStatusLocked) newStatus = reqStatus[j]; else switch (curIdleStatus) { case 1 : { //sleeping lite - if ( GetBits(awayStatusesPerm[j],maskIsShortAwayEnabled)){ + if ( GetBits(awayStatusesPerm[j],maskIsShortAwayEnabled)){ int bits = 1<<(reqStatusInd); BOOL permit = GetBits(onlyIfBitsPerm[j], bits); if ( permit ) { @@ -176,7 +177,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) continue; } - } else continue; + } else continue; break; } case 2 : { //sleeping deeply @@ -196,7 +197,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) #endif continue; } - } else continue; + } else continue; break; } case 0: { //wakening up @@ -245,7 +246,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, newStatus, 0),newStatus); CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)str); #endif - if ( CallProtoService(accounts[j]->szModuleName, PS_GETSTATUS, 0, 0) != newStatus ) { + if ( CallProtoService(accounts[j]->szModuleName, PS_GETSTATUS, 0, 0) != newStatus ) { //if (db_get_b( NULL, accounts[j]->szModuleName, , "LockMainStatus", 0 )) // continue; //szName @@ -268,7 +269,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)str); #endif } else if (messCaps[j] && !(lParam&IDF_PRIVACY)){//setting the statusMessage if protocol supports AND privacy is disabled - TCHAR * awayMsg=0; + TCHAR * awayMsg=0; int specificMsg = messCaps[j] & Proto_Status2Flag(newStatus); switch (curIdleStatus) { @@ -289,7 +290,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) } else { #ifdef UNICODE if (HasAwayMessageW){ - awayMsg = (TCHAR *) CallService(MS_AWAYMSG_GETSTATUSMSGW, (WPARAM) newStatus, 0); + awayMsg = (TCHAR *) CallService(MS_AWAYMSG_GETSTATUSMSGW, (WPARAM) newStatus, 0); } else { char *temp=(char *)CallService(MS_AWAYMSG_GETSTATUSMSG, (WPARAM) newStatus, 0); if ((int)temp == CALLSERVICE_NOTFOUND) awayMsg = 0; @@ -308,7 +309,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) #ifdef AALOG { char str[1000]; - sprintf(str,"%s: Specific Status Message is %s",accounts[j]->szModuleName, + sprintf(str,"%s: Specific Status Message is %s",accounts[j]->szModuleName, specificMsg?"Enabled":"Disabled"); CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)str); sprintf(str,"%s: Going to %s (%d); StatusMessage is: %s", accounts[j]->szModuleName,CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, newStatus, 0),newStatus, @@ -327,7 +328,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) CallProtoService(accounts[j]->szModuleName, PS_SETAWAYMSG, newStatus, (LPARAM) awayMsg); #endif if (awayMsg) { -#ifdef AALOG +#ifdef AALOG {char str[1000]; sprintf(str,"%s: Cleaning after MS_AWAYMSG_GETSTATUSMSG: %s",accounts[j]->szModuleName,awayMsg); CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)str);} @@ -335,7 +336,7 @@ int AutoAwayEvent(WPARAM wParam, LPARAM lParam) mir_free(awayMsg); } if ((curIdleStatus==0) && (GetBits(idleMessOpts[j],IdleMessOptsMaskRstHere)>0) && /*!starting &&*/ specificMsg){ -#ifdef AALOG +#ifdef AALOG char str[1000]; sprintf(str,"%s: Scheduling \"ResetDefaultStatusMessage\" after %d seconds",accounts[j]->szModuleName,GetBits(idleMessOpts[j],IdleMessOptsMaskRstHereDelay)); CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)str); @@ -368,7 +369,7 @@ extern int StatusModeChangeEvent(WPARAM wParam,LPARAM lParam) sprintf(log,"Status Mode change event: %s: %s\n\n",lParam,CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, wParam, 0)); CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)log); } -#endif +#endif if (lParam){ for (j = 0 ; j < protoCount ; j++) { //if ( accounts[j]->type != PROTOTYPE_PROTOCOL ) continue; @@ -442,7 +443,7 @@ int ProtoAckEvent(WPARAM wParam,LPARAM lParam) #endif char str[1024]; int j = 0; - ACKDATA * ack = (ACKDATA*) lParam; + ACKDATA * ack = (ACKDATA*) lParam; for (j = 0 ; j < protoCount ; j++) /*if (accounts[j]->type==PROTOTYPE_PROTOCOL)*/if (accounts[j]->bIsEnabled) if (strcmp(ack->szModule,accounts[j]->szModuleName)==0){ if (ack->type==ACKTYPE_STATUS) { // MessageBox( 0,CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)ack->lParam, 0),accounts[j]->szModuleName,0); @@ -455,7 +456,7 @@ int ProtoAckEvent(WPARAM wParam,LPARAM lParam) if (strcmp(ack->szModule,str)==0){ SetDlgItems(theDialog,GetCourSelProtocol(coursel)); // SendDlgItemMessage(theDialog, IDC_COURSTATUSLABEL, WM_SETTEXT, 0, -// (LPARAM)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)courStatus[j], 0)); +// (LPARAM)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)courStatus[j], 0)); } } } @@ -472,23 +473,23 @@ int ProtoAckEvent(WPARAM wParam,LPARAM lParam) // if (theDialog) SendDlgItemMessage(theDialog, 40202, WM_SETTEXT, 0,(LPARAM)str); sprintf(str,"%d",ack->type); sprintf(log,"%stype: %s;",log,str); -// if (theDialog) SendDlgItemMessage(theDialog, 40203, WM_SETTEXT, 0,str); +// if (theDialog) SendDlgItemMessage(theDialog, 40203, WM_SETTEXT, 0,str); sprintf(str,"%d",ack->result); sprintf(log,"%s result: %s;",log,str); -// if (theDialog) SendDlgItemMessage(theDialog, 40204, WM_SETTEXT, 0,str); +// if (theDialog) SendDlgItemMessage(theDialog, 40204, WM_SETTEXT, 0,str); sprintf(str,"%d(%s)",ack->hProcess, CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)ack->hProcess, 0)); sprintf(log,"%s hProcess: %s;",log,str); -// if (theDialog) SendDlgItemMessage(theDialog, 40205, WM_SETTEXT, 0,str); +// if (theDialog) SendDlgItemMessage(theDialog, 40205, WM_SETTEXT, 0,str); sprintf(str,"%d(%s)",ack->lParam, CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)ack->lParam, 0)); sprintf(log,"%s lParam: %s;",log,str); -// if (theDialog) SendDlgItemMessage(theDialog, 40206, WM_SETTEXT, 0,str); +// if (theDialog) SendDlgItemMessage(theDialog, 40206, WM_SETTEXT, 0,str); CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)log); #endif return 0; } - + int SimulateIdle(int idlstatus) { @@ -502,7 +503,7 @@ int SimulateIdle(int idlstatus) } if (idleOptsPerm&IdleBitsPrivate) flags |= IDF_PRIVACY; isCurrentlyIdle = idlstatus; - NotifyEventHooks( hIdleEvent, 0, flags ); + NotifyEventHooks( hIdleEvent, 0, flags ); return 0; } @@ -516,12 +517,12 @@ LRESULT SetDlgItemsAA(HWND hwndDlg, int coursel){ EnableWindow(GetDlgItem(hwndDlg, IDC_AALONGSTATUS), enabledLong); CheckDlgButton(hwndDlg, IDC_AASHORTIDLE, enabledShort?BST_CHECKED:BST_UNCHECKED ); CheckDlgButton(hwndDlg, IDC_AALONGIDLE, enabledLong?BST_CHECKED:BST_UNCHECKED ); - + SendDlgItemMessage(hwndDlg, IDC_AASTATUS, CB_RESETCONTENT, 0, 0); SendDlgItemMessage(hwndDlg, IDC_AALONGSTATUS, CB_RESETCONTENT, 0, 0); for (i=0;iidFrom - + } //WTF??? if(wParam!=0x12345678) SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); - break; + break; } return FALSE; } - - - diff --git a/plugins/!NotAdopted/SmartAutoAway/globals.cpp b/plugins/!NotAdopted/SmartAutoAway/globals.cpp index 396b04e842..93452a9216 100644 --- a/plugins/!NotAdopted/SmartAutoAway/globals.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/globals.cpp @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2006 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-06 Miranda ICQ/IM project, +all portions of this codebase are copyrighted to the people listed in contributors.txt. This program is free software; you can redistribute it and/or @@ -110,4 +111,3 @@ HOTKEYDESC hotkeydescs[] = { {sizeof(HOTKEYDESC), "saa_belongidle", "Long Idle", SECTIONNAME, AA_IDLE_BELONGIDLESERVICE, 0, 0}, {sizeof(HOTKEYDESC), "saa_reconnect", "Reconnect", SECTIONNAME, AA_IDLE_RECONNECTSERVICE, 0, 0}, }; - diff --git a/plugins/!NotAdopted/SmartAutoAway/idle.cpp b/plugins/!NotAdopted/SmartAutoAway/idle.cpp index 3a12ff2967..9b3a1b397a 100644 --- a/plugins/!NotAdopted/SmartAutoAway/idle.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/idle.cpp @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2006 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-06 Miranda ICQ/IM project, +all portions of this codebase are copyrighted to the people listed in contributors.txt. This program is free software; you can redistribute it and/or @@ -118,7 +119,7 @@ static BOOL idleDialogInInit = FALSE; #ifdef UNICODE TCHAR *awayMsg=0; if (HasAwayMessageW){ - awayMsg = (TCHAR *) CallService(MS_AWAYMSG_GETSTATUSMSGW, (WPARAM) courAwayStatus[j], 0); + awayMsg = (TCHAR *) CallService(MS_AWAYMSG_GETSTATUSMSGW, (WPARAM) courAwayStatus[j], 0); } else { char *temp=(char *)CallService(MS_AWAYMSG_GETSTATUSMSG, (WPARAM) courAwayStatus[j], 0); if ((int)temp == CALLSERVICE_NOTFOUND) awayMsg = 0; @@ -228,25 +229,25 @@ static BOOL idleDialogInInit = FALSE; case 1: flags |= IDF_LONG; break; case 2: flags |= IDF_ONFORCE; break; } - if ( isIdle[j]==1 && isEventFired[j] == 0 ) { // idle and no one knows + if ( isIdle[j]==1 && isEventFired[j] == 0 ) { // idle and no one knows isEventFired[j]=1; - NotifyEventHooks( hIdleEvent, 0, IDF_ISIDLE | flags ); + NotifyEventHooks( hIdleEvent, 0, IDF_ISIDLE | flags ); } if ( isIdle[j]==0 && isEventFired[j] == 1 ) { // not idle, no one knows isEventFired[j]=0; - if ( !(idleOptsPerm&IdleSuppressAutoHere) ) NotifyEventHooks( hIdleEvent, 0, flags ); + if ( !(idleOptsPerm&IdleSuppressAutoHere) ) NotifyEventHooks( hIdleEvent, 0, flags ); } - }//for + }//for // { // int flags = ( idleOptsPerm&IdleBitsPrivate ? IDF_PRIVACY:0 ); // if (isIdle[0]||isIdle[1]||isIdle[2]) flags |= IDF_ISIDLE; // if (isIdle[0]) flags |= IDF_SHORT; // if (isIdle[1]) flags |= IDF_LONG; // if (isIdle[2]) flags |= IDF_ONFORCE; -// NotifyEventHooks( hIdleEvent, 0, flags ); +// NotifyEventHooks( hIdleEvent, 0, flags ); // } } - + INT_PTR IdleGetInfo(WPARAM wParam, LPARAM lParam) { MIRANDA_IDLE_INFO * mii = (MIRANDA_IDLE_INFO *) lParam; @@ -277,16 +278,16 @@ INT_PTR CALLBACK DlgProcOptsIdle(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l TranslateDialogDefault(hwndDlg); InitDialogIdlePart(hwndDlg); return TRUE; - case WM_USER+4: + case WM_USER+4: { - DWORD nID[] = { IDC_IDLEONWINDOWS, - IDC_IDLEUSEGLI, - IDC_IDLEONMIRANDA, - IDC_SCREENSAVER, - IDC_LOCKED, - IDC_IDLESHORT, - IDC_IDLE1STTIME, - IDC_IDLELONG, + DWORD nID[] = { IDC_IDLEONWINDOWS, + IDC_IDLEUSEGLI, + IDC_IDLEONMIRANDA, + IDC_SCREENSAVER, + IDC_LOCKED, + IDC_IDLESHORT, + IDC_IDLE1STTIME, + IDC_IDLELONG, IDC_IDLE2NDTIME//,IDC_IDLEPRIVATE }; int j; @@ -298,7 +299,7 @@ INT_PTR CALLBACK DlgProcOptsIdle(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l case IDC_IDLE1STTIME: nEnable &= IsDlgButtonChecked(hwndDlg, IDC_IDLESHORT) == BST_CHECKED ? 1 : 0; break; case IDC_IDLE2NDTIME: nEnable &= IsDlgButtonChecked(hwndDlg, IDC_IDLELONG) == BST_CHECKED ? 1 : 0; break; } - EnableWindow(GetDlgItem(hwndDlg, nID[j]), nEnable); + EnableWindow(GetDlgItem(hwndDlg, nID[j]), nEnable); } idleOpts=SetBits(idleOpts,IdleBitsCheck, IsDlgButtonChecked(hwndDlg, IDC_IDLECHECK) == BST_CHECKED); @@ -313,7 +314,7 @@ INT_PTR CALLBACK DlgProcOptsIdle(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l idleOpts=SetBits(idleOpts,IdleSuppressIdleMenu, IsDlgButtonChecked(hwndDlg, IDC_DISABLEIDLEMENU) == BST_CHECKED); idleOpts=SetBits(idleOpts,IdleHereOnStatusChange, IsDlgButtonChecked(hwndDlg, IDC_HEREONSTATUSCHANGE) == BST_CHECKED); break; - } + } case WM_USER+8: { if (wParam == IDC_IDLE1STTIME) idleOpts = SetBits(idleOpts,IdleBitsTimeFirst,GetDlgItemInt(hwndDlg, wParam, NULL, FALSE)); @@ -322,7 +323,7 @@ INT_PTR CALLBACK DlgProcOptsIdle(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l } case WM_COMMAND: switch (LOWORD(wParam)) { - case IDC_IDLEBUTTON: + case IDC_IDLEBUTTON: case IDC_IDLEBUTTON+1: case IDC_IDLEBUTTON+2:SimulateIdle(LOWORD(wParam)-IDC_IDLEBUTTON); break; case IDC_IDLECHECK: @@ -331,7 +332,7 @@ INT_PTR CALLBACK DlgProcOptsIdle(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l case IDC_IDLESHORT: case IDC_IDLELONG: case IDC_IDLEUSEGLI: - case IDC_SCREENSAVER: + case IDC_SCREENSAVER: case IDC_LOCKED: case IDC_IDLEPRIVATE: case IDC_DISBABLEAUTOHERE: @@ -350,7 +351,7 @@ INT_PTR CALLBACK DlgProcOptsIdle(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l } } if (!idleDialogInInit) if ((HIWORD(wParam)==BN_CLICKED)||(HIWORD(wParam)==EN_CHANGE)) - { + { if ((LOWORD(wParam)!=IDC_IDLEBUTTON)&&(LOWORD(wParam)!=IDC_IDLEBUTTON+1)&&(LOWORD(wParam)!=IDC_IDLEBUTTON+2)) SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); } @@ -371,4 +372,3 @@ INT_PTR CALLBACK DlgProcOptsIdle(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l } return FALSE; } - diff --git a/plugins/!NotAdopted/SmartAutoAway/idleMenu.cpp b/plugins/!NotAdopted/SmartAutoAway/idleMenu.cpp index ae03310421..70fa98a8f3 100644 --- a/plugins/!NotAdopted/SmartAutoAway/idleMenu.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/idleMenu.cpp @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2006 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-06 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/plugins/!NotAdopted/SmartAutoAway/idleMessages.cpp b/plugins/!NotAdopted/SmartAutoAway/idleMessages.cpp index 9af5eec131..9522ba9b7e 100644 --- a/plugins/!NotAdopted/SmartAutoAway/idleMessages.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/idleMessages.cpp @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2006 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-06 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -23,8 +24,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "globals.h" -long *idleMessOptsPerm; -long *idleMessOpts; +long *idleMessOptsPerm; +long *idleMessOpts; // xxxx xxxL xxxS xxxH xxxE xxx- RSTHERE- int *messCaps=0; @@ -100,8 +101,8 @@ LRESULT SetDlgItemsIdleMessages(HWND hwndDlg, int coursel){ CheckDlgButton(hwndDlg, IDC_IDLEMSGHERE_THIS, (statusAvail[0] && GetBits(idleMessOpts[coursel],IdleMessOptsMaskUseHere))?BST_CHECKED:BST_UNCHECKED ); CheckDlgButton(hwndDlg, IDC_ENABLERESTOREMSG, ( - statusAvail[0] && - GetBits(idleMessOpts[coursel],IdleMessOptsMaskUseHere) && + statusAvail[0] && + GetBits(idleMessOpts[coursel],IdleMessOptsMaskUseHere) && GetBits(idleMessOpts[coursel],IdleMessOptsMaskRstHere))?BST_CHECKED:BST_UNCHECKED ); CheckDlgButton(hwndDlg, IDC_IDLEMSGSHORT_THIS, (statusAvail[1] && GetBits(idleMessOpts[coursel],IdleMessOptsMaskUseShort))?BST_CHECKED:BST_UNCHECKED ); CheckDlgButton(hwndDlg, IDC_IDLEMSGLONG_THIS, (statusAvail[2] && GetBits(idleMessOpts[coursel],IdleMessOptsMaskUseLong))?BST_CHECKED:BST_UNCHECKED ); @@ -138,27 +139,27 @@ INT_PTR CALLBACK DlgProcOptsIdleMessages(HWND hwndDlg, UINT msg, WPARAM wParam, return TRUE; case WM_USER+1: { - EnableWindow(GetDlgItem(hwndDlg, IDC_RESTOREMSGSLIDER), wParam); + EnableWindow(GetDlgItem(hwndDlg, IDC_RESTOREMSGSLIDER), wParam); idleMessOpts[courProtocolSelection] = SetBits(idleMessOpts[courProtocolSelection],IdleMessOptsMaskRstHere,wParam); break; } case WM_USER+2: { - EnableWindow(GetDlgItem(hwndDlg, IDC_IDLEMSGHERE), wParam); - EnableWindow(GetDlgItem(hwndDlg, IDC_RESTOREMSGSLIDER), wParam); - EnableWindow(GetDlgItem(hwndDlg, IDC_ENABLERESTOREMSG), wParam); + EnableWindow(GetDlgItem(hwndDlg, IDC_IDLEMSGHERE), wParam); + EnableWindow(GetDlgItem(hwndDlg, IDC_RESTOREMSGSLIDER), wParam); + EnableWindow(GetDlgItem(hwndDlg, IDC_ENABLERESTOREMSG), wParam); idleMessOpts[courProtocolSelection] = SetBits(idleMessOpts[courProtocolSelection],IdleMessOptsMaskUseHere,wParam); break; } case WM_USER+3: { - EnableWindow(GetDlgItem(hwndDlg, IDC_IDLEMSGSHORT), wParam); + EnableWindow(GetDlgItem(hwndDlg, IDC_IDLEMSGSHORT), wParam); idleMessOpts[courProtocolSelection] = SetBits(idleMessOpts[courProtocolSelection],IdleMessOptsMaskUseShort,wParam); break; } case WM_USER+4: { - EnableWindow(GetDlgItem(hwndDlg, IDC_IDLEMSGLONG), wParam); + EnableWindow(GetDlgItem(hwndDlg, IDC_IDLEMSGLONG), wParam); idleMessOpts[courProtocolSelection] = SetBits(idleMessOpts[courProtocolSelection],IdleMessOptsMaskUseLong,wParam); break; } @@ -182,7 +183,7 @@ INT_PTR CALLBACK DlgProcOptsIdleMessages(HWND hwndDlg, UINT msg, WPARAM wParam, { SendMessage(hwndDlg, WM_USER+1, (WPARAM)IsDlgButtonChecked(hwndDlg, IDC_ENABLERESTOREMSG) == BST_CHECKED, 0); break; - } + } case IDC_IDLEMSGHERE_THIS: { SendMessage(hwndDlg,WM_USER+2, (WPARAM)IsDlgButtonChecked(hwndDlg, IDC_IDLEMSGHERE_THIS) == BST_CHECKED, 0); @@ -205,7 +206,7 @@ INT_PTR CALLBACK DlgProcOptsIdleMessages(HWND hwndDlg, UINT msg, WPARAM wParam, GetDlgItemText(hwndDlg,IDC_IDLEMSGHERE,str,maxMessageLength+1); SendMessage(hwndDlg,WM_USER+8, 0, (LPARAM)str); } else if (HIWORD(wParam)==EN_KILLFOCUS) { - GetDlgItemText(hwndDlg,IDC_IDLEMSGHERE,mesgHere[courProtocolSelection],maxMessageLength+1); + GetDlgItemText(hwndDlg,IDC_IDLEMSGHERE,mesgHere[courProtocolSelection],maxMessageLength+1); SendMessage(hwndDlg,WM_USER+8, 0, (LPARAM)""); } break; @@ -217,7 +218,7 @@ INT_PTR CALLBACK DlgProcOptsIdleMessages(HWND hwndDlg, UINT msg, WPARAM wParam, GetDlgItemText(hwndDlg,IDC_IDLEMSGSHORT,str,maxMessageLength+1); SendMessage(hwndDlg,WM_USER+8, 0, (LPARAM)str); } else if (HIWORD(wParam)==EN_KILLFOCUS) { - GetDlgItemText(hwndDlg,IDC_IDLEMSGSHORT,mesgShort[courProtocolSelection],maxMessageLength+1); + GetDlgItemText(hwndDlg,IDC_IDLEMSGSHORT,mesgShort[courProtocolSelection],maxMessageLength+1); SendMessage(hwndDlg,WM_USER+8, 0, (LPARAM)""); } break; @@ -229,7 +230,7 @@ INT_PTR CALLBACK DlgProcOptsIdleMessages(HWND hwndDlg, UINT msg, WPARAM wParam, GetDlgItemText(hwndDlg,IDC_IDLEMSGLONG,str,maxMessageLength+1); SendMessage(hwndDlg,WM_USER+8, 0, (LPARAM)str); } else if (HIWORD(wParam)==EN_KILLFOCUS) { - GetDlgItemText(hwndDlg,IDC_IDLEMSGLONG,mesgLong[courProtocolSelection],maxMessageLength+1); + GetDlgItemText(hwndDlg,IDC_IDLEMSGLONG,mesgLong[courProtocolSelection],maxMessageLength+1); SendMessage(hwndDlg,WM_USER+8, 0, (LPARAM)""); } break; @@ -253,7 +254,7 @@ INT_PTR CALLBACK DlgProcOptsIdleMessages(HWND hwndDlg, UINT msg, WPARAM wParam, break; //case WM_COMMAND } if (!idleDialogInInit) if ((HIWORD(wParam)==BN_CLICKED)||(HIWORD(wParam)==EN_CHANGE)) - { + { if (LOWORD(wParam)!=IDC_VARIABLES) SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); } diff --git a/plugins/!NotAdopted/SmartAutoAway/reconnect.cpp b/plugins/!NotAdopted/SmartAutoAway/reconnect.cpp index 6857c28e03..e8ab39432d 100644 --- a/plugins/!NotAdopted/SmartAutoAway/reconnect.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/reconnect.cpp @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2006 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-06 Miranda ICQ/IM project, +all portions of this codebase are copyrighted to the people listed in contributors.txt. This program is free software; you can redistribute it and/or @@ -86,9 +87,9 @@ void ProtocolsProc(int protoIndex, ACKDATA * ack) } #ifdef AALOG -#define AALOG2 +#define AALOG2 #endif -int IsReconnectForbidden(int protoIndex){ //0 if it permitted +int IsReconnectForbidden(int protoIndex){ //0 if it permitted #ifdef AALOG2 char str[256]; #endif @@ -170,7 +171,7 @@ void TimerProc() ); CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)str); #endif - if ((courAwayStatus[i]==ID_STATUS_OFFLINE)||(reqStatus[i]==ID_STATUS_OFFLINE)){ + if ((courAwayStatus[i]==ID_STATUS_OFFLINE)||(reqStatus[i]==ID_STATUS_OFFLINE)){ protoStatus[i]&=2; //keeping fatalerror if any #ifdef AALOG sprintf(str,"TimerProc: %s Counting Cancelled: AwayStatus: %s; reqStatus: %s;", @@ -190,18 +191,18 @@ void TimerProc() case 4 : sprintf(str,"IsReconnectForbidden: %s fatal error and DontReconnect enabled",accounts[i]->szModuleName); break; case 5 : sprintf(str,"IsReconnectForbidden: %s current AAStatus should not be reconnected",accounts[i]->szModuleName); break; #endif - case 0 : + case 0 : #ifdef AALOG sprintf(str,"IsReconnectForbidden: %s is permited to reconnect",accounts[i]->szModuleName); #endif CallProtoService(accounts[i]->szModuleName, PS_SETSTATUS, courAwayStatus[i], 0); break; - default : + default : #ifdef AALOG sprintf(str,"IsReconnectForbidden: %s Surprising answer",accounts[i]->szModuleName); #endif break; - } + } #ifdef AALOG1 CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)str); #endif @@ -252,7 +253,7 @@ INT_PTR CALLBACK DlgProcOptsReconnect(HWND hwndDlg, UINT msg, WPARAM wParam, LPA int thebit = numStatuses-StatusToProtoIndex(LOWORD(lParam),allprotomodes); int value = IsDlgButtonChecked(hwndDlg, LOWORD(lParam)+32)==BST_CHECKED; thebit = 1<szModuleName); //get last requested status @@ -250,7 +251,7 @@ int InitVariables( WPARAM wParam, LPARAM lParam ) mesgLongPerm[j]=(TCHAR *)mir_alloc(sizeof(TCHAR)*(maxMessageLength+1)); if (messCaps[j]){ - DBVARIANT dbv; + DBVARIANT dbv; sprintf(str,idleMsgOptionsName,accounts[j]->szModuleName); idleMessOptsPerm[j] = idleMessOpts[j] = db_get_dw(NULL,AA_MODULE,str,idleMsgOptionsDefault); @@ -305,14 +306,14 @@ int InitVariables( WPARAM wParam, LPARAM lParam ) } CallService("Netlib/Log" ,(WPARAM)hNetlib ,(LPARAM)str); - } + } #endif //something is hapaning here on startup, if main status is not offline //will move Notify hIdleEvent for later in the IdleTimer // NotifyEventHooks( hIdleEvent, 0, idleOpts&IdleBitsPrivate?IDF_PRIVACY:0 ); //Tell everyone we are here FirstTick = 1; //we will wait 1 ticks of the timer before Forcing Awake // FirstTick = 10; //we will wait 20 seconds before Forcing Awake - hIdleTimer=SetTimer(NULL, 0, 2000, IdleTimer); + hIdleTimer=SetTimer(NULL, 0, 2000, IdleTimer); // { // char str[20000]=""; // for (i=0;i<=101;i++){ diff --git a/plugins/!NotAdopted/SmartAutoAway/saani.cpp b/plugins/!NotAdopted/SmartAutoAway/saani.cpp index 348b21bae3..b37c49ddd9 100644 --- a/plugins/!NotAdopted/SmartAutoAway/saani.cpp +++ b/plugins/!NotAdopted/SmartAutoAway/saani.cpp @@ -1,8 +1,9 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2006 Miranda ICQ/IM project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-06 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/plugins/!NotAdopted/mDynDNS/m_mDynDNS.h b/plugins/!NotAdopted/mDynDNS/m_mDynDNS.h index c59b38a98d..15a01b20c0 100644 --- a/plugins/!NotAdopted/mDynDNS/m_mDynDNS.h +++ b/plugins/!NotAdopted/mDynDNS/m_mDynDNS.h @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2004 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (ñ) 2000-04 Miranda ICQ/IM project, +all portions of this codebase are copyrighted to the people listed in contributors.txt. This program is free software; you can redistribute it and/or @@ -40,7 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // obtain the IP // wParam = (IPMODE) - above MDYNDNS_IPMODE flag // lParam = (char*) - pointer (min 16 bit buffer) that recive the IP (NULL on failure) -// returns: other than 0 on failure, +// returns: other than 0 on failure, #define ME_MDYNDNS_GETIP "mDynDNS/GetIP" diff --git a/plugins/!NotAdopted/rps/rps.cpp b/plugins/!NotAdopted/rps/rps.cpp index 33d51a3c40..bbf6d794d8 100644 --- a/plugins/!NotAdopted/rps/rps.cpp +++ b/plugins/!NotAdopted/rps/rps.cpp @@ -1,9 +1,10 @@ /* -Miranda IM: the free IM client for Microsoft* Windows* +Miranda NG: the free IM client for Microsoft* Windows* -Copyright 2000-2005 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-05 Miranda ICQ/IM project, +all portions of this codebase are copyrighted to the people listed in contributors.txt. This program is free software; you can redistribute it and/or @@ -20,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -Created by Pescuma +Created by Pescuma Based on work by nullbie */ @@ -99,7 +100,7 @@ __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) // Are we running under Unicode Windows version ? if ((GetVersion() & 0x80000000) == 0) pluginInfo.flags = 1; // UNICODE_AWARE - + pluginInfo.cbSize = sizeof(PLUGININFOEX); return &pluginInfo; } @@ -403,7 +404,7 @@ void RemoveSettings() value = strchr(name, '='); if (value == NULL) value = &name[strlen(name)]; - + // Has " ? if (*name == '"' && *(value-1) == '"') { @@ -436,7 +437,7 @@ void ExecuteServices() value = strchr(name, '='); if (value == NULL) value = &name[strlen(name)]; - + // Has " ? if (*name == '"' && *(value-1) == '"') { @@ -495,7 +496,7 @@ void RemoveDirectories() value = strchr(name, '='); if (value == NULL) value = &name[strlen(name)]; - + // Has " ? if (*name == '"' && *(value-1) == '"') { @@ -531,7 +532,7 @@ void DisablePlugins() value = strchr(name, '='); if (value == NULL) value = &name[strlen(name)]; - + // Has " ? if (*name == '"' && *(value-1) == '"') { @@ -614,7 +615,7 @@ void DeleteFileOrFolder(const char *name) strTmp = &tmp[strlen(tmp)]; } - do + do { if (strcmp(findData.cFileName, ".") && strcmp(findData.cFileName, "..")) { @@ -640,7 +641,7 @@ void DeleteFileOrFolder(const char *name) hwnd = FindFirstFile(tmp, &findData); if (hwnd != INVALID_HANDLE_VALUE) { - do + do { if (strcmp(findData.cFileName, ".") && strcmp(findData.cFileName, "..")) { @@ -656,7 +657,7 @@ void DeleteFileOrFolder(const char *name) // Delete directory RemoveDirectory(name); } - else // Is a File + else // Is a File { SetFileAttributes(name, FILE_ATTRIBUTE_ARCHIVE); DeleteFile(name); @@ -677,7 +678,7 @@ BOOL isMetaContact(HANDLE hContact) dbcgs.szModule="Protocol"; dbcgs.szSetting="p"; - if(CallService(MS_DB_CONTACT_GETSETTINGSTATIC,(WPARAM)hContact,(LPARAM)&dbcgs)) + if(CallService(MS_DB_CONTACT_GETSETTINGSTATIC,(WPARAM)hContact,(LPARAM)&dbcgs)) return FALSE; return strcmp(dbcgs.pValue->pszVal, METACONTACTS_PROTOCOL_NAME) == 0; @@ -818,4 +819,3 @@ void DeleteSetting(const char *setting) free(szModule); } - -- cgit v1.2.3