diff options
author | George Hazan <george.hazan@gmail.com> | 2013-07-20 13:23:20 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2013-07-20 13:23:20 +0000 |
commit | d7382326906b9f3bdd66704dd1b41f9299c1daa6 (patch) | |
tree | ccc0696d8ec511b4894cf2b20971b9f7fc625689 /protocols/Skype/src | |
parent | 874cdbe42cfe376f0e72fd5fe6bad0d2f75f4ee3 (diff) |
protocol helper for detecting chats: isChatRoom
git-svn-id: http://svn.miranda-ng.org/main/trunk@5428 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Skype/src')
-rw-r--r-- | protocols/Skype/src/skype_blocked.cpp | 2 | ||||
-rw-r--r-- | protocols/Skype/src/skype_chat.cpp | 7 | ||||
-rw-r--r-- | protocols/Skype/src/skype_contacts.cpp | 2 | ||||
-rw-r--r-- | protocols/Skype/src/skype_events.cpp | 6 | ||||
-rw-r--r-- | protocols/Skype/src/skype_menus.cpp | 2 | ||||
-rw-r--r-- | protocols/Skype/src/skype_messages.cpp | 4 | ||||
-rw-r--r-- | protocols/Skype/src/skype_proto.cpp | 4 | ||||
-rw-r--r-- | protocols/Skype/src/skype_proto.h | 2 |
8 files changed, 11 insertions, 18 deletions
diff --git a/protocols/Skype/src/skype_blocked.cpp b/protocols/Skype/src/skype_blocked.cpp index 511c0fd423..ba6b123824 100644 --- a/protocols/Skype/src/skype_blocked.cpp +++ b/protocols/Skype/src/skype_blocked.cpp @@ -256,7 +256,7 @@ INT_PTR CALLBACK CSkypeProto::SkypeBlockedOptionsProc(HWND hwndDlg, UINT msg, WP ::EnterCriticalSection(&ppro->contact_search_lock);
- for (hContact = ::db_find_first(ppro->m_szModuleName); hContact && !ppro->IsChatRoom(hContact); hContact = ::db_find_next(hContact, ppro->m_szModuleName))
+ for (hContact = ::db_find_first(ppro->m_szModuleName); hContact && !ppro->isChatRoom(hContact); hContact = ::db_find_next(hContact, ppro->m_szModuleName))
{
ptrW sid(::db_get_wsa(hContact, ppro->m_szModuleName, SKYPE_SETTINGS_SID));
diff --git a/protocols/Skype/src/skype_chat.cpp b/protocols/Skype/src/skype_chat.cpp index 02988fd15c..57339feb7e 100644 --- a/protocols/Skype/src/skype_chat.cpp +++ b/protocols/Skype/src/skype_chat.cpp @@ -1017,7 +1017,7 @@ void ChatRoom::OnParticipantChanged(const ParticipantRef &participant, int prop) void CSkypeProto::ChatValidateContact(HANDLE hItem, HWND hwndList, const StringList &contacts)
{
- if (this->IsProtoContact(hItem) && !this->IsChatRoom(hItem))
+ if (this->IsProtoContact(hItem) && !this->isChatRoom(hItem))
{
ptrW sid( ::db_get_wsa(hItem, this->m_szModuleName, SKYPE_SETTINGS_SID));
if (sid == NULL || contacts.contains(sid))
@@ -1224,11 +1224,6 @@ INT_PTR CALLBACK CSkypeProto::ChatRoomProc(HWND hwndDlg, UINT msg, WPARAM wParam return FALSE;
}
-bool CSkypeProto::IsChatRoom(HANDLE hContact)
-{
- return this->getByte(hContact, "ChatRoom", 0) == 1;
-}
-
INT_PTR CSkypeProto::CreateChatRoomCommand(WPARAM, LPARAM)
{
ChatRoomParam *param = new ChatRoomParam(NULL, NULL, this);
diff --git a/protocols/Skype/src/skype_contacts.cpp b/protocols/Skype/src/skype_contacts.cpp index a1320dd145..0f848d522f 100644 --- a/protocols/Skype/src/skype_contacts.cpp +++ b/protocols/Skype/src/skype_contacts.cpp @@ -307,7 +307,7 @@ void CSkypeProto::SetAllContactStatus(int status) {
if (this->getByte(hContact, "IsSkypeOut", 0) != 0)
continue;
- if (this->IsChatRoom(hContact))
+ if (this->isChatRoom(hContact))
continue;
if (this->IsContactOnline(hContact))
::db_set_w(hContact, this->m_szModuleName, SKYPE_SETTINGS_STATUS, status);
diff --git a/protocols/Skype/src/skype_events.cpp b/protocols/Skype/src/skype_events.cpp index 59848a66aa..7b1db8fa82 100644 --- a/protocols/Skype/src/skype_events.cpp +++ b/protocols/Skype/src/skype_events.cpp @@ -69,7 +69,7 @@ int CSkypeProto::OnContactDeleted(WPARAM wParam, LPARAM lParam) HANDLE hContact = (HANDLE)wParam;
if (hContact)
{
- if (this->IsChatRoom(hContact))
+ if (this->isChatRoom(hContact))
{
this->OnLeaveChat(wParam, 0);
ptrW cid(::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID));
@@ -205,12 +205,12 @@ int __cdecl CSkypeProto::OnTabSRMMButtonPressed(WPARAM wParam, LPARAM lParam) switch (cbcd->dwButtonId)
{
case BBB_ID_CONF_INVITE:
- if (this->IsOnline() && this->IsChatRoom(hContact))
+ if (this->IsOnline() && this->isChatRoom(hContact))
this->ChatRoomInvite(hContact);
break;
case BBB_ID_CONF_SPAWN:
- if (this->IsOnline() && !this->IsChatRoom(hContact))
+ if (this->IsOnline() && !this->isChatRoom(hContact))
{
SEStringList targets;
ptrW sid(::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID));
diff --git a/protocols/Skype/src/skype_menus.cpp b/protocols/Skype/src/skype_menus.cpp index d1b46c376d..4ff59cf601 100644 --- a/protocols/Skype/src/skype_menus.cpp +++ b/protocols/Skype/src/skype_menus.cpp @@ -20,7 +20,7 @@ int CSkypeProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM) if ( !this->IsOnline() || ::lstrcmpA(::GetContactProto(hContact), m_szModuleName))
return 0;
- if ( !this->IsChatRoom(hContact))
+ if ( !this->isChatRoom(hContact))
{
bool ctrlPressed = (::GetKeyState(VK_CONTROL) & 0x8000) != 0;
diff --git a/protocols/Skype/src/skype_messages.cpp b/protocols/Skype/src/skype_messages.cpp index 352aa5f291..ce1eb4755f 100644 --- a/protocols/Skype/src/skype_messages.cpp +++ b/protocols/Skype/src/skype_messages.cpp @@ -229,7 +229,7 @@ void CSkypeProto::SyncHistoryCommand(HANDLE hContact, time_t timestamp) ptrW sid = ::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID);
ConversationRef conversation;
- if ( !this->IsChatRoom(hContact))
+ if ( !this->isChatRoom(hContact))
{
SEStringList target;
target.append((char *)ptrA(::mir_utf8encodeW(sid)));
@@ -294,7 +294,7 @@ int CSkypeProto::SyncAllTimeHistoryCommand(WPARAM wParam, LPARAM lParam) ptrW sid = ::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID);
ConversationRef conversation;
- if ( !this->IsChatRoom(hContact))
+ if ( !this->isChatRoom(hContact))
{
SEStringList target;
target.append((char *)ptrA(::mir_utf8encodeW(sid)));
diff --git a/protocols/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp index 545770fad0..7a64df8adf 100644 --- a/protocols/Skype/src/skype_proto.cpp +++ b/protocols/Skype/src/skype_proto.cpp @@ -380,7 +380,7 @@ int __cdecl CSkypeProto::SendContacts(HANDLE hContact, int flags, int nContacts, this->Log(L"Outcoming contacts");
ConversationRef conversation;
- if ( !this->IsChatRoom(hContact))
+ if ( !this->isChatRoom(hContact))
{
SEStringList targets;
targets.append((char *)_T2A(::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID)));
@@ -431,7 +431,7 @@ HANDLE __cdecl CSkypeProto::SendFile(HANDLE hContact, const TCHAR *szDescription this->Log(L"Outcoming file transfer");
ConversationRef conversation;
- if ( !this->IsChatRoom(hContact))
+ if ( !this->isChatRoom(hContact))
{
SEStringList targets;
targets.append((char *)_T2A(::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID)));
diff --git a/protocols/Skype/src/skype_proto.h b/protocols/Skype/src/skype_proto.h index 97ae2c8143..a391ecd0ed 100644 --- a/protocols/Skype/src/skype_proto.h +++ b/protocols/Skype/src/skype_proto.h @@ -324,8 +324,6 @@ protected: void InitChatModule();
INT_PTR __cdecl SkypeGCGetToolTipText(WPARAM wParam, LPARAM lParam);
- bool IsChatRoom(HANDLE hContact);
-
void UpdateChatUserStatus(const ContactRef &contact);
void UpdateChatUserNick(const ContactRef &contact);
|