From 5591358289741c644a3edbc50f77da832ddff9cf Mon Sep 17 00:00:00 2001
From: Changyong Jeon <fin10.jeon@samsung.com>
Date: Wed, 3 Apr 2013 13:22:26 +0900
Subject: [PATCH] fix appcontrol settings

Change-Id: If237d0e907e7d0677e3210741ed3343824aa9e9d
---
 .cproject    | 30 ++++++++++++-------------
 .project     |  1 -
 manifest.xml | 73 +++++++++---------------------------------------------------
 3 files changed, 25 insertions(+), 79 deletions(-)

diff --git a/.cproject b/.cproject
index b7bbde9..69231bd 100644
--- a/.cproject
+++ b/.cproject
@@ -17,7 +17,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="exe" artifactName="${ProjName}" buildArtefactType="org.tizen.nativecpp.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecpp.buildArtefactType.app" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecpp.config.sbi.gcc45.app.debug.542757660" name="Debug" parent="org.tizen.nativecpp.config.sbi.gcc45.app.debug">
+				<configuration artifactExtension="exe" artifactName="Calendar" buildArtefactType="org.tizen.nativecpp.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecpp.buildArtefactType.app" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecpp.config.sbi.gcc45.app.debug.542757660" name="Debug" parent="org.tizen.nativecpp.config.sbi.gcc45.app.debug">
 					<folderInfo id="org.tizen.nativecpp.config.sbi.gcc45.app.debug.542757660." name="/" resourcePath="">
 						<toolChain id="org.tizen.nativecpp.toolchain.sbi.gcc45.app.debug.1784086492" name="Tizen Native Toolchain" superClass="org.tizen.nativecpp.toolchain.sbi.gcc45.app.debug">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.165304646" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
@@ -28,7 +28,7 @@
 								<option id="sbi.gnu.cpp.compiler.option.debugging.level.275888905" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
 								<option id="sbi.gnu.cpp.compiler.option.debug.applog.437831432" name="Enable application logging (-D_APP_LOG)" superClass="sbi.gnu.cpp.compiler.option.debug.applog" value="true" valueType="boolean"/>
 								<option id="sbi.gnu.cpp.compiler.option.2067868547" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="tizen-emulator-2.0.cpp.partner_llvm31.i386.cpp.app"/>
+									<listOptionValue builtIn="false" value="tizen-emulator-2.1.native_llvm31.i386.cpp.app"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.include.paths.1491943414" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -58,7 +58,7 @@
 								<option id="sbi.gnu.c.compiler.option.debugging.level.1038790997" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
 								<option id="sbi.gnu.c.compiler.option.debug.applog.30619937" name="Enable application logging (-D_APP_LOG)" superClass="sbi.gnu.c.compiler.option.debug.applog" value="true" valueType="boolean"/>
 								<option id="sbi.gnu.c.compiler.option.2093892473" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="tizen-emulator-2.0.cpp.partner_llvm31.i386.cpp.app"/>
+									<listOptionValue builtIn="false" value="tizen-emulator-2.1.native_llvm31.i386.cpp.app"/>
 								</option>
 								<option id="gnu.c.compiler.option.include.paths.2147015964" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -96,8 +96,8 @@
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
 									<listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib&quot;"/>
 									<listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib/osp&quot;"/>
-									<listOptionValue builtIn="false" value="-losp-appfw"/>
 									<listOptionValue builtIn="false" value="-losp-uifw"/>
+									<listOptionValue builtIn="false" value="-losp-appfw"/>
 									<listOptionValue builtIn="false" value="-losp-image"/>
 									<listOptionValue builtIn="false" value="-losp-json"/>
 									<listOptionValue builtIn="false" value="-losp-ime"/>
@@ -119,6 +119,7 @@
 									<listOptionValue builtIn="false" value="-losp-speech-stt"/>
 									<listOptionValue builtIn="false" value="-losp-shell"/>
 									<listOptionValue builtIn="false" value="-losp-shell-core"/>
+									<listOptionValue builtIn="false" value="-losp-vision"/>
 									<listOptionValue builtIn="false" value="-lxml2"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.2119600729" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
