diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2010-10-28 22:37:49 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2010-10-28 22:37:49 +0300 |
| commit | 66ca1334996fac1e76b1830b00a7a8d42ddb8e42 (patch) | |
| tree | c9281a516aca66294dfb10d3b0169c746b221a18 | |
| parent | 81a35fab982d1d0a98a4ddf61e8b57f03fc9e41e (diff) | |
still have problems with metacontacts
| -rw-r--r-- | messages.cpp | 4 | ||||
| -rw-r--r-- | options.cpp | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/messages.cpp b/messages.cpp index c7e0c99..1727bfc 100644 --- a/messages.cpp +++ b/messages.cpp @@ -521,7 +521,6 @@ int SendMsgSvc(WPARAM w, LPARAM l) // hps->str = new string(str_event); // hps->hContact = hContact; // msgs_to_ignore.push_back(hps); - hcontact_data[hContact].msgs_to_ignore.push_back(str_event); if(bAppendTags) { str_event.insert(0, toUTF8(outopentag)); @@ -529,6 +528,9 @@ 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[hContact].msgs_to_ignore.push_back((char*)ccs->lParam); + hcontact_data[metaGetContact(hContact)].msgs_to_ignore.push_back((char*)ccs->lParam); + hcontact_data[metaGetContact(hContact)].msgs_to_ignore.push_back((char*)ccs->lParam); //hmm, twice ? metacontacts !! %) // DBWriteContactSettingByte(metaGetContact(hContact), szGPGModuleName, "MsgsForTagging", DBGetContactSettingByte(metaGetContact(hContact), szGPGModuleName, "MsgsForTagging", 0) + 1); CallContactService(hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)toUTF8(str).c_str()); return returnNoError(hContact); diff --git a/options.cpp b/options.cpp index 6acc3e7..a560168 100644 --- a/options.cpp +++ b/options.cpp @@ -932,6 +932,8 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP s2 = output.find("<", s); else if(s2 > output.find("<", s)) s2 = output.find("<", s); + if(s2 != string::npos) + { tmp2 = new char [output.substr(s,s2-s-1).length()+1]; strcpy(tmp2, output.substr(s,s2-s-1).c_str()); mir_utf8decode(tmp2, 0); @@ -1057,6 +1059,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP ListView_SetItemText(hwndList_p, item_num, 3, tmp); mir_free(tmp); } + } if(hContact && hwndList_p) { ListView_SetColumnWidth(hwndList_p, 0, LVSCW_AUTOSIZE); |