Issue 1103 - Migrate Simple Adblock users

src/plugin/PluginClass.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 687 matching lines @@
       return false;
     }
   }
 
   int ieVersion = AdblockPlus::IE::InstalledMajorVersion();
   // Create status pane
   if (ieVersion > 6 && !CreateStatusBarPane())
   {
     return false;
   }
-  
   s_criticalSectionLocal.Lock();
-  int versionCompRes = CPluginClient::GetInstance()->CompareVersions(CPluginClient::GetInstance()->GetPref(L"currentVersion", L"0.0"), L"1.2");
+  std::wstring curVer = CPluginClient::GetInstance()->GetPref(L"currentVersion", L"0.0");
+  // The plugin version can be "simpleadblock", which doesn't have the "."
+  if (curVer.find(L".") == std::wstring::npos)
+  {
+    CPluginClient::GetInstance()->SetPref(L"convertedFrom", curVer);
+  }
+  int versionCompRes = CPluginClient::GetInstance()->CompareVersions(curVer, L"1.2");
 
   bool isFirstRun = CPluginClient::GetInstance()->IsFirstRun();
   CPluginClient::GetInstance()->SetPref(L"currentVersion", std::wstring(IEPLUGIN_VERSION));
   // This is the first time ABP was installed
   // Or ABP was updated from the version that did not support Acceptable Ads (<1.2)
   if (isFirstRun || versionCompRes < 0)
   {   
     if (!isFirstRun)
     {
-      CPluginClient::GetInstance()->SetPref(L"displayUpdatePage", true);
+      // Display an update page only if it's not a conversion from other product
+      if (CPluginClient::GetInstance()->GetPref(L"convertedFrom", L"") == L"")
+      {
+        CPluginClient::GetInstance()->SetPref(L"displayUpdatePage", true);
+      }
     }
 
     // IE6 can't be accessed from another thread, execute in current thread
     if (ieVersion < 7)
     {
       FirstRunThread();
     }
     else
     {
       CreateThread(NULL, NULL, (LPTHREAD_START_ROUTINE)CPluginClass::FirstRunThread, NULL, NULL, NULL);
@@ skipping 1001 matching lines @@
           s_criticalSectionLocal.Unlock();
 
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
   return hTabWnd;
 }