From 6b8da5e2bad0f09aed0a28e9173208b9316633db Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 16 Aug 2014 20:21:45 +0000 Subject: revert until better solution git-svn-id: http://svn.miranda-ng.org/main/trunk@10209 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- docs/mirandaboot.ini | 6 +++--- src/modules/database/dbini.cpp | 2 +- tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini | 4 ++-- tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini | 4 ++-- .../Common/Files/Settings/mirandaboot_default.ini | 4 ++-- .../Common/Files/Settings/mirandaboot_portable.ini | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/mirandaboot.ini b/docs/mirandaboot.ini index 247f032738..9d9ea491be 100644 --- a/docs/mirandaboot.ini +++ b/docs/mirandaboot.ini @@ -47,7 +47,7 @@ AutoCreate=no ;"no": Disable the autoexec system entirely ;"prompt": (default) Prompt the user before each installation ;This setting doesn't affect the decision of whether to display further prompts -Use=prompt +Use=yes ;Glob ;A global expression containing the files to watch for database settings. @@ -60,8 +60,8 @@ Glob=autoexec_*.ini ;Safe ;A space-separated list of database module names known to be safe to alter. -;Default: CLC Icons CLUI CList SkinSounds -Safe=CLC Icons CLUI CList SkinSounds +;Default: CLC Icons CLUI CList SkinSounds PluginUpdater +Safe=CLC Icons CLUI CList SkinSounds PluginUpdater ;Unsafe ;A space-separated list of database module names that could be alter to diff --git a/src/modules/database/dbini.cpp b/src/modules/database/dbini.cpp index 5feeda7b35..a2c8c74d69 100644 --- a/src/modules/database/dbini.cpp +++ b/src/modules/database/dbini.cpp @@ -412,7 +412,7 @@ static void DoAutoExec(void) GetPrivateProfileString(_T("AutoExec"), _T("Use"), _T("prompt"), szUse, SIZEOF(szUse), mirandabootini); if (!lstrcmpi(szUse, _T("no"))) return; - GetPrivateProfileString(_T("AutoExec"), _T("Safe"), _T("CLC Icons CLUI CList SkinSounds"), buf, SIZEOF(buf), mirandabootini); + GetPrivateProfileString(_T("AutoExec"), _T("Safe"), _T("CLC Icons CLUI CList SkinSounds PluginUpdater"), buf, SIZEOF(buf), mirandabootini); szSafeSections = mir_t2a(buf); GetPrivateProfileString(_T("AutoExec"), _T("Unsafe"), _T("AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER VKontakte XFire"), buf, SIZEOF(buf), mirandabootini); szUnsafeSections = mir_t2a(buf); diff --git a/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini b/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini index 7f0499d80c..acdd70ac94 100644 --- a/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini +++ b/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini @@ -60,8 +60,8 @@ Glob=autoexec_*.ini ;Safe ;A space-separated list of database module names known to be safe to alter. -;Default: CLC Icons CLUI CList SkinSounds -Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar +;Default: CLC Icons CLUI CList SkinSounds PluginUpdater +Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar PluginUpdater ;Unsafe ;A space-separated list of database module names that could be alter to diff --git a/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini b/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini index 13a0157599..d0c79fdcd2 100644 --- a/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini +++ b/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini @@ -60,8 +60,8 @@ Glob=autoexec_*.ini ;Safe ;A space-separated list of database module names known to be safe to alter. -;Default: CLC Icons CLUI CList SkinSounds -Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar +;Default: CLC Icons CLUI CList SkinSounds PluginUpdater +Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar PluginUpdater ;Unsafe ;A space-separated list of database module names that could be alter to diff --git a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini index 7f0499d80c..acdd70ac94 100644 --- a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini +++ b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini @@ -60,8 +60,8 @@ Glob=autoexec_*.ini ;Safe ;A space-separated list of database module names known to be safe to alter. -;Default: CLC Icons CLUI CList SkinSounds -Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar +;Default: CLC Icons CLUI CList SkinSounds PluginUpdater +Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar PluginUpdater ;Unsafe ;A space-separated list of database module names that could be alter to diff --git a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini index 13a0157599..d0c79fdcd2 100644 --- a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini +++ b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini @@ -60,8 +60,8 @@ Glob=autoexec_*.ini ;Safe ;A space-separated list of database module names known to be safe to alter. -;Default: CLC Icons CLUI CList SkinSounds -Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar +;Default: CLC Icons CLUI CList SkinSounds PluginUpdater +Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar PluginUpdater ;Unsafe ;A space-separated list of database module names that could be alter to -- cgit v1.2.3