From 920aa970afa086a3a143b39005747210b94f237b Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 7 Apr 2013 20:25:38 +0000
Subject: Trigger plugin's support removed, cause this plugin is dead

git-svn-id: http://svn.miranda-ng.org/main/trunk@4374 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Variables/src/action_variables.cpp    | 155 -----------------
 plugins/Variables/src/condition_variables.cpp | 127 --------------
 plugins/Variables/src/main.cpp                |  12 --
 plugins/Variables/src/trigger_variables.cpp   | 228 --------------------------
 plugins/Variables/src/trigger_variables.h     |  37 -----
 plugins/Variables/src/variables.h             |   4 -
 6 files changed, 563 deletions(-)
 delete mode 100644 plugins/Variables/src/action_variables.cpp
 delete mode 100644 plugins/Variables/src/condition_variables.cpp
 delete mode 100644 plugins/Variables/src/trigger_variables.cpp
 delete mode 100644 plugins/Variables/src/trigger_variables.h

(limited to 'plugins/Variables/src')

diff --git a/plugins/Variables/src/action_variables.cpp b/plugins/Variables/src/action_variables.cpp
deleted file mode 100644
index deb9a1b3fb..0000000000
--- a/plugins/Variables/src/action_variables.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-    Variables Plugin for Miranda-IM (www.miranda-im.org)
-    Copyright 2003-2006 P. Boon
-
-    This program is mir_free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-// This file has not been converted to unicode yet
-
-#include "variables.h"
-
-static void parseStringThread(void *arg) {
-
-	TCHAR *tszParsed;
-	FORMATINFO *fi;
-
-	fi = (FORMATINFO *)arg;
-	if (arg == NULL) {
-		return;
-	}
-	tszParsed = (TCHAR*)CallService(MS_VARS_FORMATSTRING, (WPARAM)fi, 0);
-	log_debugA("parseStringThread: %s > %s", fi->tszFormat, tszParsed);
-	if (tszParsed != NULL) {
-		mir_free(tszParsed);
-	}
-	if (fi->tszFormat != NULL) {
-		mir_free(fi->tszFormat);
-	}
-	if (fi->tszExtraText != NULL) {
-		mir_free(fi->tszExtraText);
-	}
-	mir_free(fi);
-}
-
-
-int ParseStringAction(DWORD actionID, REPORTINFO *ri) {
-
-	if (ri->flags&ACT_PERFORM) {
-		DBVARIANT dbv;
-
-		if (!DBGetActionSettingTString(actionID, NULL, MODULENAME, SETTING_PARSESTRING, &dbv)) {
-			if (DBGetActionSettingByte(actionID, NULL, MODULENAME, SETTING_PARSEASYNC, 0)) {
-				FORMATINFO *fi;
-				
-				fi = ( FORMATINFO* )mir_alloc(sizeof(FORMATINFO));
-				ZeroMemory(fi, sizeof(FORMATINFO));
-				fi->cbSize = sizeof(FORMATINFO);
-				fi->tszFormat = mir_tstrdup(dbv.ptszVal);
-				fi->tszExtraText = ((ri->td!=NULL)&&(ri->td->dFlags&DF_TEXT))?mir_tstrdup(ri->td->tszText):NULL;
-				fi->hContact = ((ri->td!=NULL)&&(ri->td->dFlags&DF_CONTACT))?ri->td->hContact:NULL;
-				fi->flags |= FIF_TCHAR;
-				//forkthread(parseStringThread, 0, fi);
-				mir_forkthread(parseStringThread, fi);
-			}
-			else {
-				mir_free(variables_parsedup(dbv.ptszVal, ((ri->td!=NULL)&&(ri->td->dFlags&DF_TEXT))?ri->td->tszText:NULL, ((ri->td!=NULL)&&(ri->td->dFlags&DF_CONTACT))?ri->td->hContact:NULL));
-			}
-			db_free(&dbv);
-		}
-	}
-	if (ri->flags&ACT_CLEANUP) {
-		REMOVETRIGGERSETTINGS ras;
-
-		ras.cbSize = sizeof(REMOVETRIGGERSETTINGS);
-		ras.prefix = PREFIX_ACTIONID;
-		ras.id = actionID;
-		ras.szModule = MODULENAME;
-		ras.hContact = NULL;
-		CallService(MS_TRIGGER_REMOVESETTINGS, 0, (LPARAM)&ras);
-	}
-	
-	return 0;
-}
-
-INT_PTR CALLBACK DlgProcOptsParseString(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
-
-    switch (msg) {
-	case WM_INITDIALOG: {
-		DBVARIANT dbv;
-		DWORD actionID;
-		
-		TranslateDialogDefault(hwndDlg);
-		actionID = (DWORD)lParam;
-		if (!DBGetActionSettingTString(actionID, NULL, MODULENAME, SETTING_PARSESTRING, &dbv)) {
-			SetDlgItemText(hwndDlg, IDC_PARSESTRING, dbv.ptszVal);
-			db_free(&dbv);
-		}
-		CheckDlgButton(hwndDlg, IDC_PARSEASYNC, DBGetActionSettingByte(actionID, NULL, MODULENAME, SETTING_PARSEASYNC, 0)?BST_CHECKED:BST_UNCHECKED);
-		variables_skin_helpbutton(hwndDlg, IDC_SHOWHELP);
-        break;
-						}
-
-	case WM_COMMAND:
-		switch(LOWORD(wParam)) {
-		case IDC_SHOWHELP: {
-			int flags;
-			VARHELPINFO vhi;
-			TRIGGERINFO ti;
-
-			ZeroMemory(&ti, sizeof(TRIGGERINFO));
-			SendMessage(GetParent(hwndDlg), TM_GETTRIGGERINFO, 0, (LPARAM)&ti);
-			ZeroMemory(&vhi, sizeof(VARHELPINFO));
-			vhi.cbSize = sizeof(VARHELPINFO);
-			vhi.flags = VHF_INPUT;
-			if (ti.dFlags&DF_TEXT) {
-				vhi.flags |= VHF_EXTRATEXT;
-				vhi.szExtraTextDesc = "TriggerData: Text";
-			}
-			else {
-				flags |= VHF_HIDESUBJECTTOKEN;
-			}
-			if (ti.dFlags&DF_CONTACT) {
-				flags |= VHF_SUBJECT;
-				vhi.szSubjectDesc = "TriggerData: Contact";
-			}
-			else {
-				flags |= VHF_HIDEEXTRATEXTTOKEN;
-			}
-			vhi.hwndCtrl = GetDlgItem(hwndDlg, IDC_PARSESTRING);
-			CallService(MS_VARS_SHOWHELPEX, (WPARAM)hwndDlg, (LPARAM)&vhi);
-			break;		
-					   }
-		}
-		break;
-
-	case TM_ADDACTION: {
-		// wParam = action ID
-		// lParam = 0
-		DWORD actionID = (DWORD)wParam;
-		TCHAR *tszText = Hlp_GetDlgItemText(hwndDlg, IDC_PARSESTRING);
-		if (tszText != NULL) {
-			DBWriteActionSettingTString(actionID, NULL, MODULENAME, SETTING_PARSESTRING, tszText);
-			mir_free(tszText);
-		}
-		DBWriteActionSettingByte(actionID, NULL, MODULENAME, SETTING_PARSEASYNC, (BYTE)IsDlgButtonChecked(hwndDlg, IDC_PARSEASYNC));
-		break;
-					   }
-
-	case WM_DESTROY:
-		break;
-	}
-
-	return FALSE;
-}
\ No newline at end of file
diff --git a/plugins/Variables/src/condition_variables.cpp b/plugins/Variables/src/condition_variables.cpp
deleted file mode 100644
index 964e34bec7..0000000000
--- a/plugins/Variables/src/condition_variables.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-    Variables Plugin for Miranda-IM (www.miranda-im.org)
-    Copyright 2003-2006 P. Boon
-
-    This program is mir_free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-// This file has not been converted to unicode yet
-
-#include "variables.h"
-
-int ParseStringCondition(DWORD conditionID, REPORTINFO *ri) {
-
-	int res;
-
-	res = CRV_TRUE;
-	if (ri->flags&CND_PERFORM) {
-		DBVARIANT dbv;
-
-		if (!DBGetConditionSettingTString(conditionID, NULL, MODULENAME, SETTING_PARSESTRING, &dbv)) {
-			FORMATINFO fi;
-
-			ZeroMemory(&fi, sizeof(FORMATINFO));
-			fi.cbSize = sizeof(FORMATINFO);
-			fi.tszFormat = dbv.ptszVal;
-			fi.tszExtraText = ((ri->td!=NULL)&&(ri->td->dFlags&DF_TEXT))?ri->td->tszText:NULL;
-			fi.hContact = ((ri->td!=NULL)&&(ri->td->dFlags&DF_CONTACT))?ri->td->hContact:NULL;
-			fi.flags |= FIF_TCHAR;
-			mir_free((TCHAR*)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0));
-			log_debugA("err: %d", fi.eCount);
-			res = fi.eCount==0?CRV_TRUE:CRV_FALSE;
-			db_free(&dbv);
-		}
-	}
-	if (ri->flags&CND_CLEANUP) {
-		REMOVETRIGGERSETTINGS ras;
-
-		ras.cbSize = sizeof(REMOVETRIGGERSETTINGS);
-		ras.prefix = PREFIX_CONDITIONID;
-		ras.id = conditionID;
-		ras.szModule = MODULENAME;
-		ras.hContact = NULL;
-		CallService(MS_TRIGGER_REMOVESETTINGS, 0, (LPARAM)&ras);
-	}
-	
-	return res;
-}
-
-INT_PTR CALLBACK DlgProcOptsCondition(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
-
-    switch (msg) {
-	case WM_INITDIALOG: {
-		DBVARIANT dbv;
-		DWORD conditionID;
-		
-		TranslateDialogDefault(hwndDlg);
-		conditionID = (DWORD)lParam;
-		if (!DBGetConditionSettingTString(conditionID, NULL, MODULENAME, SETTING_PARSESTRING, &dbv)) {
-			SetDlgItemText(hwndDlg, IDC_PARSESTRING, dbv.ptszVal);
-			db_free(&dbv);
-		}
-        break;
-						}
-
-	case WM_COMMAND:
-		switch(LOWORD(wParam)) {
-		case IDC_SHOWHELP: {
-			int flags;
-			VARHELPINFO vhi;
-			TRIGGERINFO ti;
-
-			ZeroMemory(&vhi, sizeof(VARHELPINFO));
-			vhi.cbSize = sizeof(VARHELPINFO);
-			ZeroMemory(&ti, sizeof(TRIGGERINFO));
-			SendMessage(GetParent(hwndDlg), TM_GETTRIGGERINFO, 0, (LPARAM)&ti);
-			vhi.flags = VHF_INPUT;
-			if (ti.dFlags&DF_TEXT) {
-				vhi.flags |= VHF_EXTRATEXT;
-				vhi.szExtraTextDesc = "TriggerData: Text";
-			}
-			else {
-				flags |= VHF_HIDEEXTRATEXTTOKEN;
-			}
-			if (ti.dFlags&DF_CONTACT) {
-				flags |= VHF_SUBJECT;
-				vhi.szSubjectDesc = "TriggerData: Contact";
-			}
-			else {
-				flags |= VHF_HIDESUBJECTTOKEN;
-			}
-			vhi.hwndCtrl = GetDlgItem(hwndDlg, IDC_PARSESTRING);
-			CallService(MS_VARS_SHOWHELPEX, (WPARAM)hwndDlg, (LPARAM)&vhi);
-			break;		
-					   }
-		}
-		break;
-
-	case TM_ADDCONDITION: {
-		DWORD conditionID;
-		TCHAR *tszText;
-
-		conditionID = (DWORD)wParam;
-		tszText = Hlp_GetDlgItemText(hwndDlg, IDC_PARSESTRING);
-		if (tszText != NULL) {
-			DBWriteConditionSettingTString(conditionID, NULL, MODULENAME, SETTING_PARSESTRING, tszText);
-			mir_free(tszText);
-		}
-		break;
-					   }
-
-	case WM_DESTROY:
-		break;
-	}
-
-	return FALSE;
-}
\ No newline at end of file
diff --git a/plugins/Variables/src/main.cpp b/plugins/Variables/src/main.cpp
index b107d12023..1df2b3ac41 100644
--- a/plugins/Variables/src/main.cpp
+++ b/plugins/Variables/src/main.cpp
@@ -23,16 +23,6 @@ HINSTANCE hInst;
 DWORD g_mirandaVersion;
 int hLangpack = 0;
 
