Support Acceptable Ads

src/plugin/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMimeFilterClient.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
 #include "PluginMutex.h"
 #include "sddl.h"
 #include "PluginUtil.h"
 #include "PluginUserSettings.h"
 #include "../shared/Utils.h"
 #include "../shared/Dictionary.h"
 
 #ifdef DEBUG_HIDE_EL
 DWORD profileTime = 0;
 #endif
-

[Felix Dahlke, 2014/06/30 17:24:04]

I liked it better with just one line of whitespace here :) Unrelated anyway.

 
 typedef HANDLE (WINAPI *OPENTHEMEDATA)(HWND, LPCWSTR);
 typedef HRESULT (WINAPI *DRAWTHEMEBACKGROUND)(HANDLE, HDC, INT, INT, LPRECT, LPRECT);
 typedef HRESULT (WINAPI *CLOSETHEMEDATA)(HANDLE);
 
 HICON CPluginClass::s_hIcons[ICON_MAX] = { NULL, NULL, NULL };
 DWORD CPluginClass::s_hIconTypes[ICON_MAX] = { IDI_ICON_DISABLED, IDI_ICON_ENABLED, IDI_ICON_DEACTIVATED };
 
 CPluginMimeFilterClient* CPluginClass::s_mimeFilter = NULL;
 
@@ skipping 1303 matching lines @@
         settings->RemoveWhiteListedDomain(ExtractDomain(urlString));
       }
       else
       {
         settings->AddWhiteListedDomain(ExtractDomain(urlString));
       }
       GetBrowser()->Refresh();
     }
   case ID_MENU_ACCEPTABLE_ADS:
     {
-      if (client->AcceptableAdsStatus())
+      if (client->IsAcceptableAdsEnabled())
       {
         client->RemoveSubscription(client->GetPref(L"subscriptions_exceptionsurl", L""));
       }
       else
       {
         client->AddSubscription(client->GetPref(L"subscriptions_exceptionsurl", L""));
       }
     }
   default:
     break;
@@ skipping 86 matching lines @@
 
   // Settings
   ctext = dictionary->Lookup("menu", "menu-settings");
   fmii.fMask  = MIIM_STATE | MIIM_STRING;
   fmii.fState = MFS_ENABLED;
   fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
   fmii.cch = static_cast<UINT>(ctext.size());
   ::SetMenuItemInfoW(hMenu, ID_MENU_SETTINGS, FALSE, &fmii);
 
   ctext = dictionary->Lookup("menu", "menu-acceptable-ads");
-  // Are Acceptable Ads enabled?

[Felix Dahlke, 2014/06/30 17:24:04]

This comment can also go if the function is called "IsAcceptableAdsEnabled()",
eh?

-  if (client->AcceptableAdsStatus())
+  if (client->IsAcceptableAdsEnabled())
   {
     fmii.fState = MFS_CHECKED | MFS_ENABLED;
   }
   else
   {
     fmii.fState = MFS_UNCHECKED | MFS_ENABLED;
   }
   fmii.fMask = MIIM_STRING | MIIM_STATE;
   fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
   fmii.cch = static_cast<UINT>(ctext.size());
@@ skipping 532 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }