From b93e076795f7998aef8a63f7602998cdc6632a80 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 11 Feb 2013 12:15:06 +0000 Subject: core: copyright update to year 2013 git-svn-id: http://svn.miranda-ng.org/main/trunk@3549 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/stduseronline/commonheaders.h | 5 +---- src/core/stduseronline/main.cpp | 2 +- src/core/stduseronline/useronline.cpp | 15 ++++++++------- 3 files changed, 10 insertions(+), 12 deletions(-) (limited to 'src/core/stduseronline') diff --git a/src/core/stduseronline/commonheaders.h b/src/core/stduseronline/commonheaders.h index 9ba6ae38cf..d813cb1c7d 100644 --- a/src/core/stduseronline/commonheaders.h +++ b/src/core/stduseronline/commonheaders.h @@ -2,7 +2,7 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -21,9 +21,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// to enable all 0.9.0 core functions -#define MIRANDA_VER 0x0A00 - #define WINVER 0x0700 #define _WIN32_WINNT 0x0700 #define _WIN32_IE 0x0601 diff --git a/src/core/stduseronline/main.cpp b/src/core/stduseronline/main.cpp index 783a0c7d65..7dcf6c09f4 100644 --- a/src/core/stduseronline/main.cpp +++ b/src/core/stduseronline/main.cpp @@ -2,7 +2,7 @@ Standard user online monitor for Myranda IM -Copyright (C) 2012 George Hazan +Copyright (C) 2012-13 George Hazan This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/core/stduseronline/useronline.cpp b/src/core/stduseronline/useronline.cpp index b37138d0bc..390be3051a 100644 --- a/src/core/stduseronline/useronline.cpp +++ b/src/core/stduseronline/useronline.cpp @@ -2,8 +2,8 @@ Miranda IM: the free IM client for Microsoft* Windows* -Copyright 2000-2009 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people +Copyright 2000-12 Miranda IM, 2012-13 Miranda NG 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 +11,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. @@ -20,6 +20,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. */ + #include "commonheaders.h" static int uniqueEventId = 0; @@ -34,16 +35,16 @@ static int UserOnlineSettingChanged(WPARAM wParam, LPARAM lParam) DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam; if ((HANDLE)wParam == NULL || strcmp(cws->szSetting, "Status")) return 0; - + int newStatus = cws->value.wVal; int oldStatus = DBGetContactSettingWord((HANDLE)wParam, "UserOnline", "OldStatus", ID_STATUS_OFFLINE); DBWriteContactSettingWord((HANDLE)wParam, "UserOnline", "OldStatus", (WORD)newStatus); if (CallService(MS_IGNORE_ISIGNORED, wParam, IGNOREEVENT_USERONLINE)) return 0; if (DBGetContactSettingByte((HANDLE)wParam, "CList", "Hidden", 0)) return 0; if (newStatus == ID_STATUS_OFFLINE && oldStatus != ID_STATUS_OFFLINE) { - // Remove the event from the queue if it exists since they are now offline + // Remove the event from the queue if it exists since they are now offline int lastEvent = (int)DBGetContactSettingDword((HANDLE)wParam, "UserOnline", "LastEvent", 0); - + if (lastEvent) { CallService(MS_CLIST_REMOVEEVENT, wParam, (LPARAM)lastEvent); DBWriteContactSettingDword((HANDLE)wParam, "UserOnline", "LastEvent", 0); @@ -54,7 +55,7 @@ static int UserOnlineSettingChanged(WPARAM wParam, LPARAM lParam) { DWORD ticked = db_get_dw(NULL, "UserOnline", cws->szModule, GetTickCount()); // only play the sound (or show event) if this event happens at least 10 secs after the proto went from offline - if (GetTickCount() - ticked > (1000*10)) { + if (GetTickCount() - ticked > (1000*10)) { CLISTEVENT cle; TCHAR tooltip[256]; -- cgit v1.2.3