SkypeWeb: More fixes.

git-svn-id: http://svn.miranda-ng.org/main/trunk@14550 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 4 insertions, 5 deletions

diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp
index 867dd99d7a..e9b6d2b816 100644
--- a/protocols/SkypeWeb/src/skype_proto.cpp
+++ b/protocols/SkypeWeb/src/skype_proto.cpp
@@ -59,6 +59,8 @@ PROTO<CSkypeProto>(protoName, userName), password(NULL)
 	SkinAddNewSoundEx("skype_call_canceled", "SkypeWeb", LPGEN("Incoming call canceled sound"));

 

 	m_hTrouterEvent = CreateEvent(NULL, FALSE, FALSE, NULL);

+

+	SkypeSetTimer(this);

 }

 

 CSkypeProto::~CSkypeProto()

@@ -73,6 +75,7 @@ CSkypeProto::~CSkypeProto()
 		Popup_UnregisterClass(m_hPopupClassCall);

 	if (m_hPopupClassNotify)

 		Popup_UnregisterClass(m_hPopupClassNotify);

+	SkypeUnsetTimer(this);

 }

 

 DWORD_PTR CSkypeProto::GetCaps(int type, MCONTACT)

@@ -125,9 +128,7 @@ MCONTACT CSkypeProto::AddToListByEvent(int, int, MEVENT hDbEvent)
 	char *lastName = firstName + mir_strlen(firstName) + 1;

 	char *skypename = lastName + mir_strlen(lastName) + 1;

 

-	char *newSkypename = (dbei.flags & DBEF_UTF) ? mir_utf8decodeA(skypename) : skypename;

-	MCONTACT hContact = AddContact(newSkypename);

-	mir_free(newSkypename);

+	MCONTACT hContact = AddContact(skypename);

 	return hContact;

 }

 

@@ -230,8 +231,6 @@ int CSkypeProto::SetStatus(int iNewStatus)
 		}

 		requestQueue->Stop();

 

-		SkypeUnsetTimer(this);

-

 		ProtoBroadcastAck(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)m_iStatus, ID_STATUS_OFFLINE);

 		m_iStatus = m_iDesiredStatus = ID_STATUS_OFFLINE;