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/core/commonheaders.h | 5 +++-- src/core/memory.cpp | 9 +++++---- src/core/miranda.cpp | 7 ++++--- src/core/miranda.h | 9 +++++---- src/core/modules.cpp | 7 ++++--- src/core/modules.h | 11 ++++++----- src/core/stdafx.cpp | 2 +- src/core/stdauth/auth.cpp | 5 +++-- src/core/stdauth/authdialogs.cpp | 15 ++++++++------- src/core/stdauth/commonheaders.h | 5 +++-- src/core/stdautoaway/autoaway.cpp | 5 +++-- src/core/stdautoaway/commonheaders.h | 5 +++-- src/core/stdaway/awaymsg.cpp | 9 +++++---- src/core/stdaway/commonheaders.h | 5 +++-- src/core/stdaway/sendmsg.cpp | 21 +++++++++++---------- src/core/stdchat/src/manager.cpp | 2 +- src/core/stdchat/src/services.cpp | 2 +- src/core/stdchat/src/stdafx.cpp | 2 +- src/core/stdchat/src/tools.cpp | 2 +- src/core/stdchat/src/window.cpp | 2 +- src/core/stdclist/src/clc.h | 5 +++-- src/core/stdclist/src/clcfonts.cpp | 5 +++-- src/core/stdclist/src/clcopts.cpp | 17 +++++++++-------- src/core/stdclist/src/clcpaint.cpp | 5 +++-- src/core/stdclist/src/clistmenus.cpp | 5 +++-- src/core/stdclist/src/clistopts.cpp | 11 ++++++----- src/core/stdclist/src/cluiopts.cpp | 5 +++-- src/core/stdclist/src/commonheaders.h | 5 +++-- src/core/stdclist/src/init.cpp | 5 +++-- src/core/stdclist/src/stdafx.cpp | 2 +- src/core/stdcrypt/commonheaders.h | 5 +++-- src/core/stdcrypt/encrypt.cpp | 2 +- src/core/stdcrypt/utils.cpp | 2 +- src/core/stdcrypt/version.h | 2 +- src/core/stdemail/commonheaders.h | 5 +++-- src/core/stdemail/email.cpp | 7 ++++--- src/core/stdfile/commonheaders.h | 5 +++-- src/core/stdfile/file.cpp | 7 ++++--- src/core/stdfile/file.h | 9 +++++---- src/core/stdfile/fileexistsdlg.cpp | 19 ++++++++++--------- src/core/stdfile/fileopts.cpp | 28 ++++++++++++++-------------- src/core/stdfile/filerecvdlg.cpp | 5 +++-- src/core/stdfile/filesenddlg.cpp | 5 +++-- src/core/stdfile/filexferdlg.cpp | 5 +++-- src/core/stdfile/ftmanager.cpp | 5 +++-- src/core/stdhelp/about.cpp | 5 +++-- src/core/stdhelp/commonheaders.h | 5 +++-- src/core/stdhelp/help.cpp | 5 +++-- src/core/stdidle/commonheaders.h | 5 +++-- src/core/stdidle/idle.cpp | 5 +++-- src/core/stdmsg/src/cmdlist.cpp | 2 +- src/core/stdmsg/src/cmdlist.h | 2 +- src/core/stdmsg/src/commonheaders.h | 2 +- src/core/stdmsg/src/globals.cpp | 2 +- src/core/stdmsg/src/globals.h | 2 +- src/core/stdmsg/src/msgdialog.cpp | 2 +- src/core/stdmsg/src/msglog.cpp | 2 +- src/core/stdmsg/src/msgoptions.cpp | 2 +- src/core/stdmsg/src/msgs.cpp | 2 +- src/core/stdmsg/src/msgs.h | 2 +- src/core/stdmsg/src/msgtimedout.cpp | 2 +- src/core/stdmsg/src/richutil.cpp | 2 +- src/core/stdmsg/src/richutil.h | 2 +- src/core/stdmsg/src/srmm.cpp | 2 +- src/core/stdmsg/src/statusicon.cpp | 2 +- src/core/stdmsg/src/stdafx.cpp | 2 +- src/core/stduihist/commonheaders.h | 5 +++-- src/core/stduihist/history.cpp | 7 ++++--- src/core/stdurl/commonheaders.h | 5 +++-- src/core/stdurl/url.cpp | 9 +++++---- src/core/stdurl/url.h | 9 +++++---- src/core/stdurl/urldialogs.cpp | 25 +++++++++++++------------ src/core/stduserinfo/commonheaders.h | 5 +++-- src/core/stduserinfo/contactinfo.cpp | 5 +++-- src/core/stduserinfo/stdinfo.cpp | 7 ++++--- src/core/stduserinfo/userinfo.cpp | 5 +++-- src/core/stduseronline/commonheaders.h | 5 +++-- src/core/stduseronline/useronline.cpp | 5 +++-- 78 files changed, 253 insertions(+), 202 deletions(-) (limited to 'src/core') diff --git a/src/core/commonheaders.h b/src/core/commonheaders.h index e1e4ef2544..482bab7f2d 100644 --- a/src/core/commonheaders.h +++ b/src/core/commonheaders.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-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/core/memory.cpp b/src/core/memory.cpp index b043bd450d..45947ea0ad 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.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-12 Miranda IM, 2012-13 Miranda NG 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 @@ -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/core/miranda.cpp b/src/core/miranda.cpp index 522843e919..cf6dec614e 100644 --- a/src/core/miranda.cpp +++ b/src/core/miranda.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. @@ -246,7 +247,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR cmdLine, int) CreateServiceFunction(MS_SYSTEM_GETIDLE, SystemGetIdle); dwEventTime = GetTickCount(); DWORD myPid = GetCurrentProcessId(); - + bool messageloop = true; while (messageloop) { MSG msg; diff --git a/src/core/miranda.h b/src/core/miranda.h index 044b16f38c..fffbbbf689 100644 --- a/src/core/miranda.h +++ b/src/core/miranda.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-12 Miranda IM, 2012-13 Miranda NG 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 @@ -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/core/modules.cpp b/src/core/modules.cpp index 14672ff796..e90d18941d 100644 --- a/src/core/modules.cpp +++ b/src/core/modules.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. @@ -124,7 +125,7 @@ int LoadDefaultModules(void) case SERVICE_CONTINUE: // continue loading Miranda normally break; case SERVICE_ONLYDB: // load database and go to the message cycle - return 0; + return 0; case SERVICE_MONOPOLY: // unload database and go to the message cycle UnloadDatabase(); return 0; diff --git a/src/core/modules.h b/src/core/modules.h index 3bb9f1c1f5..cc03e0c2b9 100644 --- a/src/core/modules.h +++ b/src/core/modules.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-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. @@ -197,7 +198,7 @@ serviceProc is defined by the caller as where fnParam does not need to be publicly known. Gives the ability to handle multiple services with the same function. -added during 0.7+ (2007/04/24) +added during 0.7+ (2007/04/24) */ HANDLE CreateServiceFunctionParam(const char *name, MIRANDASERVICEPARAM serviceProc, LPARAM lParam); @@ -209,7 +210,7 @@ serviceProc is defined by the caller as where fnParam does not need to be publicly known. Gives the ability to handle multiple services with the same function. -added during 0.7+ (2007/04/24) +added during 0.7+ (2007/04/24) */ HANDLE CreateServiceFunctionObj(const char *name, MIRANDASERVICEOBJ serviceProc, void* object); diff --git a/src/core/stdafx.cpp b/src/core/stdafx.cpp index 838b101bd3..df76ee5802 100644 --- a/src/core/stdafx.cpp +++ b/src/core/stdafx.cpp @@ -1,6 +1,6 @@ /* -Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org) +Copyright (C) 2012-14 Miranda NG team (http://miranda-ng.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/core/stdauth/auth.cpp b/src/core/stdauth/auth.cpp index 7f349ede03..f02278e81b 100644 --- a/src/core/stdauth/auth.cpp +++ b/src/core/stdauth/auth.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/core/stdauth/authdialogs.cpp b/src/core/stdauth/authdialogs.cpp index b366b3956c..900de05b61 100644 --- a/src/core/stdauth/authdialogs.cpp +++ b/src/core/stdauth/authdialogs.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-12 Miranda IM, 2012-13 Miranda NG 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 @@ -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. @@ -103,7 +104,7 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar case WM_COMMAND: switch (LOWORD(wParam)) { case IDC_ADD: - { + { ADDCONTACTSTRUCT acs = {0}; acs.handle = hDbEvent; acs.handleType = HANDLE_EVENT; @@ -123,7 +124,7 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar } case IDOK: - { + { ADDCONTACTSTRUCT acs = {0}; acs.handle = hDbEvent; acs.handleType = HANDLE_EVENT; @@ -242,7 +243,7 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP break; case IDOK: - { + { DBEVENTINFO dbei = { sizeof(dbei) }; db_event_get(hDbEvent, &dbei); CallProtoService(dbei.szModule, PS_AUTHALLOW, (WPARAM)hDbEvent, 0); diff --git a/src/core/stdauth/commonheaders.h b/src/core/stdauth/commonheaders.h index 137fd055f5..b40dc69020 100644 --- a/src/core/stdauth/commonheaders.h +++ b/src/core/stdauth/commonheaders.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-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/core/stdautoaway/autoaway.cpp b/src/core/stdautoaway/autoaway.cpp index a96c788c48..94980f4368 100644 --- a/src/core/stdautoaway/autoaway.cpp +++ b/src/core/stdautoaway/autoaway.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/core/stdautoaway/commonheaders.h b/src/core/stdautoaway/commonheaders.h index 606d854a34..413fa3430d 100644 --- a/src/core/stdautoaway/commonheaders.h +++ b/src/core/stdautoaway/commonheaders.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-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/core/stdaway/awaymsg.cpp b/src/core/stdaway/awaymsg.cpp index 4abc781f50..08d841275c 100644 --- a/src/core/stdaway/awaymsg.cpp +++ b/src/core/stdaway/awaymsg.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. @@ -165,7 +166,7 @@ int LoadAwayMsgModule(void) { hWindowList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0); CreateServiceFunction(MS_AWAYMSG_SHOWAWAYMSG, GetMessageCommand); - + CLISTMENUITEM mi = { sizeof(mi) }; mi.position = -2000005000; mi.flags = CMIF_NOTOFFLINE; diff --git a/src/core/stdaway/commonheaders.h b/src/core/stdaway/commonheaders.h index 1423bafc37..002b2bad4d 100644 --- a/src/core/stdaway/commonheaders.h +++ b/src/core/stdaway/commonheaders.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-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/core/stdaway/sendmsg.cpp b/src/core/stdaway/sendmsg.cpp index 0c9f1743ce..c05a65b822 100644 --- a/src/core/stdaway/sendmsg.cpp +++ b/src/core/stdaway/sendmsg.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. @@ -59,7 +60,7 @@ static const char *StatusModeToDbSetting(int status, const char *suffix) const char *prefix; static char str[64]; - switch(status) + switch(status) { case ID_STATUS_AWAY: prefix = "Away"; break; case ID_STATUS_NA: prefix = "Na"; break; @@ -191,7 +192,7 @@ void ChangeAllProtoMessages(char *szProto, int statusMode, TCHAR *msg) { PROTOACCOUNT* pa = accounts[i]; if ( !Proto_IsAccountEnabled(pa)) continue; - if ((CallProtoService(pa->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND) && + if ((CallProtoService(pa->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND) && !Proto_IsAccountLocked(pa)) CallProtoService(pa->szModuleName, PS_SETAWAYMSGT, statusMode, (LPARAM)msg); } @@ -219,7 +220,7 @@ struct SetAwasMsgNewData static INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam) { SetAwayMsgData* dat = (SetAwayMsgData*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); - + switch(message) { case WM_INITDIALOG: { @@ -350,13 +351,13 @@ static int StatusModeChange(WPARAM wParam, LPARAM lParam) newdat->statusMode = statusMode; if (hwndStatusMsg) DestroyWindow(hwndStatusMsg); - hwndStatusMsg = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SETAWAYMSG), + hwndStatusMsg = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SETAWAYMSG), NULL, SetAwayMsgDlgProc, (LPARAM)newdat); } return 0; } -static const int statusModes[] = +static const int statusModes[] = { ID_STATUS_OFFLINE, ID_STATUS_ONLINE, ID_STATUS_AWAY, ID_STATUS_NA, ID_STATUS_OCCUPIED, ID_STATUS_DND, ID_STATUS_FREECHAT, ID_STATUS_INVISIBLE, ID_STATUS_OUTTOLUNCH, ID_STATUS_ONTHEPHONE, ID_STATUS_IDLE @@ -507,7 +508,7 @@ static INT_PTR CALLBACK DlgProcAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam int i = hLst ? (SendDlgItemMessage(hwndDlg, IDC_LST_STATUS, LB_GETCOUNT, 0, 0) - 1) : (SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_GETCOUNT, 0, 0) - 1); for (; i >= 0; i--) { - int status = hLst ? + int status = hLst ? SendDlgItemMessage(hwndDlg, IDC_LST_STATUS, LB_GETITEMDATA, i, 0): SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_GETITEMDATA, i, 0); SetStatusModeByte(status, "Ignore", (BYTE)dat->info[i].ignore); @@ -551,7 +552,7 @@ static int AwayMsgSendModernOptInit(WPARAM wParam, LPARAM) if (protoModeMsgFlags == 0) return 0; - static const int iBoldControls[] = + static const int iBoldControls[] = { IDC_TXT_TITLE1, IDC_TXT_TITLE2, IDC_TXT_TITLE3, MODERNOPT_CTRL_LAST diff --git a/src/core/stdchat/src/manager.cpp b/src/core/stdchat/src/manager.cpp index cb8b4ae096..2437cd64db 100644 --- a/src/core/stdchat/src/manager.cpp +++ b/src/core/stdchat/src/manager.cpp @@ -1,7 +1,7 @@ /* Chat module plugin for Miranda IM -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdchat/src/services.cpp b/src/core/stdchat/src/services.cpp index fa9a5f8a01..b222f17c95 100644 --- a/src/core/stdchat/src/services.cpp +++ b/src/core/stdchat/src/services.cpp @@ -1,7 +1,7 @@ /* Chat module plugin for Miranda IM -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdchat/src/stdafx.cpp b/src/core/stdchat/src/stdafx.cpp index 61be01dd37..c4bc031b5b 100644 --- a/src/core/stdchat/src/stdafx.cpp +++ b/src/core/stdchat/src/stdafx.cpp @@ -1,5 +1,5 @@ /* -Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org) +Copyright (C) 2012-14 Miranda NG team (http://miranda-ng.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/core/stdchat/src/tools.cpp b/src/core/stdchat/src/tools.cpp index 771b2c623c..3d4bbb0ba1 100644 --- a/src/core/stdchat/src/tools.cpp +++ b/src/core/stdchat/src/tools.cpp @@ -1,7 +1,7 @@ /* Chat module plugin for Miranda IM -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp index aaae35930c..9c343c9d60 100644 --- a/src/core/stdchat/src/window.cpp +++ b/src/core/stdchat/src/window.cpp @@ -1,7 +1,7 @@ /* Chat module plugin for Miranda IM -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdclist/src/clc.h b/src/core/stdclist/src/clc.h index 39f357d4c9..070cd43854 100644 --- a/src/core/stdclist/src/clc.h +++ b/src/core/stdclist/src/clc.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-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/core/stdclist/src/clcfonts.cpp b/src/core/stdclist/src/clcfonts.cpp index 1dc3fedc90..9a8742f654 100644 --- a/src/core/stdclist/src/clcfonts.cpp +++ b/src/core/stdclist/src/clcfonts.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/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp index 009efe13c2..f346fd29f3 100644 --- a/src/core/stdclist/src/clcopts.cpp +++ b/src/core/stdclist/src/clcopts.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-12 Miranda IM, 2012-13 Miranda NG 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 @@ -114,7 +115,7 @@ static DWORD MakeCheckBoxTreeFlags(HWND hwndTree) return flags; } -static LONG CalcMinRowHeight() +static LONG CalcMinRowHeight() { int i; LONG minHeight = 16; @@ -129,7 +130,7 @@ static LONG CalcMinRowHeight() hFont = CreateFontIndirect(&lf); hFont = ( HFONT )SelectObject(hdc, hFont); GetTextExtentPoint32(hdc, _T("x"), 1, &fontSize); - if (fontSize.cy > minHeight) + if (fontSize.cy > minHeight) minHeight = fontSize.cy; hFont = ( HFONT )SelectObject(hdc,hFont); DeleteObject(hFont); @@ -182,7 +183,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam { LONG minHeight = CalcMinRowHeight(); LONG rowHeight = db_get_b(NULL, "CLC", "RowHeight", CLCDEFAULT_ROWHEIGHT); - if (rowHeight < minHeight) { + if (rowHeight < minHeight) { rowHeight = minHeight; } SendDlgItemMessage(hwndDlg, IDC_ROWHEIGHTSPIN, UDM_SETRANGE, 0, MAKELONG(255, minHeight)); @@ -193,7 +194,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam { LONG minHeight = CalcMinRowHeight(); LONG rowHeight = SendDlgItemMessage(hwndDlg, IDC_ROWHEIGHTSPIN, UDM_GETPOS, 0, 0); - if (rowHeight < minHeight) { + if (rowHeight < minHeight) { rowHeight = minHeight; SendDlgItemMessage(hwndDlg, IDC_ROWHEIGHTSPIN, UDM_SETPOS, 0, MAKELONG(rowHeight, 0)); } @@ -208,7 +209,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam EnableWindow(GetDlgItem(hwndDlg, IDC_SMOOTHTIME), IsDlgButtonChecked(hwndDlg, IDC_NOTNOSMOOTHSCROLLING)); if (LOWORD(wParam) == IDC_GREYOUT) EnableWindow(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS), IsDlgButtonChecked(hwndDlg, IDC_GREYOUT)); - if ((LOWORD(wParam) == IDC_LEFTMARGIN || LOWORD(wParam) == IDC_SMOOTHTIME || LOWORD(wParam) == IDC_GROUPINDENT + if ((LOWORD(wParam) == IDC_LEFTMARGIN || LOWORD(wParam) == IDC_SMOOTHTIME || LOWORD(wParam) == IDC_GROUPINDENT || LOWORD(wParam) == IDC_ROWHEIGHT) && (HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus())) return 0; diff --git a/src/core/stdclist/src/clcpaint.cpp b/src/core/stdclist/src/clcpaint.cpp index 5b6b55f467..3bfb0597b2 100644 --- a/src/core/stdclist/src/clcpaint.cpp +++ b/src/core/stdclist/src/clcpaint.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/core/stdclist/src/clistmenus.cpp b/src/core/stdclist/src/clistmenus.cpp index 9d736873b4..456771fd40 100644 --- a/src/core/stdclist/src/clistmenus.cpp +++ b/src/core/stdclist/src/clistmenus.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/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp index 10c71965c3..f933ac01cb 100644 --- a/src/core/stdclist/src/clistopts.cpp +++ b/src/core/stdclist/src/clistopts.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-12 Miranda IM, 2012-13 Miranda NG 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 @@ -138,7 +139,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP } if (-1 == (int) SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0)) SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETCURSEL, 0, 0); - SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETBUDDY, (WPARAM) GetDlgItem(hwndDlg, IDC_BLINKTIME), 0); // set buddy + SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETBUDDY, (WPARAM) GetDlgItem(hwndDlg, IDC_BLINKTIME), 0); // set buddy SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETRANGE, 0, MAKELONG(0x3FFF, 250)); SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(NULL, "CList", "IconFlashTime", 550), 0)); return TRUE; @@ -214,7 +215,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP PROTOACCOUNT* pa = ( PROTOACCOUNT* )SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cur, 0 ); if ( pa == NULL ) db_unset(NULL, "CList", "PrimaryStatus"); - else + else db_set_s(NULL, "CList", "PrimaryStatus", pa->szModuleName ); } diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp index 5921e81740..8921fbd59e 100644 --- a/src/core/stdclist/src/cluiopts.cpp +++ b/src/core/stdclist/src/cluiopts.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/core/stdclist/src/commonheaders.h b/src/core/stdclist/src/commonheaders.h index 760b9b09b8..45828cfa1b 100644 --- a/src/core/stdclist/src/commonheaders.h +++ b/src/core/stdclist/src/commonheaders.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-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/core/stdclist/src/init.cpp b/src/core/stdclist/src/init.cpp index f751d9b853..7ec9cfebc4 100644 --- a/src/core/stdclist/src/init.cpp +++ b/src/core/stdclist/src/init.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/core/stdclist/src/stdafx.cpp b/src/core/stdclist/src/stdafx.cpp index 270c270550..9c953189b2 100644 --- a/src/core/stdclist/src/stdafx.cpp +++ b/src/core/stdclist/src/stdafx.cpp @@ -1,5 +1,5 @@ /* -Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org) +Copyright (C) 2012-14 Miranda NG team (http://miranda-ng.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/core/stdcrypt/commonheaders.h b/src/core/stdcrypt/commonheaders.h index 07daa68ac1..2ad7031f79 100644 --- a/src/core/stdcrypt/commonheaders.h +++ b/src/core/stdcrypt/commonheaders.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-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/core/stdcrypt/encrypt.cpp b/src/core/stdcrypt/encrypt.cpp index b4bdae7e01..c08ec19529 100644 --- a/src/core/stdcrypt/encrypt.cpp +++ b/src/core/stdcrypt/encrypt.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright (C) 2012-13 Miranda NG project, +Copyright (C) 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdcrypt/utils.cpp b/src/core/stdcrypt/utils.cpp index 99b2d3c8db..85f6eb53b1 100644 --- a/src/core/stdcrypt/utils.cpp +++ b/src/core/stdcrypt/utils.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright (C) 2012-13 Miranda NG project, +Copyright (C) 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdcrypt/version.h b/src/core/stdcrypt/version.h index e55d85129c..1542c74042 100644 --- a/src/core/stdcrypt/version.h +++ b/src/core/stdcrypt/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG Development Team" #define __AUTHOREMAIL "" #define __AUTHORWEB "http://miranda-ng.org/p/StdCrypt/" -#define __COPYRIGHT "© 2012-13 Miranda NG Development Team" +#define __COPYRIGHT "© 2012-14 Miranda NG Development Team" diff --git a/src/core/stdemail/commonheaders.h b/src/core/stdemail/commonheaders.h index 40ae60a779..f027e47929 100644 --- a/src/core/stdemail/commonheaders.h +++ b/src/core/stdemail/commonheaders.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-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/core/stdemail/email.cpp b/src/core/stdemail/email.cpp index 3d8ffc470c..12296eeda3 100644 --- a/src/core/stdemail/email.cpp +++ b/src/core/stdemail/email.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/core/stdfile/commonheaders.h b/src/core/stdfile/commonheaders.h index 70a1378387..f3600efc5e 100644 --- a/src/core/stdfile/commonheaders.h +++ b/src/core/stdfile/commonheaders.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-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/core/stdfile/file.cpp b/src/core/stdfile/file.cpp index 90c2a5e0f3..217605b18f 100644 --- a/src/core/stdfile/file.cpp +++ b/src/core/stdfile/file.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/core/stdfile/file.h b/src/core/stdfile/file.h index 95e2eb4818..80f8b26d2b 100644 --- a/src/core/stdfile/file.h +++ b/src/core/stdfile/file.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-12 Miranda IM, 2012-13 Miranda NG 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 @@ -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/core/stdfile/fileexistsdlg.cpp b/src/core/stdfile/fileexistsdlg.cpp index c9c36e2f5b..72930fe482 100644 --- a/src/core/stdfile/fileexistsdlg.cpp +++ b/src/core/stdfile/fileexistsdlg.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-12 Miranda IM, 2012-13 Miranda NG 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 @@ -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. @@ -52,7 +53,7 @@ static void DoAnnoyingShellCommand(HWND hwnd, const TCHAR *szFilename, int cmd, if (SHGetDesktopFolder(&pDesktopFolder) == NOERROR) { ITEMIDLIST *pCurrentIdl; WCHAR* wszFilename = (LPWSTR)szFilename; - + if (pDesktopFolder->ParseDisplayName(NULL, NULL, wszFilename, NULL, &pCurrentIdl, NULL) == NOERROR) { if (pCurrentIdl->mkid.cb) { ITEMIDLIST *pidl, *pidlNext, *pidlFilename; @@ -223,13 +224,13 @@ INT_PTR CALLBACK DlgProcFileExists(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lisi->hwndDlg = hwndDlg; lisi->szFilename = mir_tstrdup(fts->tszCurrentFile); //can be a little slow, so why not? - forkthread(LoadIconsAndTypesThread, 0, lisi); + forkthread(LoadIconsAndTypesThread, 0, lisi); SetFocus(hwndFocus); SetWindowLongPtr(hwndFocus, GWL_STYLE, GetWindowLongPtr(hwndFocus, GWL_STYLE)|BS_DEFPUSHBUTTON); return FALSE; } case WM_COMMAND: - { + { PROTOFILERESUME pfr = {0}; switch(LOWORD(wParam)) { case IDC_OPENFILE: @@ -237,7 +238,7 @@ INT_PTR CALLBACK DlgProcFileExists(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM return FALSE; case IDC_OPENFOLDER: - { + { TCHAR szFile[MAX_PATH]; lstrcpyn(szFile, fts->tszCurrentFile, SIZEOF(szFile)); TCHAR *pszLastBackslash = _tcsrchr(szFile, '\\'); @@ -267,7 +268,7 @@ INT_PTR CALLBACK DlgProcFileExists(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM break; case IDC_SAVEAS: - { + { OPENFILENAME ofn = {0}; TCHAR filter[512], *pfilter; TCHAR str[MAX_PATH]; diff --git a/src/core/stdfile/fileopts.cpp b/src/core/stdfile/fileopts.cpp index 5cf5c284da..95a73b4455 100644 --- a/src/core/stdfile/fileopts.cpp +++ b/src/core/stdfile/fileopts.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. @@ -36,16 +37,16 @@ struct virusscannerinfo { }; static const struct virusscannerinfo virusScanners[] = { - {_T("Network Associates/McAfee VirusScan"), _T("SOFTWARE\\McAfee\\VirusScan"), _T("Scan32EXE"), _T("\"%s\" %%f /nosplash /comp /autoscan /autoexit /noboot")}, - {_T("Dr Solomon's VirusScan (Network Associates)"), _T("SOFTWARE\\Network Associates\\TVD\\VirusScan\\AVConsol\\General"), _T("szScannerExe"), _T("\"%s\" %%f /uinone /noboot /comp /prompt /autoexit")}, - {_T("Norton AntiVirus"), _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\Navw32.exe"), NULL, _T("\"%s\" %%f /b- /m- /s+ /noresults")}, - {_T("Computer Associates/Inoculate IT"), _T("Software\\Antivirus"), _T("ImageFilename"), _T("\"%s\" %%f /display = progress /exit")}, - {_T("Computer Associates eTrust"), _T("SOFTWARE\\ComputerAssociates\\Anti-Virus\\Resident"), _T("VetPath"), _T("\"%s\" %%f /display = progress /exit")}, - {_T("Kaspersky Anti-Virus"), _T("SOFTWARE\\KasperskyLab\\Components\\101"), _T("EXEName"), _T("\"%s\" /S /Q %%f")}, - {_T("Kaspersky Anti-Virus"), _T("SOFTWARE\\KasperskyLab\\SetupFolders"), _T("KAV8"), _T("\"%savp.exe\" SCAN %%f")}, - {_T("Kaspersky Anti-Virus"), _T("SOFTWARE\\KasperskyLab\\SetupFolders"), _T("KAV9"), _T("\"%savp.exe\" SCAN %%f")}, - {_T("AntiVir PersonalEdition Classic"), _T("SOFTWARE\\Avira\\AntiVir PersonalEdition Classic"), _T("Path"), _T("\"%savscan.exe\" /GUIMODE = 2 /PATH = \"%%f\"")}, - {_T("ESET NOD32 Antivirus"), _T("SOFTWARE\\ESET\\ESET Security\\CurrentVersion\\Info"), _T("InstallDir"), _T("\"%secls.exe\" /log-all /aind /no-boots /adware /sfx /unsafe /unwanted /heur /adv-heur /action = clean \"%%f\"")}, + {_T("Network Associates/McAfee VirusScan"), _T("SOFTWARE\\McAfee\\VirusScan"), _T("Scan32EXE"), _T("\"%s\" %%f /nosplash /comp /autoscan /autoexit /noboot")}, + {_T("Dr Solomon's VirusScan (Network Associates)"), _T("SOFTWARE\\Network Associates\\TVD\\VirusScan\\AVConsol\\General"), _T("szScannerExe"), _T("\"%s\" %%f /uinone /noboot /comp /prompt /autoexit")}, + {_T("Norton AntiVirus"), _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\Navw32.exe"), NULL, _T("\"%s\" %%f /b- /m- /s+ /noresults")}, + {_T("Computer Associates/Inoculate IT"), _T("Software\\Antivirus"), _T("ImageFilename"), _T("\"%s\" %%f /display = progress /exit")}, + {_T("Computer Associates eTrust"), _T("SOFTWARE\\ComputerAssociates\\Anti-Virus\\Resident"), _T("VetPath"), _T("\"%s\" %%f /display = progress /exit")}, + {_T("Kaspersky Anti-Virus"), _T("SOFTWARE\\KasperskyLab\\Components\\101"), _T("EXEName"), _T("\"%s\" /S /Q %%f")}, + {_T("Kaspersky Anti-Virus"), _T("SOFTWARE\\KasperskyLab\\SetupFolders"), _T("KAV8"), _T("\"%savp.exe\" SCAN %%f")}, + {_T("Kaspersky Anti-Virus"), _T("SOFTWARE\\KasperskyLab\\SetupFolders"), _T("KAV9"), _T("\"%savp.exe\" SCAN %%f")}, + {_T("AntiVir PersonalEdition Classic"), _T("SOFTWARE\\Avira\\AntiVir PersonalEdition Classic"), _T("Path"), _T("\"%savscan.exe\" /GUIMODE = 2 /PATH = \"%%f\"")}, + {_T("ESET NOD32 Antivirus"), _T("SOFTWARE\\ESET\\ESET Security\\CurrentVersion\\Info"), _T("InstallDir"), _T("\"%secls.exe\" /log-all /aind /no-boots /adware /sfx /unsafe /unwanted /heur /adv-heur /action = clean \"%%f\"")}, }; #define M_UPDATEENABLING (WM_USER+100) @@ -241,4 +242,3 @@ int FileOptInitialise(WPARAM wParam, LPARAM) Options_AddPage(wParam, &odp); return 0; } - diff --git a/src/core/stdfile/filerecvdlg.cpp b/src/core/stdfile/filerecvdlg.cpp index c592388e04..a5c230cbb2 100644 --- a/src/core/stdfile/filerecvdlg.cpp +++ b/src/core/stdfile/filerecvdlg.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/core/stdfile/filesenddlg.cpp b/src/core/stdfile/filesenddlg.cpp index 3b2cf8f3c5..f56907c99b 100644 --- a/src/core/stdfile/filesenddlg.cpp +++ b/src/core/stdfile/filesenddlg.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/core/stdfile/filexferdlg.cpp b/src/core/stdfile/filexferdlg.cpp index e7a0d392f4..e6e303871c 100644 --- a/src/core/stdfile/filexferdlg.cpp +++ b/src/core/stdfile/filexferdlg.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/core/stdfile/ftmanager.cpp b/src/core/stdfile/ftmanager.cpp index 65b74a75fc..df7ce4a72a 100644 --- a/src/core/stdfile/ftmanager.cpp +++ b/src/core/stdfile/ftmanager.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/core/stdhelp/about.cpp b/src/core/stdhelp/about.cpp index 47226db9d0..1bc32b96f2 100644 --- a/src/core/stdhelp/about.cpp +++ b/src/core/stdhelp/about.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/core/stdhelp/commonheaders.h b/src/core/stdhelp/commonheaders.h index a8303efdaa..ca154ba24b 100644 --- a/src/core/stdhelp/commonheaders.h +++ b/src/core/stdhelp/commonheaders.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-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/core/stdhelp/help.cpp b/src/core/stdhelp/help.cpp index 376b5b7ff3..7f7f449ae0 100644 --- a/src/core/stdhelp/help.cpp +++ b/src/core/stdhelp/help.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/core/stdidle/commonheaders.h b/src/core/stdidle/commonheaders.h index 3ee34d7e8a..77faadcfe7 100644 --- a/src/core/stdidle/commonheaders.h +++ b/src/core/stdidle/commonheaders.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-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/core/stdidle/idle.cpp b/src/core/stdidle/idle.cpp index 50a41dd7ae..92a53a5deb 100644 --- a/src/core/stdidle/idle.cpp +++ b/src/core/stdidle/idle.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/core/stdmsg/src/cmdlist.cpp b/src/core/stdmsg/src/cmdlist.cpp index 3a43f4ef8d..ebeb98519f 100644 --- a/src/core/stdmsg/src/cmdlist.cpp +++ b/src/core/stdmsg/src/cmdlist.cpp @@ -1,6 +1,6 @@ /* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdmsg/src/cmdlist.h b/src/core/stdmsg/src/cmdlist.h index c57499c0bc..5f9db21b50 100644 --- a/src/core/stdmsg/src/cmdlist.h +++ b/src/core/stdmsg/src/cmdlist.h @@ -1,6 +1,6 @@ /* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdmsg/src/commonheaders.h b/src/core/stdmsg/src/commonheaders.h index 35e9fe6031..68c2d753a0 100644 --- a/src/core/stdmsg/src/commonheaders.h +++ b/src/core/stdmsg/src/commonheaders.h @@ -1,6 +1,6 @@ /* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdmsg/src/globals.cpp b/src/core/stdmsg/src/globals.cpp index 56c2b83c87..d0b991a688 100644 --- a/src/core/stdmsg/src/globals.cpp +++ b/src/core/stdmsg/src/globals.cpp @@ -1,6 +1,6 @@ /* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdmsg/src/globals.h b/src/core/stdmsg/src/globals.h index 064db8eb6d..f2d7f6752c 100644 --- a/src/core/stdmsg/src/globals.h +++ b/src/core/stdmsg/src/globals.h @@ -1,6 +1,6 @@ /* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index c17ecab0be..19a0dc01dd 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -1,6 +1,6 @@ /* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp index c18fe893a9..78229431f3 100644 --- a/src/core/stdmsg/src/msglog.cpp +++ b/src/core/stdmsg/src/msglog.cpp @@ -1,6 +1,6 @@ /* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 747b5d1872..eee8d6f2ac 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -1,6 +1,6 @@ /* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 5fc1fec3f4..31f68d4c9d 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -1,6 +1,6 @@ /* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h index b3cfc3bf92..1a75b19b1b 100644 --- a/src/core/stdmsg/src/msgs.h +++ b/src/core/stdmsg/src/msgs.h @@ -1,6 +1,6 @@ /* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdmsg/src/msgtimedout.cpp b/src/core/stdmsg/src/msgtimedout.cpp index 450e04d2e8..5ecaf6861f 100644 --- a/src/core/stdmsg/src/msgtimedout.cpp +++ b/src/core/stdmsg/src/msgtimedout.cpp @@ -1,6 +1,6 @@ /* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdmsg/src/richutil.cpp b/src/core/stdmsg/src/richutil.cpp index 53bf684119..b91097efa2 100644 --- a/src/core/stdmsg/src/richutil.cpp +++ b/src/core/stdmsg/src/richutil.cpp @@ -1,6 +1,6 @@ /* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdmsg/src/richutil.h b/src/core/stdmsg/src/richutil.h index 1408c85ead..129b6fd0ba 100644 --- a/src/core/stdmsg/src/richutil.h +++ b/src/core/stdmsg/src/richutil.h @@ -1,6 +1,6 @@ /* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdmsg/src/srmm.cpp b/src/core/stdmsg/src/srmm.cpp index f589529137..36c8ed81c7 100644 --- a/src/core/stdmsg/src/srmm.cpp +++ b/src/core/stdmsg/src/srmm.cpp @@ -1,6 +1,6 @@ /* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdmsg/src/statusicon.cpp b/src/core/stdmsg/src/statusicon.cpp index 294493e6e5..1ad1395032 100644 --- a/src/core/stdmsg/src/statusicon.cpp +++ b/src/core/stdmsg/src/statusicon.cpp @@ -1,6 +1,6 @@ /* -Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, +Copyright 2000-12 Miranda IM, 2012-14 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/src/core/stdmsg/src/stdafx.cpp b/src/core/stdmsg/src/stdafx.cpp index 838b101bd3..df76ee5802 100644 --- a/src/core/stdmsg/src/stdafx.cpp +++ b/src/core/stdmsg/src/stdafx.cpp @@ -1,6 +1,6 @@ /* -Copyright (C) 2012-13 Miranda NG team (http://miranda-ng.org) +Copyright (C) 2012-14 Miranda NG team (http://miranda-ng.org) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/src/core/stduihist/commonheaders.h b/src/core/stduihist/commonheaders.h index dd332f5e00..f5744ec23b 100644 --- a/src/core/stduihist/commonheaders.h +++ b/src/core/stduihist/commonheaders.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-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/core/stduihist/history.cpp b/src/core/stduihist/history.cpp index dc1e9923d7..0152d177bf 100644 --- a/src/core/stduihist/history.cpp +++ b/src/core/stduihist/history.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. @@ -152,7 +153,7 @@ static void FillHistoryThread(void* param) DBEVENTINFO dbei = { sizeof(dbei) }; int oldBlobSize = 0; HANDLE hDbEvent = db_event_last(hInfo->hContact); - + while (hDbEvent != NULL) { if ( !IsWindow(hInfo->hwnd)) break; diff --git a/src/core/stdurl/commonheaders.h b/src/core/stdurl/commonheaders.h index 59087c13ad..93e42c1e33 100644 --- a/src/core/stdurl/commonheaders.h +++ b/src/core/stdurl/commonheaders.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-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/core/stdurl/url.cpp b/src/core/stdurl/url.cpp index 65df220380..eae566e402 100644 --- a/src/core/stdurl/url.cpp +++ b/src/core/stdurl/url.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-12 Miranda IM, 2012-13 Miranda NG 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 @@ -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/core/stdurl/url.h b/src/core/stdurl/url.h index dcdbf8e487..482ddf4a01 100644 --- a/src/core/stdurl/url.h +++ b/src/core/stdurl/url.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-12 Miranda IM, 2012-13 Miranda NG 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 @@ -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/core/stdurl/urldialogs.cpp b/src/core/stdurl/urldialogs.cpp index 06bd2b20ec..907720845c 100644 --- a/src/core/stdurl/urldialogs.cpp +++ b/src/core/stdurl/urldialogs.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-12 Miranda IM, 2012-13 Miranda NG 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 @@ -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. @@ -40,7 +41,7 @@ static void sttUpdateTitle(HWND hwndDlg, HANDLE hContact) int hasName = 0; char buf[128]; ZeroMemory(&ci, sizeof(ci)); - + ci.cbSize = sizeof(ci); ci.hContact = hContact; ci.szProto = szProto; @@ -61,7 +62,7 @@ static void sttUpdateTitle(HWND hwndDlg, HANDLE hContact) contactName = pcli->pfnGetContactDisplayName(hContact, 0); if (hasName) SetDlgItemTextA(hwndDlg, IDC_NAME, buf); - else + else SetDlgItemText(hwndDlg, IDC_NAME, contactName); szStatus = pcli->pfnGetStatusModeDescription(szProto == NULL ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), 0); @@ -112,7 +113,7 @@ INT_PTR CALLBACK DlgProcUrlRecv(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP SetWindowText(hwndDlg, msg); SetDlgItemText(hwndDlg, IDC_FROM, contactName); SendDlgItemMessage(hwndDlg, IDOK, BUTTONSETARROW, 1, 0); - + TCHAR str[128]; tmi.printTimeStamp(NULL, dbei.timestamp, _T("t d"), str, SIZEOF(str), 0); SetDlgItemText(hwndDlg, IDC_DATE, str); @@ -132,22 +133,22 @@ INT_PTR CALLBACK DlgProcUrlRecv(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam); case WM_DRAWITEM: - { + { LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam; if (dis->hwndItem == GetDlgItem(hwndDlg, IDC_PROTOCOL)) { char *szProto; - + szProto = GetContactProto(dat->hContact); if (szProto) { HICON hIcon; - + hIcon = (HICON)CallProtoService(szProto, PS_LOADICON, PLI_PROTOCOL|PLIF_SMALL, 0); if (hIcon) { DrawIconEx(dis->hDC, dis->rcItem.left, dis->rcItem.top, hIcon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, NULL, DI_NORMAL); DestroyIcon(hIcon); } } } } return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam); - + case DM_UPDATETITLE: sttUpdateTitle(hwndDlg, dat->hContact); break; @@ -211,7 +212,7 @@ INT_PTR CALLBACK DlgProcUrlRecv(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP case IDC_ADD: { ADDCONTACTSTRUCT acs = {0}; - + acs.handle = dat->hContact; acs.handleType = HANDLE_CONTACT; acs.szProto = 0; diff --git a/src/core/stduserinfo/commonheaders.h b/src/core/stduserinfo/commonheaders.h index 2cf6182ff6..f531d749f3 100644 --- a/src/core/stduserinfo/commonheaders.h +++ b/src/core/stduserinfo/commonheaders.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-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/core/stduserinfo/contactinfo.cpp b/src/core/stduserinfo/contactinfo.cpp index f651013852..f674685200 100644 --- a/src/core/stduserinfo/contactinfo.cpp +++ b/src/core/stduserinfo/contactinfo.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/core/stduserinfo/stdinfo.cpp b/src/core/stduserinfo/stdinfo.cpp index 5ef8310ce6..b807e8f37e 100644 --- a/src/core/stduserinfo/stdinfo.cpp +++ b/src/core/stduserinfo/stdinfo.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. @@ -331,7 +332,7 @@ static INT_PTR CALLBACK WorkDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA SetValue(hwndDlg, IDC_ZIP, hContact, szProto, "CompanyZIP", SVS_ZEROISUNSPEC); SetValue(hwndDlg, IDC_COUNTRY, hContact, szProto, "CompanyCountry", SVS_COUNTRY); SetValue(hwndDlg, IDC_WEBPAGE, hContact, szProto, "CompanyHomepage", SVS_ZEROISUNSPEC); - } + } } break; } diff --git a/src/core/stduserinfo/userinfo.cpp b/src/core/stduserinfo/userinfo.cpp index f3fe5ef5c8..bd958a9202 100644 --- a/src/core/stduserinfo/userinfo.cpp +++ b/src/core/stduserinfo/userinfo.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/core/stduseronline/commonheaders.h b/src/core/stduseronline/commonheaders.h index 3d1df67fc3..1b1e6585ee 100644 --- a/src/core/stduseronline/commonheaders.h +++ b/src/core/stduseronline/commonheaders.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-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/core/stduseronline/useronline.cpp b/src/core/stduseronline/useronline.cpp index c25af18b82..12fcb3c6ed 100644 --- a/src/core/stduseronline/useronline.cpp +++ b/src/core/stduseronline/useronline.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. -- cgit v1.2.3