From d7382326906b9f3bdd66704dd1b41f9299c1daa6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 20 Jul 2013 13:23:20 +0000 Subject: protocol helper for detecting chats: isChatRoom git-svn-id: http://svn.miranda-ng.org/main/trunk@5428 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Twitter/src/chat.cpp | 2 +- protocols/Twitter/src/contacts.cpp | 2 +- protocols/Twitter/src/proto.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'protocols/Twitter/src') diff --git a/protocols/Twitter/src/chat.cpp b/protocols/Twitter/src/chat.cpp index 96ad8af6da..5a03d293a7 100644 --- a/protocols/Twitter/src/chat.cpp +++ b/protocols/Twitter/src/chat.cpp @@ -198,7 +198,7 @@ void TwitterProto::SetChatStatus(int status) { // Add all friends to contact list for(HANDLE hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) { - if( db_get_b(hContact, m_szModuleName, "ChatRoom", 0)) + if( isChatRoom(hContact)) continue; DBVARIANT uid,nick; diff --git a/protocols/Twitter/src/contacts.cpp b/protocols/Twitter/src/contacts.cpp index da9ce0d79c..763ce1f699 100644 --- a/protocols/Twitter/src/contacts.cpp +++ b/protocols/Twitter/src/contacts.cpp @@ -214,7 +214,7 @@ bool TwitterProto::IsMyContact(HANDLE hContact,bool include_chat) if(proto && strcmp(m_szModuleName,proto) == 0) { if(include_chat) return true; - return db_get_b(hContact,m_szModuleName,"ChatRoom",0) == 0; + return !isChatRoom(hContact); } else return false; } diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index 5a54c199e3..659fee4fd2 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -502,7 +502,7 @@ void TwitterProto::UpdateSettings() for(HANDLE hContact = db_find_first(m_szModuleName); hContact; ) { HANDLE hNext = db_find_next(hContact, m_szModuleName); - if(db_get_b(hContact,m_szModuleName,"ChatRoom",0)) + if(isChatRoom(hContact)) CallService(MS_DB_CONTACT_DELETE,reinterpret_cast(hContact),0); hContact = hNext; } -- cgit v1.2.3