Use libadblockplus update checker

src/plugin/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "PluginDictionary.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMimeFilterClient.h"
@@ skipping 32 matching lines @@
 CComAutoCriticalSection CPluginClass::s_criticalSectionLocal;
 CComAutoCriticalSection CPluginClass::s_criticalSectionBrowser;
 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();
 
   m_isAdviced = false;
   m_nConnectionID = 0;
@@ skipping 31 matching lines @@
     // First run or deleted settings file (dictionary version = 1)
     if (settings->GetString(SETTING_DICTIONARY_VERSION, L"1").Compare(L"1") == 0)
     {
       settings->SetFirstRun();
     }
 
     // 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);

[Oleksandr, 2013/06/07 08:37:44]

Looks like the whole "if" can be removed here. We do not store an updated plugin
version anywhere anyway, it seems.

[Wladimir Palant, 2013/06/07 12:46:56]

Yep, lots of code can be removed here - I am just not sure which parts of it are
still used. I've tried to remove code only minimally here, we probably can
remove IsFirstRunUpdate() and everything dependent on it - cleaning up is on the
tasks list for the release.

 
-      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
 
 #ifdef ENABLE_DEBUG_INFO
@@ skipping 1246 matching lines @@
   // Display menu
   nMenuFlags |= TPM_NONOTIFY | TPM_RETURNCMD | TPM_LEFTBUTTON;
 
   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();
       {
         if (settings->GetPluginEnabled())
@@ skipping 117 matching lines @@
 
   CPluginClient* client = CPluginClient::GetInstance();
 
   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();
 
     UINT index = WM_WHITELIST_DOMAIN;
@@ skipping 668 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }