From 19ab68c3d146d0d0dc24e9c8153e90d218395209 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 24 Sep 2013 19:22:39 +0000 Subject: GTalkExt: contact list contact restored git-svn-id: http://svn.miranda-ng.org/main/trunk@6214 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/GTalkExt/src/inbox.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'protocols/GTalkExt/src/inbox.cpp') diff --git a/protocols/GTalkExt/src/inbox.cpp b/protocols/GTalkExt/src/inbox.cpp index 471431a185..4343ae6fe2 100644 --- a/protocols/GTalkExt/src/inbox.cpp +++ b/protocols/GTalkExt/src/inbox.cpp @@ -66,8 +66,7 @@ const DWORD SIZE_OF_JABBER_OPTIONS = 243 * sizeof(DWORD); LPSTR HttpPost(HANDLE hUser, LPSTR reqUrl, LPSTR reqParams) { - NETLIBHTTPREQUEST nlhr = {0}; - nlhr.cbSize = sizeof(nlhr); + NETLIBHTTPREQUEST nlhr = { sizeof(nlhr) }; nlhr.requestType = REQUEST_POST; nlhr.flags = NLHRF_GENERATEHOST | NLHRF_SMARTAUTHHEADER | NLHRF_HTTP11 | NLHRF_SSL | NLHRF_NODUMP | NLHRF_NODUMPHEADERS; nlhr.szUrl = reqUrl; @@ -240,13 +239,17 @@ void OpenUrl(LPCSTR acc, LPCTSTR mailbox, LPCTSTR url) mir_forkthread(ShellExecuteThread, mir_tstrdup(url)); } -void OpenContactInbox(LPCSTR acc) +void OpenContactInbox(HANDLE hContact) { - DBVARIANT dbv; - if ( db_get_ts(0, acc, "jid", &dbv)) + LPSTR acc = GetContactProto(hContact); + if (!acc) + return; + + ptrT tszJid( db_get_tsa(0, acc, "jid")); + if (tszJid == NULL) return; - LPTSTR host = _tcschr(dbv.ptszVal, '@'); + LPTSTR host = _tcschr(tszJid, '@'); if (!host) return; *host++ = 0; @@ -256,7 +259,5 @@ void OpenContactInbox(LPCSTR acc) mir_sntprintf(buf, SIZEOF(buf), INBOX_URL_FORMAT, _T("a/"), host); // hosted else mir_sntprintf(buf, SIZEOF(buf), INBOX_URL_FORMAT, _T(""), _T("mail")); // common - OpenUrl(acc, dbv.ptszVal, buf); - - db_free(&dbv); + OpenUrl(acc, tszJid, buf); } -- cgit v1.2.3