diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2012-10-02 20:05:26 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2012-10-02 20:05:26 +0000 |
| commit | 2fba8eab75ad524f65eab063e97c2da05d13b0b8 (patch) | |
| tree | 5ad4d3a6c68cbdb97abe5c138cac1c6094ba0abc | |
| parent | fb3dc0b39055701049d438bdaabda177d5b9edea (diff) | |
StopSpamPlus:
all Not In List folders will be removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@1768 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/StopSpamPlus/src/services.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/StopSpamPlus/src/services.cpp b/plugins/StopSpamPlus/src/services.cpp index 7fe08a9600..ff19540a63 100644 --- a/plugins/StopSpamPlus/src/services.cpp +++ b/plugins/StopSpamPlus/src/services.cpp @@ -30,7 +30,7 @@ INT_PTR RemoveTempContacts(WPARAM wParam,LPARAM lParam) if ( DBGetContactSettingTString( hContact, "CList", "Group", &dbv ))
dbv.ptszVal = NULL;
- if ( DBGetContactSettingByte(hContact, "CList", "NotOnList", 0) || !lstrcmp(dbv.ptszVal, _T("Not In List")) || !lstrcmp(dbv.ptszVal, TranslateT("Not In List")) || DBGetContactSettingByte(hContact, "CList", "Hidden", 0 )) {
+ if ( DBGetContactSettingByte(hContact, "CList", "NotOnList", 0) || DBGetContactSettingByte(hContact, "CList", "Hidden", 0 ) || (dbv.ptszVal != NULL && (_tcsstr(dbv.ptszVal, _T("Not In List")) || _tcsstr(dbv.ptszVal, TranslateT("Not In List"))))) {
char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
if ( szProto != NULL ) {
// Check if protocol uses server side lists
@@ -55,7 +55,7 @@ INT_PTR RemoveTempContacts(WPARAM wParam,LPARAM lParam) char *group_name;
do {
group_name = (char *)CallService(MS_CLIST_GROUPGETNAME, (WPARAM)hGroup, 0);
- if ( group_name && lstrcmpA(group_name, "Not In List") == 0 ) {
+ if (group_name != NULL && strstr(group_name, "Not In List")) {
BYTE ConfirmDelete = DBGetContactSettingByte(NULL, "CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT);
if ( ConfirmDelete )
DBWriteContactSettingByte( NULL, "CList", "ConfirmDelete", 0 );
|