From b3e0d5a4ed673b3ad80da1934359ee8c6606e1f4 Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Fri, 21 Dec 2012 14:41:01 +0000 Subject: - sixed some issues with history, messages, chats and contacts git-svn-id: http://svn.miranda-ng.org/main/trunk@2778 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/src/skype_dialogs.cpp | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) (limited to 'protocols/Skype/src/skype_dialogs.cpp') diff --git a/protocols/Skype/src/skype_dialogs.cpp b/protocols/Skype/src/skype_dialogs.cpp index fd41a16407..ed56eee734 100644 --- a/protocols/Skype/src/skype_dialogs.cpp +++ b/protocols/Skype/src/skype_dialogs.cpp @@ -459,12 +459,17 @@ INT_PTR CALLBACK CSkypeProto::InviteToChatProc(HWND hwndDlg, UINT msg, WPARAM wP switch (msg) { case WM_INITDIALOG: - TranslateDialogDefault(hwndDlg); + { + TranslateDialogDefault(hwndDlg); - SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam); - param = (InviteChatParam*)lParam; + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam); + param = (InviteChatParam*)lParam; -// WindowSetIcon(hwndDlg, "msn"); + HWND hwndClist = GetDlgItem(hwndDlg, IDC_CCLIST); + SetWindowLongPtr(hwndClist, GWL_STYLE, GetWindowLongPtr(hwndClist, GWL_STYLE) & ~CLS_HIDEOFFLINE); + + // WindowSetIcon(hwndDlg, "msn"); + } break; case WM_CLOSE: @@ -553,27 +558,27 @@ INT_PTR CALLBACK CSkypeProto::InviteToChatProc(HWND hwndDlg, UINT msg, WPARAM wP CConversation::Ref conversation; char *chatID = ::mir_strdup(param->id); + if (chatID) { + for (uint i = 0; i < invitedContacts.size(); i++) + { + param->ppro->AddChatContact(chatID, invitedContacts[i]); + } + g_skype->GetConversationByIdentity(chatID, conversation); conversation->AddConsumers(invitedContacts); } else { chatID = param->ppro->StartChat(NULL); + for (uint i = 0; i < invitedContacts.size(); i++) + { + param->ppro->AddChatContact(chatID, invitedContacts[i]); + } g_skype->GetConversationByIdentity(chatID, conversation); conversation->AddConsumers(invitedContacts); - - /*SEString data; - - conversation->GetPropIdentity(data); - char *cid = ::mir_strdup((const char *)data); - - for (uint i = 0; i < invitedContacts.size(); i++) - { - param->ppro->AddChatContact(cid, invitedContacts[i]); - }*/ } } -- cgit v1.2.3