summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsje <sje@4f64403b-2f21-0410-a795-97e2b3489a10>2007-06-18 13:45:19 +0000
committersje <sje@4f64403b-2f21-0410-a795-97e2b3489a10>2007-06-18 13:45:19 +0000
commit274074928c2ea794fd88c8f25c041852aabe66c2 (patch)
treece8b2d6f7f9b0bc7d47be44d44625bd7394db8f2
parent30d7e221818b5646e018489342fa577073e42948 (diff)
patch by goerge :)
git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@205 4f64403b-2f21-0410-a795-97e2b3489a10
-rw-r--r--tipper/subst.cpp21
-rw-r--r--tipper/tipper.mdsp6
-rw-r--r--tipper/version.h2
3 files changed, 18 insertions, 11 deletions
diff --git a/tipper/subst.cpp b/tipper/subst.cpp
index 58bb5c4..aeed3ac 100644
--- a/tipper/subst.cpp
+++ b/tipper/subst.cpp
@@ -139,13 +139,19 @@ TCHAR *GetLastMessageText(HANDLE hContact) {
if(dbei.cbBlob == 0 || dbei.pBlob == 0) return 0;
TCHAR *msg = 0;
- unsigned int msglen = strlen((char *)dbei.pBlob) + 1;
-
- // does blob contain unicode message?
- if(msglen < dbei.cbBlob) {
- msg = w2t((wchar_t *)(&dbei.pBlob[msglen]));
- } else {
- msg = a2t((char *)dbei.pBlob);
+ if ( ServiceExists( MS_DB_EVENT_GETTEXT )) {
+ TCHAR *buf = DbGetEventTextT( &dbei, CP_ACP );
+ msg = _tcsdup( buf );
+ mir_free( buf );
+ }
+ else {
+ unsigned int msglen = strlen((char *)dbei.pBlob) + 1;
+
+ // does blob contain unicode message?
+ if(msglen < dbei.cbBlob)
+ msg = w2t((wchar_t *)(&dbei.pBlob[msglen]));
+ else
+ msg = a2t((char *)dbei.pBlob);
}
StripBBCodesInPlace(msg);
@@ -444,3 +450,4 @@ bool GetValueText(HANDLE hContact, const DisplayItem &di, TCHAR *buff, int buffl
}
+
diff --git a/tipper/tipper.mdsp b/tipper/tipper.mdsp
index aa71f20..a5ec0e2 100644
--- a/tipper/tipper.mdsp
+++ b/tipper/tipper.mdsp
@@ -104,8 +104,8 @@ extraResourceOptions=
1=resource.rc
[Other]
[History]
-version.h,586
-popwin.cpp,2562
+version.h,555
+popwin.cpp,2560
tipper.cpp,1265
message_pump.cpp,4377
-m_tipper.h,1664
+m_tipper.h,694
diff --git a/tipper/version.h b/tipper/version.h
index 97019e6..31f0f07 100644
--- a/tipper/version.h
+++ b/tipper/version.h
@@ -4,7 +4,7 @@
#define __MAJOR_VERSION 0
#define __MINOR_VERSION 4
#define __RELEASE_NUM 0
-#define __BUILD_NUM 4
+#define __BUILD_NUM 5
#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
#define __FILEVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM