diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-05-31 11:46:05 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-05-31 11:46:05 +0000 |
| commit | 1ce3da1cca093143d9629bc46e221dd8be962e12 (patch) | |
| tree | b99d12d635a65f8c78499137137df2bd591b50be /protocols/SkypeClassic/src | |
| parent | 03512ff2ed0f3d1ed6857ee85b0eb7268931ec3f (diff) | |
- MAllStrings: a handy union to hold an incoming string parameter of any type;
- FNAMECHAR: atavism extincted;
- PROTOSEARCHRESULT: structure prepared to use results of any type, including utf
git-svn-id: http://svn.miranda-ng.org/main/trunk@13932 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/SkypeClassic/src')
| -rw-r--r-- | protocols/SkypeClassic/src/skype.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/protocols/SkypeClassic/src/skype.cpp b/protocols/SkypeClassic/src/skype.cpp index e0bf3fe270..411fdbb0a4 100644 --- a/protocols/SkypeClassic/src/skype.cpp +++ b/protocols/SkypeClassic/src/skype.cpp @@ -377,21 +377,21 @@ void BasicSearchThread(char *nick) { psr.cbSize = sizeof(psr);
char *nextoken = 0;
for (token = strtok_r(cmd + 5, ", ", &nextoken); token; token = strtok_r(NULL, ", ", &nextoken)) {
- psr.nick = psr.id = _A2T(token);
- psr.lastName = NULL;
- psr.firstName = NULL;
- psr.email = NULL;
+ psr.nick.t = psr.id.t = _A2T(token);
+ psr.lastName.t = NULL;
+ psr.firstName.t = NULL;
+ psr.email.t = NULL;
if (ptr = SkypeGet("USER", token, "FULLNAME")) {
// We cannot use strtok() to seperate first & last name here,
// because we already use it for parsing the user list
// So we use our own function
- if (psr.lastName = _A2T(strchr(ptr, ' '))) {
- *psr.lastName = 0;
- psr.lastName++;
- LOG(("BasicSearchThread: lastName=%s", psr.lastName));
+ if (psr.lastName.t = _A2T(strchr(ptr, ' '))) {
+ *psr.lastName.t = 0;
+ psr.lastName.t++;
+ LOG(("BasicSearchThread: lastName=%s", psr.lastName.t));
}
- psr.firstName = _A2T(ptr);
- LOG(("BasicSearchThread: firstName=%s", psr.firstName));
+ psr.firstName.t = _A2T(ptr);
+ LOG(("BasicSearchThread: firstName=%s", psr.firstName.t));
}
ProtoBroadcastAck(SKYPE_PROTONAME, NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, (HANDLE)hSearchThread, (LPARAM)(PROTOSEARCHRESULT*)&psr);
if (ptr) free(ptr);
@@ -2608,9 +2608,9 @@ INT_PTR SkypeGetInfo(WPARAM, LPARAM lParam) { INT_PTR SkypeAddToList(WPARAM wParam, LPARAM lParam) {
LOG(("SkypeAddToList Adding API function called"));
PROTOSEARCHRESULT *psr = (PROTOSEARCHRESULT*)lParam;
- if (psr->cbSize != sizeof(PROTOSEARCHRESULT) || !psr->nick) return 0;
+ if (psr->cbSize != sizeof(PROTOSEARCHRESULT) || !psr->nick.t) return 0;
LOG(("SkypeAddToList OK"));
- return (INT_PTR)add_contact(_T2A(psr->nick), (DWORD)wParam);
+ return (INT_PTR)add_contact(_T2A(psr->nick.t), (DWORD)wParam);
}
INT_PTR SkypeBasicSearch(WPARAM, LPARAM lParam) {
|