Fix build errors w.r.t. the changes in context-common

Change-Id: Ie7d245bbedbb0ff0c79833bbd2d2e676d64417c5
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/src/ProviderHandler.cpp b/src/ProviderHandler.cpp
index cd14540..2ce7f69 100644 (file)
--- a/src/ProviderHandler.cpp
+++ b/src/ProviderHandler.cpp
@@ -16,6 +16,7 @@
 
 #include <glib.h>
 #include <Types.h>
+#include <ProviderTypes.h>
 #include "access_control/Privilege.h"
 #include "Request.h"
 #include "ProviderHandler.h"
@@ -198,7 +199,7 @@ void ProviderHandler::write(RequestInfo *request)
        _I(CYAN("'%s' writes '%s' (RID-%d)"), request->getClient(), __subject.c_str(), request->getId());
 
        Json requestResult;
-       request->getDescription().set(NULL, "packageId", request->getPackageId()? request->getPackageId() : "SYSTEM");
+       request->getDescription().set(NULL, KEY_CLIENT_PKG_ID, request->getPackageId()? request->getPackageId() : "SYSTEM");
        int error = __provider->write(request->getDescription(), &requestResult);
 
        request->reply(error, requestResult);

diff --git a/src/trigger/ActionManager.cpp b/src/trigger/ActionManager.cpp
index f0e50fc..5601fb2 100644 (file)
--- a/src/trigger/ActionManager.cpp
+++ b/src/trigger/ActionManager.cpp
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include <Types.h>
+#include <Json.h>
 #include <app_control.h>
 #include <app_control_internal.h>
 #include <bundle.h>
@@ -22,7 +24,6 @@
 #include <notification_internal.h>
 #include <vconf.h>
 #include <context_trigger_types_internal.h>
-#include <Json.h>
 #include "../DBusServer.h"
 #include "ActionManager.h"