diff options
Diffstat (limited to 'protocols/IRCG')
| -rw-r--r-- | protocols/IRCG/src/clist.cpp | 4 | ||||
| -rw-r--r-- | protocols/IRCG/src/commandmonitor.cpp | 2 | ||||
| -rw-r--r-- | protocols/IRCG/src/ircproto.cpp | 4 | ||||
| -rw-r--r-- | protocols/IRCG/src/services.cpp | 12 | ||||
| -rw-r--r-- | protocols/IRCG/src/userinfo.cpp | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/protocols/IRCG/src/clist.cpp b/protocols/IRCG/src/clist.cpp index 878faa9ec0..6c2a92de29 100644 --- a/protocols/IRCG/src/clist.cpp +++ b/protocols/IRCG/src/clist.cpp @@ -145,7 +145,7 @@ bool CIrcProto::CList_SetAllOffline(BYTE ChatsToo) DisconnectAllDCCSessions(false);
for (HANDLE hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {
- if ( getByte( hContact, "ChatRoom", 0 ))
+ if ( isChatRoom(hContact))
continue;
if ( getByte(hContact, "DCC", 0 ) != 0 ) {
@@ -179,7 +179,7 @@ HANDLE CIrcProto::CList_FindContact (CONTACT* user) DBVARIANT dbv5;
for (HANDLE hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {
- if ( getByte( hContact, "ChatRoom", 0))
+ if ( isChatRoom(hContact))
continue;
HANDLE hContact_temp = NULL;
diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp index 345a0ff0e8..6873bc918c 100644 --- a/protocols/IRCG/src/commandmonitor.cpp +++ b/protocols/IRCG/src/commandmonitor.cpp @@ -140,7 +140,7 @@ VOID CALLBACK OnlineNotifTimerProc( HWND, UINT, UINT_PTR idEvent, DWORD ) if ( name.IsEmpty() && name2.IsEmpty()) {
DBVARIANT dbv;
for (HANDLE hContact = db_find_first(ppro->m_szModuleName); hContact; hContact = db_find_next(hContact, ppro->m_szModuleName)) {
- if ( ppro->getByte(hContact, "ChatRoom", 0))
+ if ( ppro->isChatRoom(hContact))
continue;
BYTE bDCC = ppro->getByte(hContact, "DCC", 0);
diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index 24028adc45..c45baa3d88 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -660,7 +660,7 @@ HANDLE __cdecl CIrcProto::SendFile( HANDLE hContact, const TCHAR*, TCHAR** ppszF unsigned __int64 size = 0;
// do not send to channels :-P
- if ( getByte(hContact, "ChatRoom", 0) != 0)
+ if ( isChatRoom(hContact))
return 0;
// stop if it is an active type filetransfer and the user's IP is not known
@@ -955,7 +955,7 @@ HANDLE __cdecl CIrcProto::GetAwayMsg( HANDLE hContact ) DBVARIANT dbv;
// bypass chat contacts.
- if ( getByte( hContact, "ChatRoom", 0 ) == 0) {
+ if ( !isChatRoom(hContact)) {
if ( hContact && !getTString( hContact, "Nick", &dbv)) {
int i = getWord( hContact, "Status", ID_STATUS_OFFLINE );
if ( i != ID_STATUS_AWAY) {
diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index 7755fa84fb..e4a4b8800e 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -219,7 +219,7 @@ int __cdecl CIrcProto::OnContactDeleted(WPARAM wp, LPARAM) DBVARIANT dbv;
if ( !getTString( hContact, "Nick", &dbv )) {
- int type = getByte( hContact, "ChatRoom", 0 );
+ int type = getByte(hContact, "ChatRoom", 0);
if ( type != 0 ) {
GCEVENT gce = {0};
GCDEST gcd = {0};
@@ -330,16 +330,16 @@ INT_PTR __cdecl CIrcProto::OnMenuDisconnect(WPARAM wp, LPARAM) INT_PTR __cdecl CIrcProto::OnMenuIgnore(WPARAM wp, LPARAM)
{
- if ( !wp )
+ if (!wp)
return 0;
- HANDLE hContact = (HANDLE) wp;
+ HANDLE hContact = (HANDLE)wp;
DBVARIANT dbv;
- if ( !getTString( hContact, "Nick", &dbv )) {
- if ( getByte(( HANDLE )wp, "ChatRoom", 0) == 0 ) {
+ if ( !getTString(hContact, "Nick", &dbv )) {
+ if ( !isChatRoom(hContact)) {
char* host = NULL;
DBVARIANT dbv1;
- if ( !getString((HANDLE) wp, "Host", &dbv1))
+ if ( !getString(hContact, "Host", &dbv1))
host = dbv1.pszVal;
if ( host ) {
diff --git a/protocols/IRCG/src/userinfo.cpp b/protocols/IRCG/src/userinfo.cpp index ef79488499..46432e6166 100644 --- a/protocols/IRCG/src/userinfo.cpp +++ b/protocols/IRCG/src/userinfo.cpp @@ -193,7 +193,7 @@ int __cdecl CIrcProto::OnInitUserInfo(WPARAM wParam, LPARAM lParam) if ( !hContact || !szProto || lstrcmpiA( szProto, m_szModuleName ))
return 0;
- if ( getByte( hContact, "ChatRoom", 0) != 0 )
+ if ( isChatRoom(hContact))
return 0;
if ( getByte( hContact, "DCC", 0) != 0)
|