@@ -131,9 +132,6 @@
 							</tool>
 							<tool id="org.tizen.nativecpp.tool.sbi.po.compiler.248419226" name="PO Resource Compiler" superClass="org.tizen.nativecpp.tool.sbi.po.compiler"/>
 							<tool id="org.tizen.nativecpp.tool.sbi.edc.compiler.2010848909" name="EDC Resource Compiler" superClass="org.tizen.nativecpp.tool.sbi.edc.compiler"/>
-							<tool command="i386-linux-gnueabi-as" id="org.tizen.nativecpp.tool.sbi.gnu.assembler.129530156" name="Assembler" superClass="org.tizen.nativecpp.tool.sbi.gnu.assembler">
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.572685200" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-							</tool>
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
@@ -170,7 +168,7 @@
 								<option id="sbi.gnu.cpp.compiler.option.debugging.level.1500294719" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level"/>
 								<option id="sbi.gnu.cpp.compiler.option.debug.applog.220428565" name="Enable application logging (-D_APP_LOG)" superClass="sbi.gnu.cpp.compiler.option.debug.applog"/>
 								<option id="sbi.gnu.cpp.compiler.option.900296718" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="tizen-emulator-2.0.cpp.partner_llvm31.i386.cpp.app"/>
+									<listOptionValue builtIn="false" value="tizen-emulator-2.1.native_llvm31.i386.cpp.app"/>
 								</option>
 								<option id="gnu.cpp.compiler.option.include.paths.623797688" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -197,7 +195,7 @@
 								<option id="sbi.gnu.c.compiler.option.debugging.level.2037589780" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level"/>
 								<option id="sbi.gnu.c.compiler.option.debug.applog.930351060" name="Enable application logging (-D_APP_LOG)" superClass="sbi.gnu.c.compiler.option.debug.applog"/>
 								<option id="sbi.gnu.c.compiler.option.623943791" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="tizen-emulator-2.0.cpp.partner_llvm31.i386.cpp.app"/>
+									<listOptionValue builtIn="false" value="tizen-emulator-2.1.native_llvm31.i386.cpp.app"/>
 								</option>
 								<option id="gnu.c.compiler.option.include.paths.499488519" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -232,8 +230,8 @@
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
 									<listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib&quot;"/>
 									<listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib/osp&quot;"/>
-									<listOptionValue builtIn="false" value="-losp-appfw"/>
 									<listOptionValue builtIn="false" value="-losp-uifw"/>
+									<listOptionValue builtIn="false" value="-losp-appfw"/>
 									<listOptionValue builtIn="false" value="-losp-image"/>
 									<listOptionValue builtIn="false" value="-losp-json"/>
 									<listOptionValue builtIn="false" value="-losp-ime"/>
@@ -255,6 +253,7 @@
 									<listOptionValue builtIn="false" value="-losp-speech-stt"/>
 									<listOptionValue builtIn="false" value="-losp-shell"/>
 									<listOptionValue builtIn="false" value="-losp-shell-core"/>
+									<listOptionValue builtIn="false" value="-losp-vision"/>
 									<listOptionValue builtIn="false" value="-lxml2"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.140241049" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
@@ -267,7 +266,7 @@
 							</tool>
 							<tool id="org.tizen.nativecpp.tool.sbi.po.compiler.1356965384" name="PO Resource Compiler" superClass="org.tizen.nativecpp.tool.sbi.po.compiler"/>
 							<tool id="org.tizen.nativecpp.tool.sbi.edc.compiler.1251472052" name="EDC Resource Compiler" superClass="org.tizen.nativecpp.tool.sbi.edc.compiler"/>
-							<tool command="i386-linux-gnueabi-as" id="org.tizen.nativecpp.tool.sbi.gnu.assembler.570781551" name="Assembler" superClass="org.tizen.nativecpp.tool.sbi.gnu.assembler">
+							<tool command="i386-linux-gnueabi-as" id="org.tizen.nativecpp.tool.sbi.gnu.assembler.570781551" name="Assembler">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.289169113" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 						</toolChain>
@@ -310,7 +309,7 @@
 									<listOptionValue builtIn="false" value="_USE_DA_"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.417528574" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="tizen-emulator-2.0.cpp.partner_llvm31.i386.cpp.app"/>
