diff options
7 files changed, 12 insertions, 16 deletions
diff --git a/docs/autoexec_nightly_pu.ini b/docs/autoexec_nightly_pu.ini deleted file mode 100644 index c5950d82a6..0000000000 --- a/docs/autoexec_nightly_pu.ini +++ /dev/null @@ -1,4 +0,0 @@ -SETTINGS:
-
-[PluginUpdater]
-UpdateURL=shttp://miranda-ng.org/distr/x%platform%
\ No newline at end of file diff --git a/docs/mirandaboot.ini b/docs/mirandaboot.ini index 9d9ea491be..247f032738 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=yes
+Use=prompt
;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 PluginUpdater
-Safe=CLC Icons CLUI CList SkinSounds PluginUpdater
+;Default: CLC Icons CLUI CList SkinSounds
+Safe=CLC Icons CLUI CList SkinSounds
;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 a2c8c74d69..5feeda7b35 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 PluginUpdater"), buf, SIZEOF(buf), mirandabootini);
+ GetPrivateProfileString(_T("AutoExec"), _T("Safe"), _T("CLC Icons CLUI CList SkinSounds"), 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 acdd70ac94..7f0499d80c 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 PluginUpdater
-Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar PluginUpdater
+;Default: CLC Icons CLUI CList SkinSounds
+Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar
;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 d0c79fdcd2..13a0157599 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 PluginUpdater
-Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar PluginUpdater
+;Default: CLC Icons CLUI CList SkinSounds
+Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar
;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 acdd70ac94..7f0499d80c 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 PluginUpdater
-Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar PluginUpdater
+;Default: CLC Icons CLUI CList SkinSounds
+Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar
;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 d0c79fdcd2..13a0157599 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 PluginUpdater
-Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar PluginUpdater
+;Default: CLC Icons CLUI CList SkinSounds
+Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar
;Unsafe
;A space-separated list of database module names that could be alter to
|