Index: src/plugin/PluginClass.cpp |
=================================================================== |
--- a/src/plugin/PluginClass.cpp |
+++ b/src/plugin/PluginClass.cpp |
@@ -45,18 +45,16 @@ CComAutoCriticalSection CPluginClass::s_ |
CComAutoCriticalSection CPluginClass::s_criticalSectionWindow; |
CComQIPtr<IWebBrowser2> CPluginClass::s_asyncWebBrowser2; |
#ifdef SUPPORT_WHITELIST |
std::map<UINT,CString> CPluginClass::s_menuDomains; |
#endif |
-bool CPluginClass::s_isPluginToBeUpdated = false; |
- |
CPluginTab* CPluginClass::s_activeTab = NULL; |
CPluginClass::CPluginClass() |
{ |
//Use this line to debug memory leaks |
// _CrtDumpMemoryLeaks(); |
@@ -100,20 +98,16 @@ CPluginClass::CPluginClass() |
} |
// Update? |
CString oldVersion = settings->GetString(SETTING_PLUGIN_VERSION); |
if (settings->IsFirstRunUpdate() || settings->GetString(SETTING_PLUGIN_UPDATE_VERSION) == IEPLUGIN_VERSION || oldVersion != IEPLUGIN_VERSION) |
{ |
settings->SetString(SETTING_PLUGIN_VERSION, IEPLUGIN_VERSION); |
- settings->Remove(SETTING_PLUGIN_UPDATE_TIME); |
- settings->Remove(SETTING_PLUGIN_UPDATE_VERSION); |
- settings->Remove(SETTING_PLUGIN_UPDATE_URL); |
- |
settings->SetFirstRunUpdate(); |
} |
int info = settings->GetValue(SETTING_PLUGIN_INFO_PANEL, 0); |
#ifdef ENABLE_DEBUG_RESULT |
CPluginDebug::DebugResultClear(); |
#endif |
@@ -1370,22 +1364,16 @@ void CPluginClass::DisplayPluginMenu(HME |
int nCommand = ::TrackPopupMenu(hMenu, nMenuFlags, pt.x, pt.y, 0, hMenuWnd, 0); |
::DestroyMenu(hMenu); |
::DestroyWindow(hMenuWnd); |
switch (nCommand) |
{ |
- case ID_PLUGIN_UPDATE: |
- { |
- s_isPluginToBeUpdated = true; |
- } |
- break; |
- |
case ID_PLUGIN_ENABLE: |
{ |
CPluginSettings* settings = CPluginSettings::GetInstance(); |
settings->TogglePluginEnabled(); |
// Enable / disable mime filter |
s_criticalSectionLocal.Lock(); |
@@ -1513,30 +1501,16 @@ bool CPluginClass::SetMenuBar(HMENU hMen |
CPluginSettings* settings = CPluginSettings::GetInstance(); |
settings->RefreshTab(); |
// Update settings |
m_tab->OnUpdateSettings(false); |
- // Plugin update |
- if (settings->IsPluginUpdateAvailable()) |
- { |
- ctext = dictionary->Lookup("MENU_UPDATE"); |
- fmii.fMask = MIIM_STATE | MIIM_STRING; |
- fmii.fState = MFS_ENABLED; |
- fmii.dwTypeData = ctext.GetBuffer(); |
- fmii.cch = ctext.GetLength(); |
- ::SetMenuItemInfo(hMenu, ID_PLUGIN_UPDATE, FALSE, &fmii); |
- } |
- else |
- { |
- ::DeleteMenu(hMenu, ID_PLUGIN_UPDATE, FALSE); |
- } |
#ifdef SUPPORT_WHITELIST |
{ |
// White list domain |
ctext = dictionary->Lookup("MENU_DISABLE_ON"); |
fmii.fMask = MIIM_STRING | MIIM_STATE; |
fmii.fState = MFS_DISABLED; |
fmii.dwTypeData = ctext.GetBuffer(); |
fmii.cch = ctext.GetLength(); |