From a8a50f49bfb48bb3e4115e0d63f5c6ac8c095bf1 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 29 Jun 2013 12:26:30 +0000 Subject: option for ignoring empty status messages now used for xstatuses option checkbox moved to main popup page in nxsn git-svn-id: http://svn.miranda-ng.org/main/trunk@5178 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NewXstatusNotify/src/xstatus.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'plugins/NewXstatusNotify/src/xstatus.cpp') diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp index ea0acee828..6632802340 100644 --- a/plugins/NewXstatusNotify/src/xstatus.cpp +++ b/plugins/NewXstatusNotify/src/xstatus.cpp @@ -310,10 +310,13 @@ void ExtraStatusChanged(XSTATUSCHANGE *xsc) wsprintfA(buff, "%d", ID_STATUS_EXTRASTATUS); if (( db_get_b(0, MODULE, buff, 1) == 0) - || (db_get_w(xsc->hContact, xsc->szProto, "Status", ID_STATUS_OFFLINE) == ID_STATUS_OFFLINE) - || (!opt.HiddenContactsToo && db_get_b(xsc->hContact, "CList", "Hidden", 0)) - || (opt.TempDisabled)) - return; + || (db_get_w(xsc->hContact, xsc->szProto, "Status", ID_STATUS_OFFLINE) == ID_STATUS_OFFLINE) + || (!opt.HiddenContactsToo && db_get_b(xsc->hContact, "CList", "Hidden", 0)) + || (opt.TempDisabled) + || (opt.IgnoreEmpty && (xsc->stzTitle == NULL || xsc->stzTitle[0] == '\0') && (xsc->stzText == NULL || xsc->stzText[0] == '\0'))) { + FreeXSC(xsc); + return; + } char statusIDs[12], statusIDp[12]; if (opt.AutoDisable) { -- cgit v1.2.3