diff options
| author | Alexander Lantsev <aunsane@gmail.com> | 2013-05-05 08:38:57 +0000 |
|---|---|---|
| committer | Alexander Lantsev <aunsane@gmail.com> | 2013-05-05 08:38:57 +0000 |
| commit | 1229cee3091839af4dd181e28b55e4823079007e (patch) | |
| tree | 7afa602a61bdc81de9135b5642ec11c5ee4ea229 /protocols/Skype/src/skype_proto.cpp | |
| parent | 1b39cc1afb501ea3973affcf864b8485e81251ff (diff) | |
- reworked invitation to chat
- fixed chat contact's statuses
- added "Spawn conversation" button in contact dialog
- StringList now based on stl
git-svn-id: http://svn.miranda-ng.org/main/trunk@4586 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Skype/src/skype_proto.cpp')
| -rw-r--r-- | protocols/Skype/src/skype_proto.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/protocols/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp index ba2caabe44..ccb5e43057 100644 --- a/protocols/Skype/src/skype_proto.cpp +++ b/protocols/Skype/src/skype_proto.cpp @@ -421,12 +421,11 @@ int __cdecl CSkypeProto::UserIsTyping(HANDLE hContact, int type) {
if (hContact && this->IsOnline() && this->m_iStatus != ID_STATUS_INVISIBLE)
{
- mir_ptr<wchar_t> sid(::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_LOGIN));
+ wchar_t *sid = ::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_LOGIN);
if (::wcsicmp(sid, this->login) != 0)
{
SEStringList targets;
- mir_ptr<wchar_t> sid(::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_LOGIN));
- targets.append((char *)mir_ptr<char>(::mir_utf8encodeW(sid)));
+ targets.append(std::string(::mir_utf8encodeW(sid)).c_str());
CConversation::Ref conversation;
g_skype->GetConversationByParticipants(targets, conversation);
@@ -445,6 +444,7 @@ int __cdecl CSkypeProto::UserIsTyping(HANDLE hContact, int type) }
}
}
+ ::mir_free(sid);
}
return 1;
@@ -462,6 +462,7 @@ int __cdecl CSkypeProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM case EV_PROTO_ONMENU:
this->OnInitStatusMenu();
+ break;
case EV_PROTO_ONCONTACTDELETED:
return this->OnContactDeleted(wParam, lParam);
|