From 0ca37041442b35763a3761aad47965a2c119f932 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sun, 6 Jan 2013 18:42:52 +0200 Subject: merged with miranda_ng main repo --- init.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'init.cpp') diff --git a/init.cpp b/init.cpp index 7a785a7..391167e 100755 --- a/init.cpp +++ b/init.cpp @@ -17,13 +17,14 @@ #include "commonheaders.h" //global variables -bool bAppendTags = false, bDebugLog = false, bJabberAPI = false, bPresenceSigning = false, bIsMiranda09 = false, bMetaContacts = false, bFileTransfers = false, bAutoExchange = false, bStripTags = false, tabsrmm_used = false; +bool bAppendTags = false, bDebugLog = false, bJabberAPI = false, bPresenceSigning = false, bIsMiranda09 = false, bMetaContacts = false, bFileTransfers = false, bSameAction = false, bAutoExchange = false, bStripTags = false, tabsrmm_used = false; TCHAR *inopentag = NULL, *inclosetag = NULL, *outopentag = NULL, *outclosetag = NULL, *password = NULL; int hLangpack = 0; list Accounts; HINSTANCE hInst; +HFONT bold_font = NULL; HANDLE hLoadPubKey = NULL, hToggleEncryption = NULL, hOnPreBuildContactMenu = NULL, hSendKey = NULL, g_hCLIcon = NULL, hExportGpgKeys = NULL, hImportGpgKeys = NULL; PLUGINLINK *pluginLink; IconExtraColumn g_IEC = {0}; @@ -95,6 +96,7 @@ void init_vars() outclosetag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szOutCloseTag", _T("")); bDebugLog = DBGetContactSettingByte(NULL, szGPGModuleName, "bDebugLog", 0); bAutoExchange = DBGetContactSettingByte(NULL, szGPGModuleName, "bAutoExchange", 0); + bSameAction = DBGetContactSettingByte(NULL, szGPGModuleName, "bSameAction", 0); password = UniGetContactSettingUtf(NULL, szGPGModuleName, "szKeyPassword", _T("")); debuglog.init(); bIsMiranda09 = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0) >= 0x00090001?true:false; @@ -116,6 +118,7 @@ void init_vars() load_existing_key_rect.left = DBGetContactSettingDword(NULL, szGPGModuleName, "LoadExistingKeyWindowX", 0); load_existing_key_rect.top = DBGetContactSettingDword(NULL, szGPGModuleName, "LoadExistingKeyWindowY", 0); tabsrmm_used = isTabsrmmUsed(); + bold_font = CreateFont(14, 0, 0, 0, 600, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, _T("Arial")); } extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) -- cgit v1.2.3