summaryrefslogtreecommitdiff
path: root/protocols/Skype/src/skype_utils.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-12-09 20:56:06 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-12-09 20:56:06 +0000
commit9191a0aefc5213a44bb2f6fbffd732771b4e0264 (patch)
tree43a98f22f87a2b0f9039a3a5a5fdad43c3ab6dc6 /protocols/Skype/src/skype_utils.cpp
parentf3aa4bd3f0283c8a0421fb82b6bdc17ea73f7454 (diff)
- added 64 bit config;
- password storage fixed; - bunch of crash fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@2708 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Skype/src/skype_utils.cpp')
-rw-r--r--protocols/Skype/src/skype_utils.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/protocols/Skype/src/skype_utils.cpp b/protocols/Skype/src/skype_utils.cpp
index bfe155178e..ea4b8f3d1e 100644
--- a/protocols/Skype/src/skype_utils.cpp
+++ b/protocols/Skype/src/skype_utils.cpp
@@ -342,8 +342,7 @@ void CSkypeProto::HookEvent(const char* szEvent, SkypeEventFunc handler)
int CSkypeProto::SendBroadcast(HANDLE hContact, int type, int result, HANDLE hProcess, LPARAM lParam)
{
- ACKDATA ack = {0};
- ack.cbSize = sizeof(ACKDATA);
+ ACKDATA ack = { sizeof(ACKDATA) };
ack.szModule = this->m_szModuleName;
ack.hContact = hContact;
ack.type = type;
@@ -422,16 +421,12 @@ void CSkypeProto::ShowNotification(const wchar_t *sid, const wchar_t *message, i
{
if (::Miranda_Terminated()) return;
- if ( !ServiceExists(MS_POPUP_ADDPOPUPEX) || !DBGetContactSettingByte(NULL, "PopUp", "ModuleIsEnabled", 1) )
- {
- MessageBoxW(
- NULL,
- message,
- TranslateT("Skype Protocol"),
- MB_OK);
- }
- else
- {
+ if ( !ServiceExists(MS_POPUP_ADDPOPUPEX) || !DBGetContactSettingByte(NULL, "PopUp", "ModuleIsEnabled", 1))
+ MessageBoxW(NULL, message, TranslateT("Skype Protocol"), MB_OK);
+ else {
+ if ( !sid)
+ sid = L"";
+
POPUPDATAT_V2 ppd = {0};
ppd.cbSize = sizeof(POPUPDATAT_V2);
ppd.lchContact = NULL;