diff options
Diffstat (limited to 'plugins/Weather/src')
| -rw-r--r-- | plugins/Weather/src/weather_addstn.cpp | 2 | ||||
| -rw-r--r-- | plugins/Weather/src/weather_update.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/plugins/Weather/src/weather_addstn.cpp b/plugins/Weather/src/weather_addstn.cpp index 7c70cd4f8a..cede7efbf4 100644 --- a/plugins/Weather/src/weather_addstn.cpp +++ b/plugins/Weather/src/weather_addstn.cpp @@ -310,7 +310,7 @@ int NameSearchProc(TCHAR *name, const int searchId, WINAMESEARCH *sData, TCHAR * // replace spaces with %20
char loc[256];
- ptrA szSearchName( mir_utf8encodeT(name));
+ T2Utf szSearchName(name);
mir_snprintf(loc, SIZEOF(loc), sData->SearchURL, ptrA( mir_urlEncode(szSearchName)));
if (InternetDownloadFile(loc, NULL, NULL, &szData) == 0) {
TCHAR* szInfo = szData;
diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp index 7b757961cc..fc94299a79 100644 --- a/plugins/Weather/src/weather_update.cpp +++ b/plugins/Weather/src/weather_update.cpp @@ -189,13 +189,15 @@ int UpdateWeather(MCONTACT hContact) // internal log using history
GetDisplay(&winfo, opt.hText, str2);
+ T2Utf szMessage(str2);
+
DBEVENTINFO dbei = { sizeof(dbei) };
dbei.szModule = WEATHERPROTONAME;
dbei.timestamp = (DWORD)time(NULL);
- dbei.flags = DBEF_READ|DBEF_UTF;
+ dbei.flags = DBEF_READ | DBEF_UTF;
dbei.eventType = EVENTTYPE_MESSAGE;
- dbei.pBlob = (PBYTE)mir_utf8encodeT(str2);
- dbei.cbBlob = (DWORD)mir_strlen((char*)dbei.pBlob)+1;
+ dbei.pBlob = szMessage;
+ dbei.cbBlob = (DWORD)mir_strlen(szMessage)+1;
db_event_add(hContact, &dbei);
}
|