From 9f1255d9869e4b57c292ce4f25986ff9b3b848ce Mon Sep 17 00:00:00 2001 From: Xinyu Hou Date: Fri, 13 Feb 2015 14:25:29 +0000 Subject: [PATCH] Revert "did not pass arch into plugins #4313" This reverts commit 0f686ff308b3f5cc27449da1a5fd1aaa619e0834. --- src/lib/synergy/ClientApp.cpp | 2 +- src/lib/synergy/ServerApp.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/synergy/ClientApp.cpp b/src/lib/synergy/ClientApp.cpp index bfb8de4a..b9c00414 100644 --- a/src/lib/synergy/ClientApp.cpp +++ b/src/lib/synergy/ClientApp.cpp @@ -460,7 +460,7 @@ ClientApp::mainLoop() // load all available plugins. ARCH->plugin().load(); // pass log and arch into plugins. - ARCH->plugin().init(Log::getInstance()); + ARCH->plugin().init(Log::getInstance(), Arch::getInstance()); // start client, etc appUtil().startNode(); diff --git a/src/lib/synergy/ServerApp.cpp b/src/lib/synergy/ServerApp.cpp index 7f84a43d..358201e2 100644 --- a/src/lib/synergy/ServerApp.cpp +++ b/src/lib/synergy/ServerApp.cpp @@ -710,7 +710,7 @@ ServerApp::mainLoop() // load all available plugins. ARCH->plugin().load(); // pass log and arch into plugins. - ARCH->plugin().init(Log::getInstance()); + ARCH->plugin().init(Log::getInstance(), Arch::getInstance()); // start server, etc appUtil().startNode();