diff options
| -rw-r--r-- | include/m_contacts.h | 3 | ||||
| -rw-r--r-- | libs/win32/mir_app.lib | bin | 305124 -> 305118 bytes | |||
| -rw-r--r-- | libs/win64/mir_app.lib | bin | 305284 -> 305280 bytes | |||
| -rw-r--r-- | src/mir_app/src/clistcontacts.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 2 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 2 |
6 files changed, 6 insertions, 5 deletions
diff --git a/include/m_contacts.h b/include/m_contacts.h index f2fc4fa665..44c88e2088 100644 --- a/include/m_contacts.h +++ b/include/m_contacts.h @@ -86,8 +86,9 @@ namespace Contact /////////////////////////////////////////////////////////////////////////////////////////
// if contact is a group chat
+ // returns GCW_* constant or 0 if it's not a group chat
- MIR_APP_DLL(bool) IsGroupChat(MCONTACT hContact, const char *szProto = nullptr);
+ MIR_APP_DLL(int) IsGroupChat(MCONTACT hContact, const char *szProto = nullptr);
/////////////////////////////////////////////////////////////////////////////////////////
// gets / sets hidden status for a contact
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib Binary files differindex 73fae5f870..2a2f5ed41c 100644 --- a/libs/win32/mir_app.lib +++ b/libs/win32/mir_app.lib diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib Binary files differindex cd509ba0f1..287dc169d4 100644 --- a/libs/win64/mir_app.lib +++ b/libs/win64/mir_app.lib diff --git a/src/mir_app/src/clistcontacts.cpp b/src/mir_app/src/clistcontacts.cpp index 77fefe36af..20ea6e2c59 100644 --- a/src/mir_app/src/clistcontacts.cpp +++ b/src/mir_app/src/clistcontacts.cpp @@ -285,7 +285,7 @@ MIR_APP_DLL(int) Contact::GetStatus(MCONTACT hContact) /////////////////////////////////////////////////////////////////////////////// -MIR_APP_DLL(bool) Contact::IsGroupChat(MCONTACT hContact, const char *szProto) +MIR_APP_DLL(int) Contact::IsGroupChat(MCONTACT hContact, const char *szProto) { if (szProto == nullptr) { szProto = Proto_GetBaseAccountName(hContact); @@ -293,7 +293,7 @@ MIR_APP_DLL(bool) Contact::IsGroupChat(MCONTACT hContact, const char *szProto) return false; } - return db_get_b(hContact, szProto, "ChatRoom") != 0; + return db_get_b(hContact, szProto, "ChatRoom"); } MIR_APP_DLL(void) Contact::SetBirthday(MCONTACT hContact, int dd, int mm, int yy) diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 89af16101b..42abcbbee4 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -761,7 +761,7 @@ Srmm_CreateHotkey @886 NONAME ??_7CUserInfoPageDlg@@6B@ @891 NONAME
?OnRefresh@CUserInfoPageDlg@@UAE_NXZ @892 NONAME
?SetContact@CUserInfoPageDlg@@QAEXI@Z @893 NONAME
-?IsGroupChat@Contact@@YG_NIPBD@Z @894 NONAME
+?IsGroupChat@Contact@@YGHIPBD@Z @894 NONAME
?IsEmpty@CUserInfoPageDlg@@UBE_NXZ @895 NONAME
?bContactStatusFirst@Chat@@3V?$CMOption@_N@@A @896 NONAME
?bDoubleClick4Privat@Chat@@3V?$CMOption@_N@@A @897 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index de406afb92..a4bc7159cc 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -761,7 +761,7 @@ Srmm_CreateHotkey @886 NONAME ??_7CUserInfoPageDlg@@6B@ @891 NONAME
?OnRefresh@CUserInfoPageDlg@@UEAA_NXZ @892 NONAME
?SetContact@CUserInfoPageDlg@@QEAAXI@Z @893 NONAME
-?IsGroupChat@Contact@@YA_NIPEBD@Z @894 NONAME
+?IsGroupChat@Contact@@YAHIPEBD@Z @894 NONAME
?IsEmpty@CUserInfoPageDlg@@UEBA_NXZ @895 NONAME
?bContactStatusFirst@Chat@@3V?$CMOption@_N@@A @896 NONAME
?bDoubleClick4Privat@Chat@@3V?$CMOption@_N@@A @897 NONAME
|