From c06646063080880f07359cae604a90340e8d5635 Mon Sep 17 00:00:00 2001
From: Duyoung Jang <duyoung.jang@samsung.com>
Date: Thu, 25 Apr 2013 16:54:39 +0900
Subject: [PATCH] Fix StoreclientId

Change-Id: I1acb60f920fc30f8c2724cbcdc8f14a025186b18
Signed-off-by: Duyoung Jang <duyoung.jang@samsung.com>
---
 src/app/package/FAppPkg_PackageAppInfoImpl.cpp | 4 ++++
 src/app/package/FAppPkg_PackageManagerImpl.cpp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/package/FAppPkg_PackageAppInfoImpl.cpp b/src/app/package/FAppPkg_PackageAppInfoImpl.cpp
index 1081299..d5a4544 100755
--- a/src/app/package/FAppPkg_PackageAppInfoImpl.cpp
+++ b/src/app/package/FAppPkg_PackageAppInfoImpl.cpp
@@ -33,6 +33,7 @@
 #include <FIoDbEnumerator.h>
 #include <FIoDbStatement.h>
 #include <FIoFile.h>
+#include <FIoDirectory.h>
 #include <FBase_StringConverter.h>
 
 #include "FAppPkg_PackageManagerImpl.h"
@@ -536,6 +537,9 @@ _PackageAppInfoImpl::~_PackageAppInfoImpl(void)
 	if (File::IsFileExist(__appTempIconPath) == true)
 	{
 		File::Remove(__appTempIconPath);
+
+		String tmp(L"/tmp/__icon/");
+		Directory::Remove(tmp, true);
 	}
 }
 
diff --git a/src/app/package/FAppPkg_PackageManagerImpl.cpp b/src/app/package/FAppPkg_PackageManagerImpl.cpp
index 98f8be5..9b6e05c 100755
--- a/src/app/package/FAppPkg_PackageManagerImpl.cpp
+++ b/src/app/package/FAppPkg_PackageManagerImpl.cpp
@@ -381,8 +381,8 @@ _PackageManagerImpl::InstallPackage(const PackageId& packageId, const String& pa
 		return E_SYSTEM;
 	}
 
-	// optionalData = 12345abcde:StoreClientId=XXXXX12345.TizenStore
-	AppId StoreClientId = _AppInfo::GetApplicationId();
+	// optionalData = 12345abcde:StoreClientId=XXXXX12345
+	PackageId StoreClientId = _AppInfo::GetPackageId();
 	String optionalData;
 	optionalData.Append(packageId);
 	optionalData.Append(":StoreClientId=");
-- 
2.7.4