From f45207c731e8d472f57143fb3d152a06ee7bd1f0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 19 Jul 2012 08:07:55 +0000 Subject: NAS support completely removed git-svn-id: http://svn.miranda-ng.org/main/trunk@1034 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/StatusPlugins/StartupStatus/startupstatus.cpp | 18 +----------------- plugins/StatusPlugins/commonstatus.cpp | 7 +------ plugins/StatusPlugins/commonstatus.h | 1 - 3 files changed, 2 insertions(+), 24 deletions(-) (limited to 'plugins/StatusPlugins') diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp index e1445a7704..9724f7e467 100644 --- a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp +++ b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp @@ -316,23 +316,7 @@ static int Exit(WPARAM wParam, LPARAM lParam) if ( !(CallProtoService(protos[i]->szModuleName, PS_GETCAPS, (WPARAM)PFLAGNUM_3, 0)&Proto_Status2Flag(status))) continue; - - if (ServiceExists(MS_NAS_GETSTATE)) { - // NewAwaySys - NAS_PROTOINFO npi = { 0 }; - npi.cbSize = sizeof(NAS_PROTOINFO); - npi.szProto = protos[i]->szModuleName; - npi.status = 0; - CallService(MS_NAS_GETSTATEA, (WPARAM)&npi, (LPARAM)1); - if (npi.szMsg == NULL) { - npi.status = 0; - npi.szProto = NULL; - CallService(MS_NAS_GETSTATEA, (WPARAM)&npi, (LPARAM)1); - } - if (npi.szMsg != NULL) { - DBWriteContactSettingString(NULL, MODULENAME, lastMsg, npi.szMsg); - mir_free(npi.szMsg); - } } } } + } } if ( (DBGetContactSettingByte(NULL, MODULENAME, SETTING_SETPROFILE, 1)) || (DBGetContactSettingByte(NULL, MODULENAME, SETTING_OFFLINECLOSE, 0))) { if (ServiceExists(MS_CLIST_SETSTATUSMODE)) diff --git a/plugins/StatusPlugins/commonstatus.cpp b/plugins/StatusPlugins/commonstatus.cpp index cb5f9ea9c5..3c7ca4251f 100644 --- a/plugins/StatusPlugins/commonstatus.cpp +++ b/plugins/StatusPlugins/commonstatus.cpp @@ -292,12 +292,7 @@ INT_PTR SetStatusEx(WPARAM wParam, LPARAM lParam) // set status message first if ( b_Caps1 && b_Caps3 ) SetStatusMsg( protoSettings[i], newstatus ); - - // set the status - if ( newstatus != oldstatus && !(b_Caps1 && b_Caps3 && ServiceExists( MS_NAS_SETSTATE ))) { - log_debugA("CommonStatus sets status for %s to %d", szProto, newstatus); - CallProtoService(szProto, PS_SETSTATUS, (WPARAM)newstatus, 0); - } } + } if ( globStatus != 0 ) { if ( !ServiceExists( MS_CLIST_SETSTATUSMODE )) { diff --git a/plugins/StatusPlugins/commonstatus.h b/plugins/StatusPlugins/commonstatus.h index 422a7821bc..6bd7c562d4 100644 --- a/plugins/StatusPlugins/commonstatus.h +++ b/plugins/StatusPlugins/commonstatus.h @@ -46,7 +46,6 @@ #include #include "m_statusplugins.h" #include -#include #include #if defined( _WIN64 ) -- cgit v1.2.3