From bf88761455597a47f1074d01c4a29c41e0fe270c Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sat, 10 Mar 2012 21:13:22 +0200 Subject: copyrights --- srmm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 srmm.cpp (limited to 'srmm.cpp') diff --git a/srmm.cpp b/srmm.cpp old mode 100644 new mode 100755 index af21f8f..dd2b9d2 --- a/srmm.cpp +++ b/srmm.cpp @@ -1,4 +1,4 @@ -// Copyright © 2010 SecureIM developers (baloo and others), sss +// Copyright © 2010-2012 SecureIM developers (baloo and others), sss // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License -- cgit v1.2.3 From 093731d35e605ede9798ace4ac73c77a51012a6c Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sun, 20 May 2012 07:24:29 +0300 Subject: metacontacts fixes --- srmm.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'srmm.cpp') diff --git a/srmm.cpp b/srmm.cpp index dd2b9d2..763134a 100755 --- a/srmm.cpp +++ b/srmm.cpp @@ -34,7 +34,7 @@ int __cdecl onWindowEvent(WPARAM wParam, LPARAM lParam) { int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) { HANDLE hContact = (HANDLE)wParam; - HANDLE hMeta = hContact; + HANDLE hMeta = NULL; if(metaIsProtoMetaContacts(hContact)) hContact = metaGetMostOnline(hContact); // возьмем тот, через который пойдет сообщение else if(metaIsSubcontact(hContact)) @@ -50,7 +50,7 @@ int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) { if(enc) { DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0); - DBWriteContactSettingByte(hMeta, szGPGModuleName, "GPGEncryption", 0); + hMeta?DBWriteContactSettingByte(hMeta, szGPGModuleName, "GPGEncryption", 0):0; setSrmmIcon(hContact); setClistIcon(hContact); } @@ -68,7 +68,7 @@ int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) { else { DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 1); - DBWriteContactSettingByte(hMeta, szGPGModuleName, "GPGEncryption", 1); + hMeta?DBWriteContactSettingByte(hMeta, szGPGModuleName, "GPGEncryption", 1):0; setSrmmIcon(hContact); setClistIcon(hContact); return 0; @@ -76,7 +76,7 @@ int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) { if(isContactHaveKey(hContact)) { DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 1); - DBWriteContactSettingByte(hMeta, szGPGModuleName, "GPGEncryption", 1); + hMeta?DBWriteContactSettingByte(hMeta, szGPGModuleName, "GPGEncryption", 1):0; setSrmmIcon(hContact); setClistIcon(hContact); } -- cgit v1.2.3 From 829c3778ac700f2d64e7032d0727f860196e4417 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Mon, 21 May 2012 00:38:28 +0300 Subject: fixed another metacontacts problem --- srmm.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'srmm.cpp') diff --git a/srmm.cpp b/srmm.cpp index 763134a..6fc204a 100755 --- a/srmm.cpp +++ b/srmm.cpp @@ -36,7 +36,10 @@ int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) { HANDLE hContact = (HANDLE)wParam; HANDLE hMeta = NULL; if(metaIsProtoMetaContacts(hContact)) + { + hMeta = hContact; hContact = metaGetMostOnline(hContact); // возьмем тот, через который пойдет сообщение + } else if(metaIsSubcontact(hContact)) hMeta = metaGetContact(hContact); StatusIconClickData *sicd = (StatusIconClickData *)lParam; -- cgit v1.2.3