summaryrefslogtreecommitdiff
path: root/plugins/TabSRMM/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/TabSRMM/src')
-rw-r--r--plugins/TabSRMM/src/commonheaders.h2
-rw-r--r--plugins/TabSRMM/src/msgdlgutils.cpp12
2 files changed, 8 insertions, 6 deletions
diff --git a/plugins/TabSRMM/src/commonheaders.h b/plugins/TabSRMM/src/commonheaders.h
index 36ba7e241e..46b1d5b50f 100644
--- a/plugins/TabSRMM/src/commonheaders.h
+++ b/plugins/TabSRMM/src/commonheaders.h
@@ -30,7 +30,6 @@
*
*/
-
#ifndef __COMMONHEADERS_H
#define __COMMONHEADERS_H
@@ -86,6 +85,7 @@
#include <m_popup.h>
#include <m_timezones.h>
#include <m_modernopt.h>
+#include <m_xstatus.h>
#include <m_ieview.h>
#include <m_popup2.h>
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index 2f25a63a10..9f5385688b 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -2141,14 +2141,16 @@ void TSAPI ConfigureSmileyButton(TWindowData *dat)
HICON TSAPI GetXStatusIcon(const TWindowData *dat)
{
- char szServiceName[128];
BYTE xStatus = dat->cache->getXStatusId();
+ if (xStatus == 0)
+ return NULL;
- mir_snprintf(szServiceName, 128, "%s/GetXStatusIcon", dat->cache->getActiveProto());
+ char szServiceName[128];
+ mir_snprintf(szServiceName, 128, "%s%s", dat->cache->getActiveProto(), PS_GETCUSTOMSTATUSICON);
+ if ( !ServiceExists(szServiceName))
+ return NULL;
- if ( ServiceExists(szServiceName))
- return (HICON)(CallProtoService(dat->cache->getActiveProto(), "/GetXStatusIcon", xStatus, 0));
- return 0;
+ return (HICON)(CallProtoService(dat->cache->getActiveProto(), PS_GETCUSTOMSTATUSICON, xStatus, 0));
}
LRESULT TSAPI GetSendButtonState(HWND hwnd)