diff options
| author | dartraiden <wowemuh@gmail.com> | 2018-03-08 01:47:07 +0300 |
|---|---|---|
| committer | dartraiden <wowemuh@gmail.com> | 2018-03-08 01:47:07 +0300 |
| commit | c25c71d061aab53fe56b93bcb4d6501888fd9447 (patch) | |
| tree | ef06dd80bc71289eb4b84efdc09af02d6ee337e2 | |
| parent | f23b229034b0ca97a9fef1636e7db9ccb56362a3 (diff) | |
remove Advaimg from installers
| -rw-r--r-- | plugins/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/DlgUpdate.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgdlgutils.cpp | 2 | ||||
| -rw-r--r-- | tools/installer_ng/MirandaNG.iss | 1 | ||||
| -rw-r--r-- | tools/installer_ng_stable/MirandaNG.iss | 1 |
5 files changed, 2 insertions, 5 deletions
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 8f1390d276..87ae924f39 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(AdvaImg) add_subdirectory(Clist_modern) add_subdirectory(Db3x_mmap) add_subdirectory(TopToolBar)
\ No newline at end of file diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp index 62469ae6de..ca90682a67 100644 --- a/plugins/PluginUpdater/src/DlgUpdate.cpp +++ b/plugins/PluginUpdater/src/DlgUpdate.cpp @@ -583,7 +583,7 @@ static renameTable[] = { L"stdurl.dll", nullptr },
{ L"advaimg.dll", nullptr },
- { L"aim.dll", nullptr },
+ { L"aim.dll", nullptr },
{ L"dbx_sqlite.dll", nullptr },
{ L"dropbox.dll", nullptr },
{ L"extraicons.dll", nullptr },
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index 088a95636d..574a228ece 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -125,7 +125,7 @@ static UINT_PTR CALLBACK OpenFileSubclass(HWND hwnd, UINT msg, WPARAM, LPARAM lP /////////////////////////////////////////////////////////////////////////////////////////
// saves a contact picture to disk
// takes hbm (bitmap handle) and bool isOwnPic (1 == save the picture as your own avatar)
-// requires AVS and ADVAIMG services (Miranda 0.7+)
+// requires AVS service (Miranda 0.7+)
static void SaveAvatarToFile(CTabBaseDlg *dat, HBITMAP hbm, int isOwnPic)
{
diff --git a/tools/installer_ng/MirandaNG.iss b/tools/installer_ng/MirandaNG.iss index 69105e07b2..dd72880f98 100644 --- a/tools/installer_ng/MirandaNG.iss +++ b/tools/installer_ng/MirandaNG.iss @@ -96,7 +96,6 @@ Source: "Files\Languages\langpack_polish.txt"; DestDir: "{app}\Languages"; Compo Source: "Files\Languages\langpack_russian.txt"; DestDir: "{app}\Languages"; Components: lang\russian; Flags: ignoreversion; AfterInstall: ShowPercent()
;Plugins - not selectable
-Source: "Files\Plugins\AdvaImg.dll"; DestDir: "{app}\Plugins"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Plugins\AVS.dll"; DestDir: "{app}\Plugins"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Plugins\DbChecker.dll"; DestDir: "{app}\Plugins"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Plugins\CrashDumper.dll"; DestDir: "{app}\Plugins"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
diff --git a/tools/installer_ng_stable/MirandaNG.iss b/tools/installer_ng_stable/MirandaNG.iss index bd85929427..c123e15d01 100644 --- a/tools/installer_ng_stable/MirandaNG.iss +++ b/tools/installer_ng_stable/MirandaNG.iss @@ -96,7 +96,6 @@ Source: "Files\Languages\langpack_polish.txt"; DestDir: "{app}\Languages"; Compo Source: "Files\Languages\langpack_russian.txt"; DestDir: "{app}\Languages"; Components: lang\russian; Flags: ignoreversion; AfterInstall: ShowPercent()
;Plugins - not selectable
-Source: "Files\Plugins\AdvaImg.dll"; DestDir: "{app}\Plugins"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Plugins\AVS.dll"; DestDir: "{app}\Plugins"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Plugins\DbChecker.dll"; DestDir: "{app}\Plugins"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
Source: "Files\Plugins\CrashDumper.dll"; DestDir: "{app}\Plugins"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent()
|