Move settings page into the application directory

src/plugin/AdblockPlusClient.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginFilter.h"
 #include "PluginClientFactory.h"
 #include "PluginDictionary.h"
 #include "PluginHttpRequest.h"
 #include "PluginMutex.h"
 #include "PluginClass.h"
@@ skipping 26 matching lines @@
 
     CloseHandle(processInformation.hProcess);
     CloseHandle(processInformation.hThread);
   }
 
   std::auto_ptr<Communication::Pipe> OpenAdblockPlusEnginePipe()
   {
     std::auto_ptr<Communication::Pipe> result;
     try
     {
-      try
+      result.reset(new Communication::Pipe(Communication::pipeName,
+          Communication::Pipe::MODE_CONNECT));
+    }
+    catch (Communication::PipeConnectionError e)
+    {
+      SpawnAdblockPlusEngine();
+
+      int timeout = 10000;
+      const int step = 10;
+      while (!result.get())
       {
-        result.reset(new Communication::Pipe(Communication::pipeName,
-            Communication::Pipe::MODE_CONNECT));
-      }
-      catch (Communication::PipeConnectionError e)
-      {
-        SpawnAdblockPlusEngine();
-
-        int timeout = 10000;
-        const int step = 10;
-        while (!result.get())
+        try
         {
-          try
-          {
-            result.reset(new Communication::Pipe(Communication::pipeName,
-                  Communication::Pipe::MODE_CONNECT));
-          }
-          catch (Communication::PipeConnectionError e)
-          {
-            Sleep(step);
-            timeout -= step;
-            if (timeout <= 0)
-              throw std::runtime_error("Unable to open Adblock Plus Engine pipe");
-          }
+          result.reset(new Communication::Pipe(Communication::pipeName,
+                Communication::Pipe::MODE_CONNECT));
+        }
+        catch (Communication::PipeConnectionError e)
+        {
+          Sleep(step);
+          timeout -= step;
+          if (timeout <= 0)
+            throw std::runtime_error("Unable to open Adblock Plus Engine pipe");
         }
       }
     }
-    catch(std::exception e)
-    {
-      DEBUG_GENERAL(e.what());

[Wladimir Palant, 2013/06/03 11:43:31]

I had to remove the try..catch block here - if the engine could not be started
this caused us to remove an empty pipe pointer and crash further on. We are
catching this exception anyway below and treat it properly.

-    }
     return result;
   }
 
   std::vector<std::string> ReadStrings(Communication::InputBuffer& message)
   {
     int32_t count;
     message >> count;
 
     std::vector<std::string> result;
     for (int32_t i = 0; i < count; i++)
@@ skipping 280 matching lines @@
   try
   {
     CallAdblockPlusEngineProcedure(request);
   }
   catch (const std::exception& e)
   {
     DEBUG_GENERAL(e.what());
   }
 }