diff options
| -rw-r--r-- | include/m_protosvc.h | 1 | ||||
| -rw-r--r-- | plugins/StatusManager/src/commonstatus.cpp | 6 | ||||
| -rw-r--r-- | protocols/CloudFile/src/cloud_file.cpp | 11 | ||||
| -rw-r--r-- | protocols/Facebook/src/groupchats.cpp | 2 |
4 files changed, 8 insertions, 12 deletions
diff --git a/include/m_protosvc.h b/include/m_protosvc.h index 8de3aae4f1..9b25141ef7 100644 --- a/include/m_protosvc.h +++ b/include/m_protosvc.h @@ -94,7 +94,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define PF2_HEAVYDND 0x00000020 // DND on ICQ
#define PF2_FREECHAT 0x00000040
#define PF2_IDLE 0x00000200
-#define PF2_NONE 0x10000000 // protocol has no statuses at all
///////////////////////////////////////////////////////////////////////////////
// the status modes that the protocol supports
diff --git a/plugins/StatusManager/src/commonstatus.cpp b/plugins/StatusManager/src/commonstatus.cpp index 7e83949b55..eaa5325616 100644 --- a/plugins/StatusManager/src/commonstatus.cpp +++ b/plugins/StatusManager/src/commonstatus.cpp @@ -298,8 +298,10 @@ static INT_PTR GetProtocolCountService(WPARAM, LPARAM) int GetStatusFlags(const char *szProto) { - int flags = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_2, 0) & ~CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_5, 0); - if (flags == 0) + auto f2 = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_2, 0); + auto f5 = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_5, 0); + int flags = f2 & ~f5; + if (flags == 0 && f5) flags = PF2_ONLINE; return flags; diff --git a/protocols/CloudFile/src/cloud_file.cpp b/protocols/CloudFile/src/cloud_file.cpp index 772b42ae36..f7079e980a 100644 --- a/protocols/CloudFile/src/cloud_file.cpp +++ b/protocols/CloudFile/src/cloud_file.cpp @@ -34,15 +34,10 @@ const wchar_t* CCloudService::GetUserName() const INT_PTR CCloudService::GetCaps(int type, MCONTACT) { - switch (type) { - case PFLAGNUM_1: + if (type == PFLAGNUM_1) return PF1_FILESEND; - case PFLAGNUM_2: - case PFLAGNUM_5: - return PF2_NONE; - default: - return 0; - } + + return 0; } int CCloudService::FileCancel(MCONTACT, HANDLE hTransfer) diff --git a/protocols/Facebook/src/groupchats.cpp b/protocols/Facebook/src/groupchats.cpp index f5644fa4c8..047bee95e1 100644 --- a/protocols/Facebook/src/groupchats.cpp +++ b/protocols/Facebook/src/groupchats.cpp @@ -42,7 +42,7 @@ class CGroupchatInviteDlg : public CFBDlgBase {
m_clc.SetHideEmptyGroups(1);
m_clc.SetHideOfflineRoot(1);
- m_clc.SetOfflineModes(PF2_NONE);
+ m_clc.SetOfflineModes(PF2_FREECHAT);
}
public:
|