diff options
author | George Hazan <george.hazan@gmail.com> | 2015-05-31 16:50:53 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2015-05-31 16:50:53 +0000 |
commit | d57b6799dac75f3c428393666d079fe59361c4b5 (patch) | |
tree | 4bcb3de1b241e89c4dca03bd8b031bc17dbe9b56 /protocols/Xfire | |
parent | 85e27141c915d057deeb4be6c4bc81d387c39be6 (diff) |
fixes for PS_SETAWAYMSG calls
git-svn-id: http://svn.miranda-ng.org/main/trunk@13939 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Xfire')
-rw-r--r-- | protocols/Xfire/src/all_statusmsg.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/protocols/Xfire/src/all_statusmsg.cpp b/protocols/Xfire/src/all_statusmsg.cpp index d08db0920f..6387f5a798 100644 --- a/protocols/Xfire/src/all_statusmsg.cpp +++ b/protocols/Xfire/src/all_statusmsg.cpp @@ -259,14 +259,15 @@ BOOL SetGameStatusMsg() XFireLog("-> SetStatusMsg of %s with Miranda with occupied status.", protoname->at(i).c_str());
//statusmsg für beschäftigt setzen
- CallProtoService(temp[i]->szModuleName, PS_SETAWAYMSG, oltostatus->at(i), (LPARAM)statusMsg);
+ ptrW wszStatus(mir_a2u(statusMsg));
+ CallProtoService(temp[i]->szModuleName, PS_SETAWAYMSG, oltostatus->at(i), wszStatus);
//status auf beschäftigt wechseln
CallProtoService(temp[i]->szModuleName, PS_SETSTATUS, oltostatus->at(i), 0);
//statusmsg für beschäftigt setzen
if (CallProtoService(temp[i]->szModuleName, PS_GETSTATUS, 0, 0) != oltostatus->at(i))
{
XFireLog("Set StatusMsg again, Status was not succesfully set.");
- CallProtoService(temp[i]->szModuleName, PS_SETAWAYMSG, oltostatus->at(i), (LPARAM)statusMsg);
+ CallProtoService(temp[i]->szModuleName, PS_SETAWAYMSG, oltostatus->at(i), wszStatus);
}
}
}
@@ -274,7 +275,8 @@ BOOL SetGameStatusMsg() {
XFireLog("-> SetStatusMsg of %s.", protoname->at(i).c_str());
- CallProtoService(temp[i]->szModuleName, PS_SETAWAYMSG, olstatus->at(i), (LPARAM)statusMsg);
+ ptrW wszStatus(mir_a2u(statusMsg));
+ CallProtoService(temp[i]->szModuleName, PS_SETAWAYMSG, olstatus->at(i), wszStatus);
}
}
}
@@ -293,18 +295,19 @@ BOOL SetOldStatusMsg() {
if (olstatus->at(i) != -1)
{
+ ptrW wszStatus(mir_a2u(olstatusmsg->at(i).c_str()));
if (statustype)
{
//alten status setzen
CallProtoService(temp[i]->szModuleName, PS_SETSTATUS, olstatus->at(i), 0);
//status wurde nicht gewechselt, dann statusmsg nachträglich setzen
if (CallProtoService(temp[i]->szModuleName, PS_GETSTATUS, 0, 0) != olstatus->at(i))
- CallProtoService(temp[i]->szModuleName, PS_SETAWAYMSG, olstatus->at(i), (LPARAM)olstatusmsg->at(i).c_str());
+ CallProtoService(temp[i]->szModuleName, PS_SETAWAYMSG, olstatus->at(i), wszStatus);
}
else
{
CallProtoService(temp[i]->szModuleName, PS_SETSTATUS, olstatus->at(i), 0);
- CallProtoService(temp[i]->szModuleName, PS_SETAWAYMSG, olstatus->at(i), (LPARAM)olstatusmsg->at(i).c_str());
+ CallProtoService(temp[i]->szModuleName, PS_SETAWAYMSG, olstatus->at(i), wszStatus);
}
}
}
|