Index: src/plugin/PluginClass.cpp |
=================================================================== |
--- a/src/plugin/PluginClass.cpp |
+++ b/src/plugin/PluginClass.cpp |
@@ -23,7 +23,6 @@ |
#include "PluginFilter.h" |
#include "PluginMimeFilterClient.h" |
#include "AdblockPlusClient.h" |
-#include "PluginClientBase.h" |
#include "PluginClientFactory.h" |
#include "PluginUtil.h" |
#include "../shared/Utils.h" |
@@ -438,7 +437,7 @@ |
hr = browser->Navigate(CComBSTR(curLoc), &vFlags, NULL, NULL, NULL); |
if (FAILED(hr)) |
{ |
- DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION, "Navigation::Failed") |
+ DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION, "Navigation::Failed"); |
} |
} |
browser->Quit(); |
@@ -744,7 +743,7 @@ |
HWND hBrowserWnd = GetBrowserHWND(); |
if (!hBrowserWnd) |
{ |
- DEBUG_ERROR_LOG(0, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_NO_STATUSBAR_BROWSER, "Class::CreateStatusBarPane - No status bar") |
+ TRACE("No window handle for browser site", HERE_F); |
return false; |
} |
@@ -826,7 +825,7 @@ |
if (!hWndStatusBar) |
{ |
- DEBUG_ERROR_LOG(0, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_NO_STATUSBAR_WIN, "Class::CreateStatusBarPane - No status bar") |
+ TRACE("No status bar", HERE_F); |
return true; |
} |
@@ -870,7 +869,7 @@ |
if (!hWndNewPane) |
{ |
- DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_CREATE_STATUSBAR_PANE, "Class::CreateStatusBarPane - CreateWindowEx") |
+ DEBUG_ERROR_LOG(::GetLastError(), PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_CREATE_STATUSBAR_PANE, "Class::CreateStatusBarPane - CreateWindowEx"); |
return false; |
} |
@@ -926,7 +925,7 @@ |
if (FAILED(hr)) |
{ |
- DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_WELCOME, "Navigation::Welcome page failed") |
+ DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_WELCOME, "Navigation::Welcome page failed"); |
} |
} |
void CPluginClass::CloseTheme() |
@@ -1108,7 +1107,7 @@ |
hr = browser->Navigate(urlToNavigate, &vFlags, NULL, NULL, NULL); |
if (FAILED(hr)) |
{ |
- DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_SETTINGS, "Navigation::Failed") |
+ DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_SETTINGS, "Navigation::Failed"); |
} |
} |
} |
@@ -1542,7 +1541,6 @@ |
CPluginTab* tab = GetTab(::GetCurrentThreadId()); |
if (tab) |
{ |
- tab->OnActivate(); |
RECT rect; |
GetWindowRect(pClass->m_hPaneWnd, &rect); |
pClass->notificationMessage.Move(rect.left + (rect.right - rect.left) / 2, rect.top + (rect.bottom - rect.top) / 2); |