diff options
Diffstat (limited to 'plugins/StatusPlugins')
| -rw-r--r-- | plugins/StatusPlugins/StartupStatus/startupstatus.cpp | 18 | ||||
| -rw-r--r-- | plugins/StatusPlugins/commonstatus.cpp | 7 | ||||
| -rw-r--r-- | plugins/StatusPlugins/commonstatus.h | 1 |
3 files changed, 2 insertions, 24 deletions
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 <m_netlib.h>
#include "m_statusplugins.h"
#include <m_utils.h>
-#include <m_NewAwaySys.h>
#include <win2k.h>
#if defined( _WIN64 )
|