From e0377024f5048273f409b4844c2b44e3e7bb5d7d Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 19 Jan 2021 15:50:20 +0300
Subject: fixes #2702 (Dbx_sqlite: missing "Compact" menu item)

---
 plugins/Dbx_mdbx/src/dbintf.cpp |  2 --
 plugins/Dbx_mdbx/src/dbintf.h   |  2 --
 plugins/Dbx_mdbx/src/stdafx.h   |  1 -
 plugins/Dbx_mdbx/src/ui.cpp     | 69 -----------------------------------------
 plugins/Dbx_mdbx/src/ui.h       |  3 --
 5 files changed, 77 deletions(-)
 delete mode 100644 plugins/Dbx_mdbx/src/ui.cpp
 delete mode 100644 plugins/Dbx_mdbx/src/ui.h

(limited to 'plugins/Dbx_mdbx/src')

diff --git a/plugins/Dbx_mdbx/src/dbintf.cpp b/plugins/Dbx_mdbx/src/dbintf.cpp
index 6b9f905b53..bb46a1ddb6 100644
--- a/plugins/Dbx_mdbx/src/dbintf.cpp
+++ b/plugins/Dbx_mdbx/src/dbintf.cpp
@@ -221,10 +221,8 @@ int CDbxMDBX::Load()
 	if (InitModules()) return EGROKPRF_DAMAGED;
 	if (InitCrypt())   return EGROKPRF_DAMAGED;
 
-	InitDialogs();
 	FillContacts();
 	FillSettings();
-
 	return EGROKPRF_NOERROR;
 }
 
diff --git a/plugins/Dbx_mdbx/src/dbintf.h b/plugins/Dbx_mdbx/src/dbintf.h
index 67ccd62718..02f4ad8689 100644
--- a/plugins/Dbx_mdbx/src/dbintf.h
+++ b/plugins/Dbx_mdbx/src/dbintf.h
@@ -223,8 +223,6 @@ class CDbxMDBX : public MDatabaseCommon, public MIDatabaseChecker, public MZeroe
 
 	MDBX_dbi m_dbCrypto;
 
-	void     InitDialogs();
-
 public:
 	CDbxMDBX(const wchar_t *tszFileName, int mode);
 	virtual ~CDbxMDBX();
diff --git a/plugins/Dbx_mdbx/src/stdafx.h b/plugins/Dbx_mdbx/src/stdafx.h
index 477861244f..5cf483183f 100644
--- a/plugins/Dbx_mdbx/src/stdafx.h
+++ b/plugins/Dbx_mdbx/src/stdafx.h
@@ -102,4 +102,3 @@ struct CMPlugin : public PLUGIN<CMPlugin>
 	int Load() override;
 };
 
-#include "ui.h"
diff --git a/plugins/Dbx_mdbx/src/ui.cpp b/plugins/Dbx_mdbx/src/ui.cpp
deleted file mode 100644
index a19e33da41..0000000000
--- a/plugins/Dbx_mdbx/src/ui.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-
-Miranda NG: the free IM client for Microsoft* Windows*
-
-Copyright (C) 2012-21 Miranda NG team (https://miranda-ng.org)
-all portions of this codebase are copyrighted to the people
-listed in contributors.txt.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#include "stdafx.h"
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
-static INT_PTR CompactMe(void* obj, WPARAM, LPARAM)
-{
-	CDbxMDBX *db = (CDbxMDBX*)obj;
-	if (!db->Compact())
-		MessageBox(0, TranslateT("Database was compacted successfully"), TranslateT("Database"), MB_OK | MB_ICONINFORMATION);
-	else
-		MessageBox(0, TranslateT("Database compaction failed"), TranslateT("Database"), MB_OK | MB_ICONERROR);
-	return 0;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
-static IconItem iconList[] =
-{
-	{ LPGEN("Compact"), "compact", IDI_COMPACT }
-};
-
-static int OnModulesLoaded(WPARAM, LPARAM)
-{
-	g_plugin.registerIcon(LPGEN("Database"), iconList, "mdbx");
-
-	// main menu item
-	CMenuItem mi(&g_plugin);
-	mi.root = g_plugin.addRootMenu(MO_MAIN, LPGENW("Database"), 500000000, 0);
-
-	SET_UID(mi, 0x98c0caf3, 0xBfe5, 0x4e31, 0xac, 0xf0, 0xab, 0x95, 0xb2, 0x9b, 0x9f, 0x73);
-	mi.position++;
-	mi.hIcolibItem = iconList[0].hIcolib;
-	mi.name.a = LPGEN("Compact");
-	mi.pszService = MS_DB_COMPACT;
-	Menu_AddMainMenuItem(&mi);
-	return 0;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
-void CDbxMDBX::InitDialogs()
-{
-	hService[0] = CreateServiceFunctionObj(MS_DB_COMPACT, CompactMe, this);
-
-	hHook = HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
-}
diff --git a/plugins/Dbx_mdbx/src/ui.h b/plugins/Dbx_mdbx/src/ui.h
deleted file mode 100644
index e1c4fe5f4a..0000000000
--- a/plugins/Dbx_mdbx/src/ui.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#define MS_DB_COMPACT        "DB/UI/Compact"
-- 
cgit v1.2.3