diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-24 15:18:45 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-24 15:18:45 +0000 |
| commit | 60066ee3ab1d80569d5c13fc9c14fe082aa28be4 (patch) | |
| tree | 5bb81ca47d272144a3c5e8f6314fb6a30106ab2b /plugins/StatusPlugins | |
| parent | f8a58bee25b77af07a938cfdf71bdc00c0446b0a (diff) | |
restored compatibility between NAS & SS plugins
git-svn-id: http://svn.miranda-ng.org/main/trunk@8258 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/StatusPlugins')
| -rw-r--r-- | plugins/StatusPlugins/StartupStatus/version.h | 2 | ||||
| -rw-r--r-- | plugins/StatusPlugins/commonstatus.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/StatusPlugins/StartupStatus/version.h b/plugins/StatusPlugins/StartupStatus/version.h index 53bc3fcd85..1ccf8a6209 100644 --- a/plugins/StatusPlugins/StartupStatus/version.h +++ b/plugins/StatusPlugins/StartupStatus/version.h @@ -8,7 +8,7 @@ #define __MAJOR_VERSION 0
#define __MINOR_VERSION 8
#define __RELEASE_NUM 0
-#define __BUILD_NUM 46
+#define __BUILD_NUM 47
// other stuff for Version resource
#include <stdver.h>
diff --git a/plugins/StatusPlugins/commonstatus.cpp b/plugins/StatusPlugins/commonstatus.cpp index db53916620..fb78e81c39 100644 --- a/plugins/StatusPlugins/commonstatus.cpp +++ b/plugins/StatusPlugins/commonstatus.cpp @@ -240,7 +240,7 @@ INT_PTR SetStatusEx(WPARAM wParam, LPARAM lParam) // issue with setting global status;
// things get messy because SRAway hooks ME_CLIST_STATUSMODECHANGE, so the status messages of SRAway and
// commonstatus will clash
- NotifyEventHooks(hCSStatusChangedExEvent, (WPARAM)&protoSettings, 0);
+ NotifyEventHooks(hCSStatusChangedExEvent, (WPARAM)&protoSettings, protoList->getCount());
// set all status messages first
for (int i = 0; i < protoList->getCount(); i++) {
@@ -286,7 +286,7 @@ INT_PTR SetStatusEx(WPARAM wParam, LPARAM lParam) SetStatusMsg(protoSettings[i], newstatus);
// set the status
- if (newstatus != oldstatus) {
+ 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);
}
|