From 38d9b5d270082082b2a16ab2f69ca7ce76ad9b33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Fri, 8 Aug 2014 16:08:49 +0000 Subject: Facebook: Proper version of previous commit git-svn-id: http://svn.miranda-ng.org/main/trunk@10128 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/FacebookRM/src/process.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/protocols/FacebookRM/src/process.cpp b/protocols/FacebookRM/src/process.cpp index 2b5dfa8403..6f52f02bba 100644 --- a/protocols/FacebookRM/src/process.cpp +++ b/protocols/FacebookRM/src/process.cpp @@ -181,11 +181,11 @@ void FacebookProto::ProcessFriendList(void*) continue; facebook_user *fbu; - std::string id = ptrA(getStringA(hContact, FACEBOOK_KEY_ID)); - if (!id.empty()) { + ptrA id(getStringA(hContact, FACEBOOK_KEY_ID)); + if (id != NULL) { std::map< std::string, facebook_user* >::iterator iter; - if ((iter = friends.find(id)) != friends.end()) { + if ((iter = friends.find(std::string(id))) != friends.end()) { // Found contact, update it and remove from map fbu = iter->second; @@ -226,7 +226,7 @@ void FacebookProto::ProcessFriendList(void*) if (getDword(hContact, FACEBOOK_KEY_DELETED, 0)) { delSetting(hContact, FACEBOOK_KEY_DELETED); - std::string url = FACEBOOK_URL_PROFILE + fbu->user_id; + std::string url = FACEBOOK_URL_PROFILE + fbu->user_id; ptrT szTitle( mir_utf8decodeT(fbu->real_name.c_str())); NotifyEvent(szTitle, TranslateT("Contact is back on server-list."), hContact, FACEBOOK_EVENT_OTHER, &url); @@ -253,7 +253,7 @@ void FacebookProto::ProcessFriendList(void*) db_free(&dbv); } - std::string url = FACEBOOK_URL_PROFILE + id; + std::string url = FACEBOOK_URL_PROFILE + std::string(id); ptrT szTitle( mir_utf8decodeT(contactname.c_str())); NotifyEvent(szTitle, TranslateT("Contact is no longer on server-list."), hContact, FACEBOOK_EVENT_OTHER, &url); -- cgit v1.2.3