summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Lantsev <aunsane@gmail.com>2012-10-21 18:44:56 +0000
committerAlexander Lantsev <aunsane@gmail.com>2012-10-21 18:44:56 +0000
commit9620406c74af23fc9c2c0a6cb7bac08195997112 (patch)
tree90aab317b072075e9129e90b0003d594de72e0d7
parent551d0592a2632d64b17bba22880b31cad14566da (diff)
- fixed account mahager dialog
- fixed crash on avatar loading git-svn-id: http://svn.miranda-ng.org/main/trunk@2036 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--protocols/Skype/docs/todo_list.txt4
-rw-r--r--protocols/Skype/src/skype_contacts.cpp2
-rw-r--r--protocols/Skype/src/skype_proto.cpp3
3 files changed, 6 insertions, 3 deletions
diff --git a/protocols/Skype/docs/todo_list.txt b/protocols/Skype/docs/todo_list.txt
index 88281a48b4..dae488f7ad 100644
--- a/protocols/Skype/docs/todo_list.txt
+++ b/protocols/Skype/docs/todo_list.txt
@@ -1,7 +1,9 @@
Bugs:
+- fix shutdown crash
Features:
- own info(profile)
- multiuser chat
- voice
-- video \ No newline at end of file
+- video
+- run skype runtime from resources directly \ No newline at end of file
diff --git a/protocols/Skype/src/skype_contacts.cpp b/protocols/Skype/src/skype_contacts.cpp
index 72f9e9b8a4..4bbd143566 100644
--- a/protocols/Skype/src/skype_contacts.cpp
+++ b/protocols/Skype/src/skype_contacts.cpp
@@ -61,7 +61,7 @@ void CSkypeProto::UpdateContactAvatar(HANDLE hContact, CContact::Ref contact)
this->SendBroadcast(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, (HANDLE)&pai, 0);
}
- ::mir_free(path);
+ delete path;
}
}
}
diff --git a/protocols/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp
index e818938247..c0d59c087e 100644
--- a/protocols/Skype/src/skype_proto.cpp
+++ b/protocols/Skype/src/skype_proto.cpp
@@ -1,7 +1,6 @@
#include "skype_proto.h"
CSkypeProto::CSkypeProto(const char* protoName, const TCHAR* userName)
- : login(L"")
{
this->m_iVersion = 2;
this->m_iStatus = ID_STATUS_OFFLINE;
@@ -18,6 +17,8 @@ CSkypeProto::CSkypeProto(const char* protoName, const TCHAR* userName)
this->signin_lock = CreateMutex(0, false, 0);
this->SetAllContactStatus(ID_STATUS_OFFLINE);
+ this->CreateService(PS_CREATEACCMGRUI, &CSkypeProto::OnAccountManagerInit);
+
this->InitNetLib();
}