summaryrefslogtreecommitdiff
path: root/protocols/Yahoo/src/options.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-08-28 09:08:29 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-08-28 09:08:29 +0000
commitf056d6596882aa7cfecc21a61e8ef48f2b514460 (patch)
treef5acfc51e9452b765d6c2d581fcbebc7e07c45be /protocols/Yahoo/src/options.cpp
parent17501083ca15adc9e3f53757b47a961ed2e77e9c (diff)
fix for all remaining warnings like 'blablabla hides blablabla'
git-svn-id: http://svn.miranda-ng.org/main/trunk@15052 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Yahoo/src/options.cpp')
-rw-r--r--protocols/Yahoo/src/options.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/protocols/Yahoo/src/options.cpp b/protocols/Yahoo/src/options.cpp
index ce0a1b613e..284dca5c0b 100644
--- a/protocols/Yahoo/src/options.cpp
+++ b/protocols/Yahoo/src/options.cpp
@@ -211,15 +211,12 @@ YAHOO_DEFAULT_JAPAN_LOGIN_SERVER :
bool reconnectRequired = false;
char str[128];
GetDlgItemTextA(hwndDlg, IDC_LOGINSERVER, str, _countof(str));
-
- DBVARIANT dbv;
- if (ppro->getString(YAHOO_LOGINSERVER, &dbv)) {
- reconnectRequired = true;
- }
- else {
- if (mir_strcmp(str, dbv.pszVal))
+ {
+ ptrA szServer(ppro->getStringA(YAHOO_LOGINSERVER));
+ if (szServer == NULL)
+ reconnectRequired = true;
+ else if (mir_strcmp(str, szServer))
reconnectRequired = true;
- db_free(&dbv);
}
ppro->setString(YAHOO_LOGINSERVER, str);
@@ -271,7 +268,7 @@ static INT_PTR CALLBACK DlgProcYahooOptsIgnore(HWND hwndDlg, UINT msg, WPARAM wP
LOG(("[DlgProcYahooOptsIgnore] Grabbing current ignore list..."))
l = (YList *)ppro->GetIgnoreList();
while (l != NULL) {
- struct yahoo_buddy *b = (struct yahoo_buddy *) l->data;
+ yahoo_buddy *b = (yahoo_buddy *) l->data;
LOG(("[DlgProcYahooOptsIgnore] Buddy: %s", b->id))
SendDlgItemMessageA(hwndDlg, IDC_YIGN_LIST, LB_ADDSTRING, 0, (LPARAM)b->id);