First run page triggering

src/plugin/PluginUserSettings.cpp

 #include "PluginStdAfx.h"
 #include "PluginUserSettings.h"
 #include <algorithm>
 #include "PluginSettings.h"
 #include "PluginClient.h"
 #include "../shared/Dictionary.h"
 
 static const CString s_GetMessage = L"GetMessage";
 static const CString s_GetLanguageCount = L"GetLanguageCount";
 static const CString s_GetLanguageByIndex = L"GetLanguageByIndex";
@@ skipping 79 matching lines @@
 }
 
 
 static CString sGetLanguage()
 {
   CPluginSettings* settings = CPluginSettings::GetInstance();
   return settings->GetSubscription();
 }
 
 
-CStringW sGetMessage(const CString& key)
+CStringW sGetMessage(const CString& section, const CString& key)
 {
   Dictionary* dictionary = Dictionary::GetInstance();
-  return CString(dictionary->Lookup("settings", std::string(CW2A(key))).c_str());
-}
-
-std::wstring sGetMessage(const std::string& key)
+  return CStringW(dictionary->Lookup(std::string(CW2A(section)), std::string(CW2A(key))).c_str());
+}
+
+std::wstring sGetMessage(const std::string& section, const std::string& key)
 {
   Dictionary* dictionary = Dictionary::GetInstance();
-  return dictionary->Lookup("settings", key);
+  return dictionary->Lookup(section, key);
 }
 
 
 STDMETHODIMP CPluginUserSettings::Invoke(DISPID dispidMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispparams, VARIANT* pVarResult,
                                          EXCEPINFO* pExcepinfo, UINT* pArgErr)
 {
   if (!pDispparams)
     return E_POINTER;
 
   if (!pExcepinfo)
     return E_POINTER;
 
   if (pDispparams->cNamedArgs)
     return DISP_E_NONAMEDARGS;
 
   CPluginSettings* settings = CPluginSettings::GetInstance();
 
   if (dispidMember  < 0  ||  dispidMember >= countof(s_Methods))
     return DISP_E_BADINDEX;
 
   const CString& method = s_Methods[dispidMember];
 
   if (s_GetMessage == method)
   {
-    if (1 != pDispparams->cArgs)
+    if (2 != pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
     if (VT_BSTR != pDispparams->rgvarg[0].vt)
       return DISP_E_TYPEMISMATCH;
 
     if (pVarResult)
     {
       CComBSTR key = pDispparams->rgvarg[0].bstrVal;
-      CStringW message = sGetMessage((BSTR)key);
+      CComBSTR section = pDispparams->rgvarg[1].bstrVal;
+      CStringW message = sGetMessage((BSTR)section, (BSTR)key);
 
       pVarResult->vt = VT_BSTR;
       pVarResult->bstrVal = SysAllocString(message);
     }
   }
   else if (s_GetLanguageCount == method)
   {
     if (pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
@@ skipping 149 matching lines @@
     {
       settings->RemoveWhiteListedDomain((BSTR)domain);
     }
   }
   else
     return DISP_E_MEMBERNOTFOUND;
 
   return S_OK;
 }