From 6f2c99a32c9e539fc61edb6b836e8805b013a180 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 21 Mar 2013 20:43:46 +0000 Subject: - unused constant MIRANDA_IDLE_INFO_SIZE_1 removed; - proper tracking of autoaway sound options; - code cleanup for MIRANDA_IDLE_INFO initialization; git-svn-id: http://svn.miranda-ng.org/main/trunk@4156 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/AimOscar/src/services.cpp | 5 ++--- protocols/JabberG/src/jabber_events.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'protocols') diff --git a/protocols/AimOscar/src/services.cpp b/protocols/AimOscar/src/services.cpp index caf2209560..3ab5b37754 100644 --- a/protocols/AimOscar/src/services.cpp +++ b/protocols/AimOscar/src/services.cpp @@ -51,9 +51,8 @@ int CAimProto::OnIdleChanged(WPARAM /*wParam*/, LPARAM lParam) if (bIdle) //don't want to change idle time if we are already idle { - MIRANDA_IDLE_INFO mii = {0}; - mii.cbSize = sizeof(mii); - CallService(MS_IDLE_GETIDLEINFO, 0, (LPARAM) & mii); + MIRANDA_IDLE_INFO mii = { sizeof(mii) }; + CallService(MS_IDLE_GETIDLEINFO, 0, (LPARAM)&mii); idle = 1; aim_set_idle(hServerConn,seqno,mii.idleTime * 60); diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp index 32e71215ea..4baa572ed0 100644 --- a/protocols/JabberG/src/jabber_events.cpp +++ b/protocols/JabberG/src/jabber_events.cpp @@ -225,11 +225,11 @@ int CJabberProto::OnIdleChanged(WPARAM, LPARAM lParam) } if (lParam & IDF_ISIDLE) { - MIRANDA_IDLE_INFO mii = { 0 }; - mii.cbSize = sizeof(mii); + MIRANDA_IDLE_INFO mii = { sizeof(mii) }; CallService(MS_IDLE_GETIDLEINFO, 0, (LPARAM)&mii); m_tmJabberIdleStartTime = time(0) - mii.idleTime * 60; - } else - m_tmJabberIdleStartTime = 0; + } + else m_tmJabberIdleStartTime = 0; + return 0; } -- cgit v1.2.3