From: so.yu Date: Sun, 17 Mar 2013 07:10:15 +0000 (+0900) Subject: Change the application name X-Git-Tag: submit/tizen/20130830.084259~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52192f49ec432869df375b5573bd5b8b42f054b1;p=platform%2Fframework%2Fnative%2Fcertificate-selector.git Change the application name Change-Id: I2f506b9d7fc5ef5d416a81d1daf37e11d91c531a Signed-off-by: so.yu --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b07d70..291d4f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) # Set application name and PKG_ID -SET(this_target ac-certificate-manager) +SET(this_target CertificateSelector) SET(PKG_ID hyCsE05ySM) # Include directories @@ -26,10 +26,6 @@ TARGET_LINK_LIBRARIES(${this_target} -pie -L/usr/lib/osp osp-appfw osp-uifw) # Copy resources INSTALL(TARGETS ${this_target} DESTINATION ../usr/apps/${PKG_ID}/bin) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.Apache-2.0 DESTINATION ../usr/apps/${PKG_ID}) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/NOTICE DESTINATION ../usr/apps/${PKG_ID}) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/AUTHORS DESTINATION ../usr/apps/${PKG_ID}) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/ac-certificate-manager.manifest DESTINATION ../usr/apps/${PKG_ID}) INSTALL(FILES ${CMAKE_SOURCE_DIR}/manifest.xml DESTINATION ../usr/apps/${PKG_ID}/info) INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res DESTINATION ../usr/apps/${PKG_ID}) INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/shared DESTINATION ../usr/apps/${PKG_ID}) diff --git a/ac-certificate-manager.manifest b/ac-certificate-manager.manifest deleted file mode 100644 index 5c23238..0000000 --- a/ac-certificate-manager.manifest +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/inc/CertificateSelectorApp.h b/inc/CertificateSelectorApp.h index 0bd1a1e..4e35005 100644 --- a/inc/CertificateSelectorApp.h +++ b/inc/CertificateSelectorApp.h @@ -46,8 +46,8 @@ public: static Tizen::App::UiApp* CreateInstance(void); virtual bool OnAppInitializing(Tizen::App::AppRegistry& appRegistry); - virtual bool OnAppInitialized(void); - virtual bool OnAppWillTerminate(void); + virtual bool OnAppInitialized(void); + virtual bool OnAppWillTerminate(void); virtual bool OnAppTerminating(Tizen::App::AppRegistry& appRegistry, bool forcedTermination = false); virtual void OnForeground(void); virtual void OnBackground(void); diff --git a/manifest.xml b/manifest.xml index 6f77117..82c7a21 100644 --- a/manifest.xml +++ b/manifest.xml @@ -11,18 +11,18 @@ 2.0 - + - ac-certificate-manager + CertificateSelector mainmenu.png - http://tizen.org/appcontrol/operation/pick + http://tizen.org/appcontrol/operation/pick diff --git a/packaging/ac-certificate-manager.spec b/packaging/apps.CertificateSelector.spec similarity index 77% rename from packaging/ac-certificate-manager.spec rename to packaging/apps.CertificateSelector.spec index c2a451a..ba1b627 100644 --- a/packaging/ac-certificate-manager.spec +++ b/packaging/apps.CertificateSelector.spec @@ -1,19 +1,18 @@ -Name: ac-certificate-manager -Summary: The app-control of the certificate manager -Version: 1.2.1.0 -Release: 1 -Group: TO_BE/FILLED_IN -License: Apache License, Version 2.0 -Source0: %{name}-%{version}.tar.gz +Name: apps.CertificateSelector +Summary: The app-control of the certificate manager +Version: 1.2.1.0 +Release: 1 +Group: TO_BE/FILLED_IN +License: Apache License, Version 2.0 +Source0: %{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: pkgconfig(osp-appfw) BuildRequires: osp-appfw-internal-devel BuildRequires: pkgconfig(osp-uifw) -Requires: chromium -Requires: osp-security-service -Requires: osp-installer -Requires: pkgcmd +Requires: chromium +Requires: osp-security-service +Requires: pkgmgr %description The app-control of the certificate manager @@ -50,7 +49,6 @@ PKG_ID=hyCsE05ySM pkgcmd -q -u -t tpk -n ${PKG_ID} %files -%manifest ac-certificate-manager.manifest %defattr(-,root,root,-) /usr/share/license/%{name} /usr/apps/* diff --git a/src/CertificateSelectorApp.cpp b/src/CertificateSelectorApp.cpp index 3046965..6213f73 100644 --- a/src/CertificateSelectorApp.cpp +++ b/src/CertificateSelectorApp.cpp @@ -52,7 +52,7 @@ bool CertificateSelectorApp::OnAppInitializing(AppRegistry& appRegistry) { result r = E_SUCCESS; - + r = Tizen::App::AppControlProviderManager::GetInstance()->SetAppControlProviderEventListener(this); return true; } diff --git a/src/CertificateSelectorFrame.cpp b/src/CertificateSelectorFrame.cpp index 18c9aa7..b77523a 100644 --- a/src/CertificateSelectorFrame.cpp +++ b/src/CertificateSelectorFrame.cpp @@ -48,7 +48,7 @@ CertificateSelectorFrame::OnInitializing(void) { result r = E_SUCCESS; Form* pForm = null; - + std::unique_ptr pCertificateSelectorForm(new (std::nothrow) CertificateSelectorForm()); TryReturnResult(pCertificateSelectorForm, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY , "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY)); @@ -61,7 +61,7 @@ CertificateSelectorFrame::OnInitializing(void) r = AddControl(*pForm); TryReturnResult(!IsFailed(r), r, r, "[%s] Propagating.", GetErrorMessage(r)); - + r = SetCurrentForm(*pForm); TryReturnResult(!IsFailed(r), r, r, "[%s] Propagating.", GetErrorMessage(r));