diff options
Diffstat (limited to 'protocols/Sametime/src')
| -rw-r--r-- | protocols/Sametime/src/sametime_proto.cpp | 4 | ||||
| -rw-r--r-- | protocols/Sametime/src/sametime_session.cpp | 14 | ||||
| -rw-r--r-- | protocols/Sametime/src/userlist.cpp | 2 |
3 files changed, 9 insertions, 11 deletions
diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp index 27fbb51cf4..1e568c1a31 100644 --- a/protocols/Sametime/src/sametime_proto.cpp +++ b/protocols/Sametime/src/sametime_proto.cpp @@ -226,8 +226,6 @@ int CSametimeProto::SendMsg(MCONTACT hContact, int, const char* msg) debugLog(_T("CSametimeProto::SendMsg() hContact=[%x]"), hContact);
char *proto = GetContactProto(hContact);
- int ret;
-
if (!proto || mir_strcmp(proto, m_szModuleName) != 0 || db_get_w(hContact, m_szModuleName, "Status", ID_STATUS_OFFLINE) == ID_STATUS_OFFLINE) {
TFakeAckParams* tfap = (TFakeAckParams*)mir_alloc(sizeof(TFakeAckParams));
tfap->proto = this;
@@ -240,7 +238,7 @@ int CSametimeProto::SendMsg(MCONTACT hContact, int, const char* msg) if (!msg)
return 0;
- ret = (int)SendMessageToUser(hContact, msg);
+ int ret = (INT_PTR)SendMessageToUser(hContact, msg);
TFakeAckParams *tfap = (TFakeAckParams*)mir_alloc(sizeof(TFakeAckParams));
tfap->proto = this;
diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp index 74fede1541..abd9a0b508 100644 --- a/protocols/Sametime/src/sametime_session.cpp +++ b/protocols/Sametime/src/sametime_session.cpp @@ -106,9 +106,9 @@ void __cdecl SessionStateChange(mwSession* session, mwSessionState state, gpoint break;
case mwSession_STOPPING:
- if ((int)info) {// & ERR_FAILURE) {
- proto->showPopup((int)info);
- }
+ if ((INT_PTR)info)
+ proto->showPopup((INT_PTR)info);
+
proto->SessionStopping();
break;
@@ -475,8 +475,8 @@ WORD CSametimeProto::GetClientVersion() if (!session) return 0;
WORD retval = 0;
- retval = (int)mwSession_getProperty(session, mwSession_CLIENT_VER_MAJOR) << 8;
- retval |= (int)mwSession_getProperty(session, mwSession_CLIENT_VER_MINOR);
+ retval = (UINT_PTR)mwSession_getProperty(session, mwSession_CLIENT_VER_MAJOR) << 8;
+ retval |= (UINT_PTR)mwSession_getProperty(session, mwSession_CLIENT_VER_MINOR);
return retval;
}
@@ -485,8 +485,8 @@ WORD CSametimeProto::GetServerVersion() if (!session) return 0;
WORD retval = 0;
- retval = (int)mwSession_getProperty(session, mwSession_SERVER_VER_MAJOR) << 8;
- retval |= (int)mwSession_getProperty(session, mwSession_SERVER_VER_MINOR);
+ retval = (UINT_PTR)mwSession_getProperty(session, mwSession_SERVER_VER_MAJOR) << 8;
+ retval |= (UINT_PTR)mwSession_getProperty(session, mwSession_SERVER_VER_MINOR);
return retval;
}
diff --git a/protocols/Sametime/src/userlist.cpp b/protocols/Sametime/src/userlist.cpp index 6db619e1d5..eb4a67fecc 100644 --- a/protocols/Sametime/src/userlist.cpp +++ b/protocols/Sametime/src/userlist.cpp @@ -653,7 +653,7 @@ void CSametimeProto::UserRecvAwayMessage(MCONTACT hContact) void mwResolve_handler_callback(mwServiceResolve* srvc, guint32 id, guint32 code, GList* results, gpointer data)
{
CSametimeProto* proto = getProtoFromMwServiceResolve(srvc);
- BOOL advanced = (BOOL)data;
+ BOOL advanced = (INT_PTR)data;
MYCUSTOMSEARCHRESULTS mcsr;
memset(&mcsr, 0, sizeof(mcsr));
|