From d2528d31bac20ff2f7f41355cd398d929d83136a Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Mon, 10 Dec 2012 20:38:35 +0000 Subject: -fixed status message notification for hidden contacts (reported by Andrzej Aleksiejuk) -removed the deprecated & bizarre aliases git-svn-id: http://svn.miranda-ng.org/main/trunk@2715 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NewXstatusNotify/src/popup.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/NewXstatusNotify/src/popup.cpp') diff --git a/plugins/NewXstatusNotify/src/popup.cpp b/plugins/NewXstatusNotify/src/popup.cpp index 7d6f1d9672..1ddc5648e1 100644 --- a/plugins/NewXstatusNotify/src/popup.cpp +++ b/plugins/NewXstatusNotify/src/popup.cpp @@ -59,12 +59,12 @@ void ReceivedAwayMessage(HWND hWnd, LPARAM lParam, PLUGINDATA * pdp) DBVARIANT dbv; HANDLE hContact = PUGetContact(hWnd); - if ( DBGetContactSettingTString(hContact, MODULE, "LastPopupText", &dbv)) + if ( db_get_ts(hContact, MODULE, "LastPopupText", &dbv)) return; TCHAR stzText[MAX_SECONDLINE], *tszStatus = (TCHAR*)ack->lParam; _tcscpy(stzText, dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); if (tszStatus == NULL || *tszStatus == 0) return; @@ -83,7 +83,7 @@ void PopupAction(HWND hWnd, BYTE action) if (hContact && hContact != INVALID_HANDLE_VALUE) { switch (action) { case PCA_OPENMESSAGEWND: - CallServiceSync(ServiceExists("SRMsg/LaunchMessageWindow") ? "SRMsg/LaunchMessageWindow" : MS_MSG_SENDMESSAGE, (WPARAM)hContact, 0); + CallServiceSync(MS_MSG_SENDMESSAGET, (WPARAM)hContact, 0); break; case PCA_OPENMENU: @@ -115,7 +115,7 @@ void PopupAction(HWND hWnd, BYTE action) } } -INT_PTR CALLBACK PopupDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +LRESULT CALLBACK PopupDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { PLUGINDATA *pdp = NULL; -- cgit v1.2.3