+									<listOptionValue builtIn="false" value="tizen-emulator-2.1.native_llvm31.i386.cpp.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks.cpp.1841777387" name="Tizen-Frameworks" superClass="sbi.gnu.cpp.compiler.option.frameworks.cpp" valueType="userObjs">
 									<listOptionValue builtIn="false" value="osp"/>
@@ -338,7 +337,7 @@
 									<listOptionValue builtIn="false" value="_USE_DA_"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.1978908648" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="tizen-emulator-2.0.cpp.partner_llvm31.i386.cpp.app"/>
+									<listOptionValue builtIn="false" value="tizen-emulator-2.1.native_llvm31.i386.cpp.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks.cpp.318626302" name="Tizen-Frameworks" superClass="sbi.gnu.c.compiler.option.frameworks.cpp" valueType="userObjs">
 									<listOptionValue builtIn="false" value="osp"/>
@@ -374,8 +373,8 @@
 									<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
 									<listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib&quot;"/>
 									<listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib/osp&quot;"/>
-									<listOptionValue builtIn="false" value="-losp-appfw"/>
 									<listOptionValue builtIn="false" value="-losp-uifw"/>
+									<listOptionValue builtIn="false" value="-losp-appfw"/>
 									<listOptionValue builtIn="false" value="-losp-image"/>
 									<listOptionValue builtIn="false" value="-losp-json"/>
 									<listOptionValue builtIn="false" value="-losp-ime"/>
@@ -397,6 +396,7 @@
 									<listOptionValue builtIn="false" value="-losp-speech-stt"/>
 									<listOptionValue builtIn="false" value="-losp-shell"/>
 									<listOptionValue builtIn="false" value="-losp-shell-core"/>
+									<listOptionValue builtIn="false" value="-losp-vision"/>
 									<listOptionValue builtIn="false" value="-lxml2"/>
 								</option>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1884830703" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
@@ -409,7 +409,7 @@
 							</tool>
 							<tool id="org.tizen.nativecpp.tool.sbi.po.compiler.698484456" name="PO Resource Compiler" superClass="org.tizen.nativecpp.tool.sbi.po.compiler"/>
 							<tool id="org.tizen.nativecpp.tool.sbi.edc.compiler.281241436" name="EDC Resource Compiler" superClass="org.tizen.nativecpp.tool.sbi.edc.compiler"/>
-							<tool command="i386-linux-gnueabi-as" id="org.tizen.nativecpp.tool.sbi.gnu.assembler.205853613" name="Assembler" superClass="org.tizen.nativecpp.tool.sbi.gnu.assembler">
+							<tool command="i386-linux-gnueabi-as" id="org.tizen.nativecpp.tool.sbi.gnu.assembler.205853613" name="Assembler">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1921438963" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 						</toolChain>
diff --git a/.project b/.project
index 40b6a53..71ca132 100644
--- a/.project
+++ b/.project
@@ -3,7 +3,6 @@
 	<name>Calendar</name>
 	<comment></comment>
 	<projects>
-		<project>CalendarService</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/manifest.xml b/manifest.xml
index e3b1ae6..5a0fef3 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -3,74 +3,20 @@
     <Id>ph1vq2phrp</Id>
     <Version>1.0.0</Version>
     <Type>C++App</Type>
