summaryrefslogtreecommitdiff
path: root/plugins/PluginUpdater/src/DlgUpdate.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/PluginUpdater/src/DlgUpdate.cpp')
-rw-r--r--plugins/PluginUpdater/src/DlgUpdate.cpp60
1 files changed, 13 insertions, 47 deletions
diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp
index 800ee9852c..58d293b43f 100644
--- a/plugins/PluginUpdater/src/DlgUpdate.cpp
+++ b/plugins/PluginUpdater/src/DlgUpdate.cpp
@@ -122,19 +122,10 @@ static void ApplyUpdates(void *param)
}
Skin_PlaySound("updatecompleted");
-#if MIRANDA_VER < 0x0A00
- // 4) Change title of clist
- ptrW title(db_get_wsa(NULL, "CList", "TitleText"));
- if (!lstrcmpi(title, L"Miranda IM"))
- db_set_ws(NULL, "CList", "TitleText", L"Miranda NG");
-#endif
-
db_set_b(NULL, MODNAME, DB_SETTING_RESTART_COUNT, 5);
-#if MIRANDA_VER >= 0x0A00
if (opts.bBackup)
CallService(MS_AB_BACKUP, 0, 0);
-#endif
if (opts.bChangePlatform) {
wchar_t mirandaPath[MAX_PATH];
@@ -160,23 +151,18 @@ static void ApplyUpdates(void *param)
int rc = MessageBox(hDlg, TranslateT("Update complete. Press Yes to restart Miranda now or No to postpone a restart until the exit."), TranslateT("Plugin Updater"), MB_YESNO | MB_ICONQUESTION);
PostMessage(hDlg, WM_CLOSE, 0, 0);
if (rc == IDYES) {
-#if MIRANDA_VER >= 0x0A00
BOOL bRestartCurrentProfile = db_get_b(NULL, MODNAME, "RestartCurrentProfile", 1) ? 1 : 0;
if (opts.bChangePlatform) {
wchar_t mirstartpath[MAX_PATH];
-#ifdef _WIN64
- mir_snwprintf(mirstartpath, L"%s\\miranda32.exe", tszMirandaPath);
-#else
- mir_snwprintf(mirstartpath, L"%s\\miranda64.exe", tszMirandaPath);
-#endif
+ #ifdef _WIN64
+ mir_snwprintf(mirstartpath, L"%s\\miranda32.exe", tszMirandaPath);
+ #else
+ mir_snwprintf(mirstartpath, L"%s\\miranda64.exe", tszMirandaPath);
+ #endif
CallServiceSync(MS_SYSTEM_RESTART, bRestartCurrentProfile, (LPARAM)mirstartpath);
}
- else
- CallServiceSync(MS_SYSTEM_RESTART, bRestartCurrentProfile);
-#else
- CallFunctionAsync(RestartMe, 0);
-#endif
+ else CallServiceSync(MS_SYSTEM_RESTART, bRestartCurrentProfile);
}
}
@@ -196,12 +182,8 @@ static INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM
case WM_INITDIALOG:
TranslateDialogDefault(hDlg);
SendMessage(hwndList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES);
-#if MIRANDA_VER >= 0x0A00
+
Window_SetIcon_IcoLib(hDlg, iconList[0].hIcolib);
-#else
- SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIcon("check_update"));
- SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIcon("check_update",1));
-#endif
{
OSVERSIONINFO osver = { sizeof(osver) };
if (GetVersionEx(&osver) && osver.dwMajorVersion >= 6)
@@ -383,9 +365,9 @@ static INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM
hwndDialog = nullptr;
delete (OBJLIST<FILEINFO> *)GetWindowLongPtr(hDlg, GWLP_USERDATA);
SetWindowLongPtr(hDlg, GWLP_USERDATA, 0);
-#if MIRANDA_VER >= 0x0A00
+
db_set_dw(NULL, MODNAME, DB_SETTING_LAST_UPDATE, time(0));
-#endif
+
mir_forkthread(InitTimer);
break;
}
@@ -474,13 +456,6 @@ static void DlgUpdateSilent(void *param)
delete &UpdateFiles;
Skin_PlaySound("updatecompleted");
-#if MIRANDA_VER < 0x0A00
- // 4) Change title of clist
- ptrW title = db_get_wsa(NULL, "CList", "TitleText");
- if (!_wcsicmp(title, L"Miranda IM"))
- db_set_ws(NULL, "CList", "TitleText", L"Miranda NG");
-#endif
-
opts.bForceRedownload = false;
db_unset(NULL, MODNAME, DB_SETTING_REDOWNLOAD);
@@ -503,11 +478,7 @@ static void DlgUpdateSilent(void *param)
mir_snwprintf(tszText, L"%s\n\n%s", TranslateT("You need to restart your Miranda to apply installed updates."), TranslateT("Would you like to restart it now?"));
if (MessageBox(nullptr, tszText, tszTitle, MB_ICONINFORMATION | MB_YESNO) == IDYES)
-#if MIRANDA_VER >= 0x0A00
CallServiceSync(MS_SYSTEM_RESTART, db_get_b(NULL, MODNAME, "RestartCurrentProfile", 1) ? 1 : 0, 0);
-#else
- CallFunctionAsync(RestartMe, 0);
-#endif
}
}
}
@@ -517,7 +488,7 @@ static void __stdcall LaunchDialog(void *param)
if (opts.bSilentMode && opts.bSilent)
mir_forkthread(DlgUpdateSilent, param);
else
- hwndDialog = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_UPDATE), GetDesktopWindow(), DlgUpdate, (LPARAM)param);
+ hwndDialog = CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_UPDATE), GetDesktopWindow(), DlgUpdate, (LPARAM)param);
}
/////////////////////////////////////////////////////////////////////////////////////////
@@ -559,7 +530,6 @@ static renameTable[] =
{ L"startupstatus.dll", L"Plugins\\statusmanager.dll" },
{ L"dropbox.dll", L"Plugins\\cloudfile.dll" },
-#if MIRANDA_VER >= 0x0A00
{ L"dbx_mmap_sa.dll", L"Plugins\\dbx_mmap.dll" },
{ L"dbx_tree.dll", L"Plugins\\dbx_mmap.dll" },
{ L"rc4.dll", nullptr },
@@ -568,7 +538,6 @@ static renameTable[] =
{ L"mir_app.dll", nullptr },
{ L"mir_core.dll", nullptr },
{ L"zlib.dll", nullptr },
-#endif
{ L"proto_newsaggr.dll", L"Icons\\proto_newsaggregator.dll" },
{ L"clienticons_*.dll", L"Icons\\fp_icons.dll" },
@@ -712,7 +681,6 @@ static int ScanFolder(const wchar_t *tszFolder, size_t cbBaseLen, const wchar_t
strdelw(tszNewName + iPos, 1);
}
-#if MIRANDA_VER >= 0x0A00
// No need to hash a file if we are forcing a redownload anyway
if (!opts.bForceRedownload) {
// try to hash the file
@@ -732,9 +700,7 @@ static int ScanFolder(const wchar_t *tszFolder, size_t cbBaseLen, const wchar_t
// smth went wrong, reload a file from scratch
}
}
- else
- Netlib_LogfW(hNetlibUser, L"File %s: Forcing redownload", ffd.cFileName);
-#endif
+ else Netlib_LogfW(hNetlibUser, L"File %s: Forcing redownload", ffd.cFileName);
ptszUrl = item->m_name;
MyCRC = item->m_crc;
@@ -836,9 +802,9 @@ static void DoCheck(bool bSilent = true)
}
else {
opts.bSilent = bSilent;
-#if MIRANDA_VER >= 0x0A00
+
db_set_dw(NULL, MODNAME, DB_SETTING_LAST_UPDATE, time(0));
-#endif
+
hCheckThread = mir_forkthread(CheckUpdates);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 23:57:20 +0000