diff options
Diffstat (limited to 'protocols/MSN')
| -rw-r--r-- | protocols/MSN/src/msn_chat.cpp | 9 | ||||
| -rw-r--r-- | protocols/MSN/src/msn_menu.cpp | 2 | ||||
| -rw-r--r-- | protocols/MSN/src/msn_svcs.cpp | 15 |
3 files changed, 9 insertions, 17 deletions
diff --git a/protocols/MSN/src/msn_chat.cpp b/protocols/MSN/src/msn_chat.cpp index ca49d3d11f..f46ea96ce3 100644 --- a/protocols/MSN/src/msn_chat.cpp +++ b/protocols/MSN/src/msn_chat.cpp @@ -28,12 +28,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. HANDLE CMsnProto::MSN_GetChatInernalHandle(HANDLE hContact)
{
HANDLE result = hContact;
- int type = getByte(hContact, "ChatRoom", 0);
- if (type != 0)
- {
+ if ( isChatRoom(hContact)) {
DBVARIANT dbv;
- if (getString(hContact, "ChatRoomID", &dbv) == 0)
- {
+ if (getString(hContact, "ChatRoomID", &dbv) == 0) {
result = (HANDLE)(-atol(dbv.pszVal));
db_free(&dbv);
}
@@ -187,7 +184,7 @@ static void ChatInviteSend(HANDLE hItem, HWND hwndList, STRLIST &str, CMsnProto static void ChatValidateContact(HANDLE hItem, HWND hwndList, CMsnProto* ppro)
{
- if (!ppro->MSN_IsMyContact(hItem) || ppro->getByte(hItem, "ChatRoom", 0) || ppro->MSN_IsMeByContact(hItem))
+ if (!ppro->MSN_IsMyContact(hItem) || ppro->isChatRoom(hItem) || ppro->MSN_IsMeByContact(hItem))
SendMessage(hwndList, CLM_DELETEITEM, (WPARAM)hItem, 0);
}
diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp index c8d88cf934..001efbb89a 100644 --- a/protocols/MSN/src/msn_menu.cpp +++ b/protocols/MSN/src/msn_menu.cpp @@ -143,7 +143,7 @@ int CMsnProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM) bool isMe = MSN_IsMeByContact(hContact, szEmail);
if (szEmail[0]) {
int listId = Lists_GetMask(szEmail);
- bool noChat = !(listId & LIST_FL) || isMe || getByte(hContact, "ChatRoom", 0);
+ bool noChat = !(listId & LIST_FL) || isMe || isChatRoom(hContact);
CLISTMENUITEM mi = { sizeof(mi) };
mi.flags = CMIM_NAME;
diff --git a/protocols/MSN/src/msn_svcs.cpp b/protocols/MSN/src/msn_svcs.cpp index 4b4a0b3170..ee59fdccde 100644 --- a/protocols/MSN/src/msn_svcs.cpp +++ b/protocols/MSN/src/msn_svcs.cpp @@ -386,17 +386,14 @@ int CMsnProto::OnContactDeleted(WPARAM wParam, LPARAM lParam) if (!msnLoggedIn) //should never happen for MSN contacts
return 0;
- int type = getByte(hContact, "ChatRoom", 0);
- if (type != 0)
- {
+ if ( isChatRoom(hContact)) {
DBVARIANT dbv;
if (!getTString(hContact, "ChatRoomID", &dbv)) {
MSN_KillChatSession(dbv.ptszVal);
db_free(&dbv);
}
}
- else
- {
+ else {
char szEmail[MSN_MAX_EMAIL_LEN];
if (MSN_IsMeByContact(hContact, szEmail))
CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM) 1);
@@ -587,7 +584,7 @@ int CMsnProto::OnWindowPopup(WPARAM wParam, LPARAM lParam) {
MessageWindowPopupData *mwpd = (MessageWindowPopupData *)lParam;
- if (!MSN_IsMyContact(mwpd->hContact) || getByte(mwpd->hContact, "ChatRoom", 0))
+ if (!MSN_IsMyContact(mwpd->hContact) || isChatRoom(mwpd->hContact))
return 0;
switch (mwpd->uType)
@@ -624,11 +621,9 @@ INT_PTR CMsnProto::GetUnreadEmailCount(WPARAM wParam, LPARAM lParam) INT_PTR CMsnProto::OnLeaveChat(WPARAM wParam,LPARAM lParam)
{
HANDLE hContact = (HANDLE)wParam;
- if (getByte(hContact, "ChatRoom", 0) != 0)
- {
+ if (isChatRoom(hContact) != 0) {
DBVARIANT dbv;
- if (getTString(hContact, "ChatRoomID", &dbv) == 0)
- {
+ if (getTString(hContact, "ChatRoomID", &dbv) == 0) {
MSN_KillChatSession(dbv.ptszVal);
db_free(&dbv);
}
|