Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/plugin/PluginClass.cpp

Issue 5115380229996544: Issue 1104 - Cannot uncheck Disable on website option in tool bar (Closed)
Patch Set: rename and rebase Created March 13, 2015, 4:48 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/plugin/AdblockPlusClient.cpp ('k') | src/shared/Communication.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 1256 matching lines...) Expand 10 before | Expand all | Expand 10 after
1267 DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION _SETTINGS, "Navigation::Failed") 1267 DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION _SETTINGS, "Navigation::Failed")
1268 } 1268 }
1269 } 1269 }
1270 } 1270 }
1271 break; 1271 break;
1272 } 1272 }
1273 case ID_MENU_DISABLE_ON_SITE: 1273 case ID_MENU_DISABLE_ON_SITE:
1274 { 1274 {
1275 CPluginSettings* settings = CPluginSettings::GetInstance(); 1275 CPluginSettings* settings = CPluginSettings::GetInstance();
1276 std::wstring urlString = GetTab()->GetDocumentUrl(); 1276 std::wstring urlString = GetTab()->GetDocumentUrl();
1277 if (client->IsWhitelistedUrl(urlString)) 1277 std::string filterText = client->GetWhitelistingFilter(urlString);
1278 if (!filterText.empty())
1278 { 1279 {
1279 settings->RemoveWhiteListedDomain(ToCString(client->GetHostFromUrl(urlSt ring))); 1280 client->RemoveFilter(filterText);
1280 } 1281 }
1281 else 1282 else
1282 { 1283 {
1283 settings->AddWhiteListedDomain(ToCString(client->GetHostFromUrl(urlStrin g))); 1284 settings->AddWhiteListedDomain(ToCString(client->GetHostFromUrl(urlStrin g)));
1284 } 1285 }
1285 GetBrowser()->Refresh(); 1286 GetBrowser()->Refresh();
1286 } 1287 }
1287 default: 1288 default:
1288 break; 1289 break;
1289 } 1290 }
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
1886 } 1887 }
1887 } 1888 }
1888 } 1889 }
1889 1890
1890 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); 1891 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
1891 } 1892 }
1892 1893
1893 return hTabWnd; 1894 return hTabWnd;
1894 1895
1895 } 1896 }
OLDNEW
« no previous file with comments | « src/plugin/AdblockPlusClient.cpp ('k') | src/shared/Communication.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld