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 --- src/modules/protocols/protoaccs.cpp | 9 +++++---- src/modules/protocols/protochains.cpp | 7 ++++--- src/modules/protocols/protocols.cpp | 5 +++-- src/modules/protocols/protodir.cpp | 11 ++++++----- src/modules/protocols/protoint.cpp | 13 +++++++------ src/modules/protocols/protoopts.cpp | 11 ++++++----- 6 files changed, 31 insertions(+), 25 deletions(-) (limited to 'src/modules/protocols') diff --git a/src/modules/protocols/protoaccs.cpp b/src/modules/protocols/protoaccs.cpp index 5cfd87c053..aed4ae4c62 100644 --- a/src/modules/protocols/protoaccs.cpp +++ b/src/modules/protocols/protoaccs.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-12 Miranda IM, 2012-13 Miranda NG project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +12,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. @@ -337,7 +338,7 @@ static INT_PTR stub16(PROTO_INTERFACE* ppi, WPARAM, LPARAM lParam) static INT_PTR stub17(PROTO_INTERFACE* ppi, WPARAM, LPARAM lParam) { PROTOSEARCHBYNAME* psbn = (PROTOSEARCHBYNAME*)lParam; - return (INT_PTR)ppi->SearchByName(StrConvT((char*)psbn->pszNick), + return (INT_PTR)ppi->SearchByName(StrConvT((char*)psbn->pszNick), StrConvT((char*)psbn->pszFirstName), StrConvT((char*)psbn->pszLastName)); } diff --git a/src/modules/protocols/protochains.cpp b/src/modules/protocols/protochains.cpp index f614fd50e2..95392c4331 100644 --- a/src/modules/protocols/protochains.cpp +++ b/src/modules/protocols/protochains.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-12 Miranda IM, 2012-13 Miranda NG project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +12,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. diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp index bc401e4449..3de239ebbb 100644 --- a/src/modules/protocols/protocols.cpp +++ b/src/modules/protocols/protocols.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-12 Miranda IM, 2012-13 Miranda NG project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/modules/protocols/protodir.cpp b/src/modules/protocols/protodir.cpp index f5f82bc304..7d01fa56ce 100644 --- a/src/modules/protocols/protodir.cpp +++ b/src/modules/protocols/protodir.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 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-12 Miranda 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 @@ -124,7 +125,7 @@ char * contactDir_Proto_Get(contactDir * cd, HANDLE hContact) e.proto=""; e.id=""; EnterCriticalSection(&cd->csLock); - if ( List_GetIndex(&cd->protoCache, &e, &index) ) { + if ( List_GetIndex(&cd->protoCache, &e, &index) ) { contactEntry * p = cd->protoCache.items[index]; szCache = p->proto; } @@ -220,7 +221,7 @@ static int contactDirGetProto(WPARAM wParam, LPARAM lParam) return (int) contactDir_Proto_Get(&condir,(HANDLE)wParam); } -#endif +#endif void InitContactDir(void) { diff --git a/src/modules/protocols/protoint.cpp b/src/modules/protocols/protoint.cpp index abe590f541..ba6e40f01e 100644 --- a/src/modules/protocols/protoint.cpp +++ b/src/modules/protocols/protoint.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-12 Miranda IM, 2012-13 Miranda NG project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +12,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. @@ -75,7 +76,7 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE int __cdecl AuthRequest(HANDLE hContact, const TCHAR* szMessage) { CCSDATA ccs = { hContact, PSS_AUTHREQUEST, 0, (LPARAM)szMessage }; - ccs.lParam = (LPARAM)mir_t2a(szMessage); + ccs.lParam = (LPARAM)mir_t2a(szMessage); int res = (int)ProtoCallService(m_szModuleName, PSS_AUTHREQUEST, 0, (LPARAM)&ccs); mir_free((char*)ccs.lParam); return res; @@ -90,7 +91,7 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE { CCSDATA ccs = { hContact, PSS_FILEALLOW, (WPARAM)hTransfer, (LPARAM)szPath }; - ccs.lParam = (LPARAM)mir_t2a(szPath); + ccs.lParam = (LPARAM)mir_t2a(szPath); HANDLE res = (HANDLE)ProtoCallService(m_szModuleName, PSS_FILEALLOW, 0, (LPARAM)&ccs); mir_free((char*)ccs.lParam); return res; @@ -106,7 +107,7 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE { CCSDATA ccs = { hContact, PSS_FILEDENY, (WPARAM)hTransfer, (LPARAM)szReason }; - ccs.lParam = (LPARAM)mir_t2a(szReason); + ccs.lParam = (LPARAM)mir_t2a(szReason); int res = (int)ProtoCallService(m_szModuleName, PSS_FILEDENY, 0, (LPARAM)&ccs); mir_free((char*)ccs.lParam); return res; diff --git a/src/modules/protocols/protoopts.cpp b/src/modules/protocols/protoopts.cpp index 522a77e616..eddded512c 100644 --- a/src/modules/protocols/protoopts.cpp +++ b/src/modules/protocols/protoopts.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-12 Miranda IM, 2012-13 Miranda NG project, +Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org), +Copyright (c) 2000-12 Miranda IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -11,7 +12,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. @@ -783,7 +784,7 @@ INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM if (dwStatus >= ID_STATUS_ONLINE) { TCHAR buf[ 200 ]; mir_sntprintf(buf, SIZEOF(buf), TranslateT("Account %s is being disabled"), pa->tszAccountName); - if (IDNO == ::MessageBox(hwndDlg, + if (IDNO == ::MessageBox(hwndDlg, TranslateT("Account is online. Disable account?"), buf, MB_ICONWARNING | MB_DEFBUTTON2 | MB_YESNO)) { pa->bIsEnabled = 1; //stay enabled @@ -854,7 +855,7 @@ INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM TCHAR buf[ 200 ]; mir_sntprintf(buf, SIZEOF(buf), TranslateT("Account %s is being deleted"), pa->tszAccountName); if (pa->bOldProto) { - MessageBox(NULL, TranslateT("You need to disable plugin to delete this account"), buf, + MessageBox(NULL, TranslateT("You need to disable plugin to delete this account"), buf, MB_ICONERROR | MB_OK); break; } -- cgit v1.2.3