3 files changed, 8 insertions, 30 deletions
diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index 000043e8b6..b222fdc845 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -300,16 +300,9 @@ int CMimAPI::TypingMessage(WPARAM hContact, LPARAM mode)
 	if (mode) {
 		wchar_t szTip[256];
 		mir_snwprintf(szTip, TranslateT("%s is typing a message"), pcli->pfnGetContactDisplayName(hContact, 0));
-		if (fShowOnClist && ServiceExists(MS_CLIST_SYSTRAY_NOTIFY) && M.GetByte(SRMSGMOD, "ShowTypingBalloon", 0)) {
-			MIRANDASYSTRAYNOTIFY tn;
-			tn.szProto = NULL;
-			tn.cbSize = sizeof(tn);
-			tn.tszInfoTitle = TranslateT("Typing notification");
-			tn.tszInfo = szTip;
-			tn.dwInfoFlags = NIIF_INFO | NIIF_INTERN_UNICODE;
-			tn.uTimeout = 1000 * 4;
-			CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM)&tn);
-		}
+		if (fShowOnClist && M.GetByte(SRMSGMOD, "ShowTypingBalloon", 0))
+			Clist_TrayNotifyW(NULL, TranslateT("Typing notification"), szTip, NIIF_INFO, 1000 * 4);
+
 		if (fShowOnClist) {
 			pcli->pfnRemoveEvent(hContact, 1);
 
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index ddf7c16651..68bb2837a4 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -915,11 +915,6 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam
 		Utils::enableDlgControl(hwndDlg, IDC_TYPEFLASHWIN, IsDlgButtonChecked(hwndDlg, IDC_SHOWNOTIFY) != 0);
 		Utils::enableDlgControl(hwndDlg, IDC_MTN_POPUPMODE, IsDlgButtonChecked(hwndDlg, IDC_NOTIFYPOPUP) != 0);
 
-		if (!ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) {
-			Utils::enableDlgControl(hwndDlg, IDC_NOTIFYBALLOON, false);
-			SetDlgItemText(hwndDlg, IDC_NOTIFYBALLOON, TranslateT("Show balloon popup (unsupported system)"));
-		}
-
 		SendDlgItemMessage(hwndDlg, IDC_MTN_POPUPMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Always"));
 		SendDlgItemMessage(hwndDlg, IDC_MTN_POPUPMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Always, but no popup when window is focused"));
 		SendDlgItemMessage(hwndDlg, IDC_MTN_POPUPMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Only when no message window is open"));
diff --git a/plugins/TabSRMM/src/srmm.cpp b/plugins/TabSRMM/src/srmm.cpp
index 3f3cb18bb1..750f006ed3 100644
--- a/plugins/TabSRMM/src/srmm.cpp
+++ b/plugins/TabSRMM/src/srmm.cpp
@@ -150,20 +150,10 @@ int _DebugPopup(MCONTACT hContact, const wchar_t *fmt, ...)
 	va_start(va, fmt);
 	mir_vsnwprintf(debug, ibsize, fmt, va);
 
-	if (ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) {
-		MIRANDASYSTRAYNOTIFY tn;
-		wchar_t	szTitle[128];
-		mir_snwprintf(szTitle, TranslateT("TabSRMM message (%s)"),
-			(hContact != 0) ? pcli->pfnGetContactDisplayName(hContact, 0) : TranslateT("Global"));
-
-		tn.szProto = NULL;
-		tn.cbSize = sizeof(tn);
-		tn.tszInfoTitle = szTitle;
-		tn.tszInfo = debug;
-		tn.dwInfoFlags = NIIF_INFO;
-		tn.dwInfoFlags |= NIIF_INTERN_UNICODE;
-		tn.uTimeout = 1000 * 4;
-		CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM)&tn);
-	}
+	wchar_t	szTitle[128];
+	mir_snwprintf(szTitle, TranslateT("TabSRMM message (%s)"),
+		(hContact != 0) ? pcli->pfnGetContactDisplayName(hContact, 0) : TranslateT("Global"));
+
+	Clist_TrayNotifyW(NULL, szTitle, debug, NIIF_INFO, 1000 * 4);
 	return 0;
 }