summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss123next@list.ru>2010-10-29 22:54:29 +0300
committerGluzskiy Alexandr <sss123next@list.ru>2010-10-29 22:54:29 +0300
commit5c6c352a317c30f7ed1b54d7624f49ae7e10344a (patch)
tree81611130f35fc2a4f1a881464a1e2e41d7f847d5
parente1879c22c4608a7b0f33a5989ab0925fc9503679 (diff)
modified: messages.cpp
modified: new_gpg.rc
-rw-r--r--messages.cpp4
-rw-r--r--new_gpg.rc2
2 files changed, 2 insertions, 4 deletions
diff --git a/messages.cpp b/messages.cpp
index 12dede3..86ad601 100644
--- a/messages.cpp
+++ b/messages.cpp
@@ -729,7 +729,7 @@ int SendMsgSvc(WPARAM w, LPARAM l)
}
HistoryLog(hContact, (char*)str_event.c_str(), EVENTTYPE_MESSAGE, DBEF_SENT | DBEF_UTF);
HistoryLog(metaGetContact(hContact), (char*)str_event.c_str(), EVENTTYPE_MESSAGE, DBEF_SENT | DBEF_UTF);
- hcontact_data[metaGetContact(hContact)].msgs_to_ignore.push_back((char*)ccs->lParam);
+ hcontact_data[hContact].msgs_to_ignore.push_back((char*)ccs->lParam);
hcontact_data[metaGetContact(hContact)].msgs_to_ignore.push_back((char*)ccs->lParam); //hmm, twice ? metacontacts !! %)
CallContactService(hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)toUTF8(str).c_str());
return returnNoError(hContact);
@@ -756,8 +756,6 @@ int HookSendMsg(WPARAM w, LPARAM l)
hContact = (HANDLE)w;
else if(!hcontact_data[metaGetContact((HANDLE)w)].msgs_to_ignore.empty())
hContact = metaGetContact((HANDLE)w);
- else if(!hcontact_data[metaGetCurrent((HANDLE)w)].msgs_to_ignore.empty())
- hContact = metaGetCurrent((HANDLE)w);
if(hContact)
{
list<string>::iterator end = hcontact_data[hContact].msgs_to_ignore.end();
diff --git a/new_gpg.rc b/new_gpg.rc
index ce97ab4..c550ccc 100644
--- a/new_gpg.rc
+++ b/new_gpg.rc
@@ -76,7 +76,7 @@ BEGIN
RTEXT "Key password:",IDC_STATIC,12,149,76,8
PUSHBUTTON "Load other",IDC_OTHER,73,131,56,14
PUSHBUTTON "Delete key",IDC_DELETE_KEY,132,131,56,14
- PUSHBUTTON "Generatr and use random key",IDC_GENERATE_RANDOM,99,163,118,14
+ PUSHBUTTON "Generate and use random key",IDC_GENERATE_RANDOM,99,163,118,14
CONTROL "Turn on key autoexchange",IDC_AUTO_EXCHANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,101,180,113,10
END