-static int ModulesLoaded(WPARAM wParam, LPARAM lParam)
-{
-	// trigger plugin
-#if !defined(WINE)
-	initTriggerModule();
-#endif
-
-	return 0;
-}
-
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
 	hInst = hinstDLL;
@@ -69,9 +59,7 @@ extern "C" int __declspec(dllexport) Load(void)
 {
 	mir_getLP( &pluginInfoEx );
 
-	HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);
 	LoadVarModule();
-		
 	return 0;
 }
 
diff --git a/plugins/Variables/src/trigger_variables.cpp b/plugins/Variables/src/trigger_variables.cpp
deleted file mode 100644
index 75920eb453..0000000000
--- a/plugins/Variables/src/trigger_variables.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
-    Variables Plugin for Miranda-IM (www.miranda-im.org)
-    Copyright 2003-2006 P. Boon
-
-    This program is mir_free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#include "variables.h"
-
-static TRG_VAR_CACHE *tvc = NULL;
-static int tvcCount = 0;
-static unsigned int stringChangeTimerID = 0;
-
-static int addToCache(DWORD triggerID)
-{
-	/* triggerID must be in the DB */
-	DBVARIANT dbv;
-
-	for (int i=0; i < tvcCount; i++) {
-		if (tvc[i].triggerID == triggerID) {
-			mir_free(tvc[i].parsedText);
-			MoveMemory(&tvc[i], &tvc[tvcCount-1], sizeof(TRG_VAR_CACHE));
-			tvcCount -= 1;
-		}
-	}
-	if ( DBGetTriggerSettingTString(triggerID, NULL, MODULENAME, SETTING_TRIGGERTEXT, &dbv))
-		return -1;
-
-	tvc = ( TRG_VAR_CACHE* )mir_realloc(tvc, (tvcCount+1)*sizeof(TRG_VAR_CACHE));
-	if (tvc == NULL)
-		return -1;
-
-	tvc[tvcCount].triggerID = triggerID;
-	tvc[tvcCount].parsedText = variables_parsedup(dbv.ptszVal, NULL, NULL);
-	// it stays in our own mem space!
-	if (tvc[tvcCount].parsedText == NULL)
-		return -1;
-
-	tvcCount += 1;
-	db_free(&dbv);
-	return 0;
-}
-
-static int removeFromCache(DWORD triggerID) {
-
-	int i;
-
-	for (i=0;i<tvcCount;i++) {
-		if (tvc[i].triggerID == triggerID) {
-			mir_free(tvc[i].parsedText);
-			MoveMemory(&tvc[i], &tvc[tvcCount-1], sizeof(TRG_VAR_CACHE));
-			tvcCount -= 1;
-		}
-	}
-	
-	return 0;
-}
-
-static VOID CALLBACK checkStringsTimer(HWND hwnd,UINT message,UINT_PTR idEvent,DWORD dwTime)
-{
-	DWORD triggerID = 0;
-	do {
-		triggerID = (DWORD)CallService(MS_TRIGGER_FINDNEXTTRIGGERID, triggerID, (LPARAM)TRIGGERNAME);
-		if (triggerID == 0) {
-			continue;
-		}
-		for (int i=0; i < tvcCount; i++) {
-			if (triggerID != tvc[i].triggerID)
-				continue;
-
-			DBVARIANT dbv;
-			if (!DBGetTriggerSettingTString(tvc[i].triggerID, NULL, MODULENAME, SETTING_TRIGGERTEXT, &dbv)) {
-				TCHAR *parsedText = variables_parsedup(dbv.ptszVal, NULL, NULL);
-				if (parsedText == NULL)
-					continue;
-
-				if (!_tcscmp(tvc[i].parsedText, parsedText)) {
-					mir_free(parsedText);
-					continue;
-				}
-
-				TRIGGERDATA td = { 0 };
-				td.cbSize = sizeof(td);
-				td.dFlags = DF_TEXT;
-				td.tszText = parsedText;
-					
-				REPORTINFO ri = { 0 };
-				ri.cbSize = sizeof(REPORTINFO);
-				ri.triggerID = tvc[i].triggerID;
-				ri.pszName = TRIGGERNAME;
-				ri.flags = TRG_PERFORM;
-				ri.td = &td;
-					
-				CallService(MS_TRIGGER_REPORTEVENT, 0, (LPARAM)&ri);
-				mir_free(tvc[i].parsedText);
-				tvc[i].parsedText = parsedText;
-				db_free(&dbv);
-			}
-		}
-	}
-		while (triggerID != 0);
-}
-
-INT_PTR CALLBACK DlgProcOptsStringChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {
-
-    switch (msg) {
-	case WM_INITDIALOG: 
-		TranslateDialogDefault(hwndDlg);
-		{
-			DBVARIANT dbv;
-			DWORD triggerID;
-
-			triggerID = (DWORD)lParam;
-			if (!DBGetTriggerSetting(triggerID, NULL, MODULENAME, SETTING_TRIGGERTEXT, &dbv)) {
-				SetDlgItemTextA(hwndDlg, IDC_FORMATTEXT, dbv.pszVal);
-				db_free(&dbv);
-			}
-			variables_skin_helpbutton(hwndDlg, IDC_SHOWHELP);
-		}
-		break;
-
-	case WM_COMMAND:
-		switch (LOWORD(wParam)) {
-		case IDC_SHOWHELP:
-			variables_showhelp(hwndDlg, IDC_FORMATTEXT, VHF_FULLDLG|VHF_SETLASTSUBJECT, NULL, NULL);
-			break;
-		}
-		break;
-
-	case TM_ADDTRIGGER:
-		// wParam = trigger ID
-		// lParam = (TRIGGERREGISTER *)
-		{
-			DWORD triggerID = (DWORD)wParam;
-			TCHAR *tszFormatText = Hlp_GetDlgItemText(hwndDlg, IDC_FORMATTEXT);
-			if (tszFormatText != NULL) {
-				DBWriteTriggerSettingTString(triggerID, NULL, MODULENAME, SETTING_TRIGGERTEXT, tszFormatText);
-				mir_free(tszFormatText);
-			}
-			addToCache(triggerID);
-		}
-		break;
-	
-	case TM_DELTRIGGER:
-		// wParam = triggerID
-		// lParam = (TRIGGEREGISTER *) may be 0
-		{
-			REMOVETRIGGERSETTINGS rts;
-
-			DWORD triggerID = (DWORD)wParam;
-			removeFromCache(triggerID);
-			rts.cbSize = sizeof(REMOVETRIGGERSETTINGS);
-			rts.prefix = PREFIX_TRIGGERID;
-			rts.id = triggerID;
-			rts.hContact = NULL;
-			rts.szModule = MODULENAME;
-			CallService(MS_TRIGGER_REMOVESETTINGS, 0, (LPARAM)&rts);
-		}
-		break;
-	}
-
-	return FALSE;
-}
-
-int initTriggerModule()
-{
-	log_debugA("Variables: initTriggerModule");
-	if (!ServiceExists(MS_TRIGGER_REGISTERTRIGGER)) {
-		log_debugA("Variables: %s does not exist", MS_TRIGGER_REGISTERTRIGGER);
-		return -1;
-	}
-
-	TRIGGERREGISTER tr = { 0 };
-	tr.cbSize = sizeof(tr);
-	tr.pszName = TRIGGERNAME;
-	tr.hInstance = hInst;
-	tr.pfnDlgProc = DlgProcOptsStringChange;
-	tr.pszTemplate = MAKEINTRESOURCEA(IDD_TRG_STRINGCHANGE);
-	tr.dFlags = DF_TEXT|DF_TCHAR;
-	int res = CallService(MS_TRIGGER_REGISTERTRIGGER, 0, (LPARAM)&tr);
-	log_debugA("Variables: %s registered (%d)", TRIGGERNAME, res);
-
-	ACTIONREGISTER ar = { 0 };
-	ar.cbSize = sizeof(ACTIONREGISTER);
-	ar.pszName = "Variables: Parse string";
-	ar.hInstance = hInst;
-	ar.pfnDlgProc = DlgProcOptsParseString;
-	ar.pszTemplate = MAKEINTRESOURCEA(IDD_ACT_PARSESTRING);
-	ar.actionFunction = ParseStringAction;
-	ar.flags = ARF_FUNCTION|ARF_TCHAR;
-	CallService(MS_TRIGGER_REGISTERACTION, 0, (LPARAM)&ar);
-
-	CONDITIONREGISTER cr = { 0 };
-	cr.cbSize = sizeof(CONDITIONREGISTER);
-	cr.pszName = "Variables: Condition";
-	cr.hInstance = hInst;
-	cr.pfnDlgProc = DlgProcOptsCondition;
-	cr.pszTemplate = MAKEINTRESOURCEA(IDD_CND_PARSESTRING);
-	cr.conditionFunction = ParseStringCondition;
-	cr.flags = CRF_FUNCTION|CRF_TCHAR;
-	CallService(MS_TRIGGER_REGISTERCONDITION, 0, (LPARAM)&cr);
-
-	// fill cache
-	DWORD triggerID = 0;
-	do {
-		triggerID = (DWORD)CallService(MS_TRIGGER_FINDNEXTTRIGGERID, triggerID, (LPARAM)TRIGGERNAME);
-		if (triggerID == 0) {
-			continue;
-		}
-		addToCache(triggerID);
-	} 
-		while (triggerID != 0);
-	
-	stringChangeTimerID = SetTimer(NULL, 0, CHECKSTRINGDELAY, checkStringsTimer);
-	return res;
-}
diff --git a/plugins/Variables/src/trigger_variables.h b/plugins/Variables/src/trigger_variables.h
deleted file mode 100644
index 6ebea2fbe3..0000000000
--- a/plugins/Variables/src/trigger_variables.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-    Variables Plugin for Miranda-IM (www.miranda-im.org)
-    Copyright 2003-2006 P. Boon
-
-    This program is mir_free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#define TRIGGERNAME		"Variables: String changed"
-#define SETTING_TRIGGERTEXT		"trigger_TriggerText"
-#define CHECKSTRINGDELAY	5000
-
-typedef struct {
-	DWORD triggerID;
-	TCHAR *parsedText;
-} TRG_VAR_CACHE;
-
-
-#define SETTING_PARSESTRING		"action_ParseString"
-#define SETTING_PARSEASYNC		"action_ParseAsync"
-
-int ParseStringAction(DWORD actionID, REPORTINFO *ri);
-INT_PTR CALLBACK DlgProcOptsParseString(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-
-int ParseStringCondition(DWORD actionID, REPORTINFO *ri);
-INT_PTR CALLBACK DlgProcOptsCondition(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
\ No newline at end of file
diff --git a/plugins/Variables/src/variables.h b/plugins/Variables/src/variables.h
index 533bc8ae98..bd92fa74cb 100644
--- a/plugins/Variables/src/variables.h
+++ b/plugins/Variables/src/variables.h
@@ -42,7 +42,6 @@
 #include <m_clc.h>
 
 #include <m_variables.h>
-#include <m_trigger.h>
 #include <m_metacontacts.h>
 
 #include "..\helpers\gen_helpers.h"
@@ -64,7 +63,6 @@
 #include "resource.h"
 #include "version.h"
 #include "contact.h"
-#include "trigger_variables.h"
 #include "enumprocs.h"
 #include "parse_alias.h"
 #include "parse_external.h"
@@ -196,8 +194,6 @@ int  registerRegExpTokens();
 int  registerInetTokens();
 // xml
 int  registerXsltTokens();
-// trigger
-int  initTriggerModule();
 // help
 INT_PTR  showHelpService(WPARAM wParam, LPARAM lParam);
 INT_PTR  showHelpExService(WPARAM wParam, LPARAM lParam);
-- 
cgit v1.2.3