-    <Author/>
-    <Descriptions>
-        <Description Locale="eng-PH"/>
-        <Description Locale="zho-SG"/>
-        <Description Locale="kat-GE"/>
-        <Description Locale="est-EE"/>
-        <Description Locale="ukr-UA"/>
-        <Description Locale="srp-RS"/>
-        <Description Locale="hrv-HR"/>
-        <Description Locale="isl-IS"/>
-        <Description Locale="ell-GR"/>
-        <Description Locale="glg-ES"/>
-        <Description Locale="lit-LT"/>
-        <Description Locale="aze-AZ"/>
-        <Description Locale="eng-US"/>
-        <Description Locale="mkd-MK"/>
-        <Description Locale="zho-HK"/>
-        <Description Locale="slk-SK"/>
-        <Description Locale="hun-HU"/>
-        <Description Locale="hye-AM"/>
-        <Description Locale="ces-CZ"/>
-        <Description Locale="fin-FI"/>
-        <Description Locale="ara-AE"/>
-        <Description Locale="eus-ES"/>
-        <Description Locale="ita-IT"/>
-        <Description Locale="tur-TR"/>
-        <Description Locale="rus-RU"/>
-        <Description Locale="cat-ES"/>
-        <Description Locale="kaz-KZ"/>
-        <Description Locale="deu-DE"/>
-        <Description Locale="zho-CN"/>
-        <Description Locale="por-PT"/>
-        <Description Locale="slv-SI"/>
-        <Description Locale="fra-FR"/>
-        <Description Locale="ron-RO"/>
-        <Description Locale="hin-IN"/>
-        <Description Locale="fra-CA"/>
-        <Description Locale="spa-ES"/>
-        <Description Locale="nld-NL"/>
-        <Description Locale="dan-DK"/>
-        <Description Locale="por-BR"/>
-        <Description Locale="bul-BG"/>
-        <Description Locale="zho-TW"/>
-        <Description Locale="jpn-JP"/>
-        <Description Locale="swe-SE"/>
-        <Description Locale="kor-KR"/>
-        <Description Locale="spa-MX"/>
-        <Description Locale="nob-NO"/>
-        <Description Locale="uzb-UZ"/>
-        <Description Locale="pol-PL"/>
-        <Description Locale="gle-IE"/>
-        <Description Locale="lav-LV"/>
-        <Description Locale="eng-GB"/>
-    </Descriptions>
     <Requirements>
-        <Feature Name="http://tizen.org/feature/platform.core.cpu.arch">x86</Feature>
-        <Feature Name="http://tizen.org/feature/platform.core.fpu.arch">vfpv3</Feature>
+        <Feature Name="http://tizen.org/feature/platform.core.cpu.arch.armv7">true</Feature>
+        <Feature Name="http://tizen.org/feature/platform.core.fpu.arch.vfpv3">true</Feature>
     </Requirements>
     <Apps>
-        <ApiVersion>2.0</ApiVersion>
+        <ApiVersion>2.1</ApiVersion>
         <Privileges>
-            <Privilege>http://tizen.org/privilege/account.read</Privilege>
             <Privilege>http://tizen.org/privilege/calendar.read</Privilege>
+            <Privilege>http://tizen.org/privilege/application.launch</Privilege>
             <Privilege>http://tizen.org/privilege/setting</Privilege>
             <Privilege>http://tizen.org/privilege/calendar.write</Privilege>
-	    <Privilege>http://tizen.org/privilege/application.launch</Privilege>
+            <Privilege>http://tizen.org/privilege/account.read</Privilege>
         </Privileges>
-        <UiApp Main="True" MenuIconVisible="True" Name="Calendar" SubMode="True">
+        <UiApp LaunchingHistoryVisible="True" Main="True" MenuIconVisible="True" Name="Calendar" SubMode="True">
             <UiScalability BaseScreenSize="Normal" CoordinateSystem="Logical" LogicalCoordinate="720"/>
             <UiTheme SystemTheme="White"/>
             <DisplayNames>
@@ -131,15 +77,16 @@
             </Icons>
             <AppControls>
                 <AppControl>
-                    <Operation>http://tizen.org/appcontrol/operation/add</Operation>
-                    <Operation>http://tizen.org/appcontrol/operation/view</Operation>
                     <Operation>http://tizen.org/appcontrol/operation/social/edit</Operation>
                     <Operation>http://tizen.org/appcontrol/operation/social/pick</Operation>
                     <Operation>http://tizen.org/appcontrol/operation/social/view</Operation>
                 </AppControl>
+                <AppControl>
+                    <MimeType>text/x-vCalendar</MimeType>
+                    <Operation>http://tizen.org/appcontrol/operation/view</Operation>
+                </AppControl>
             </AppControls>
             <LaunchConditions/>
-            <Notifications/>
         </UiApp>
     </Apps>
 </Manifest>
-- 
2.7.4