From 4775ceb0c618e933e9ef8c71bf643583b43a5d12 Mon Sep 17 00:00:00 2001 From: HeeJu Kang Date: Thu, 11 Jul 2013 13:59:34 +0900 Subject: [PATCH] Fix init t/c Change-Id: I229702866022164b1901465e8900bc8a2600156e Signed-off-by: HeeJu Kang --- src/FShell_AppWidgetViewModel.cpp | 7 +++++-- src/FShell_AppWidgetViewModel.h | 2 +- src/FShell_AppWidgetViewPresenter.cpp | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/FShell_AppWidgetViewModel.cpp b/src/FShell_AppWidgetViewModel.cpp index 4c6d615..57fa18f 100644 --- a/src/FShell_AppWidgetViewModel.cpp +++ b/src/FShell_AppWidgetViewModel.cpp @@ -40,7 +40,7 @@ _AppWidgetViewModel::~_AppWidgetViewModel(void) { } -void +result _AppWidgetViewModel::Initialize(const AppId& appId, const Tizen::Base::String& providerName) { __appId = appId; @@ -50,9 +50,12 @@ _AppWidgetViewModel::Initialize(const AppId& appId, const Tizen::Base::String& p SysSecureLog(NID_SHELL, "(%ls %ls %ls)", __appId.GetPointer(), __providerName.GetPointer(), __appwidgetId.GetPointer()); AppWidgetProviderInfo* pAppWidgetProviderInfo = AppWidgetManager::GetInstance()->GetAppWidgetProviderInfoN(appId, providerName); - SysTryReturnVoidResult(NID_SHELL, pAppWidgetProviderInfo, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory is insufficient."); + result r = GetLastResult(); + SysTryReturn(NID_SHELL, pAppWidgetProviderInfo, r, r, "[%s] Propagating.", GetErrorMessage(r)); __pAppWidgetProviderInfo.reset(pAppWidgetProviderInfo); + + return r; } AppId diff --git a/src/FShell_AppWidgetViewModel.h b/src/FShell_AppWidgetViewModel.h index 2d87acd..b78cc89 100644 --- a/src/FShell_AppWidgetViewModel.h +++ b/src/FShell_AppWidgetViewModel.h @@ -40,7 +40,7 @@ public: virtual ~_AppWidgetViewModel(void); public: - void Initialize(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName); + result Initialize(const Tizen::App::AppId& appId, const Tizen::Base::String& providerName); Tizen::App::AppId GetAppId(void) const; Tizen::Base::String GetAppWidgetId(void) const; Tizen::Base::String GetProviderName(void) const; diff --git a/src/FShell_AppWidgetViewPresenter.cpp b/src/FShell_AppWidgetViewPresenter.cpp index f0b4083..81ea8c0 100644 --- a/src/FShell_AppWidgetViewPresenter.cpp +++ b/src/FShell_AppWidgetViewPresenter.cpp @@ -57,12 +57,13 @@ _AppWidgetViewPresenter::Initialize(const AppId& appId, const Tizen::Base::Strin { const int FONT_SIZE = 20; - __pAppWidgetViewModel->Initialize(appId, providerName); + result r = __pAppWidgetViewModel->Initialize(appId, providerName); + SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); unique_ptr pFont(new (std::nothrow) Font()); SysTryReturn(NID_SHELL, pFont, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory is insufficient."); - result r = pFont->Construct(FONT_STYLE_BOLD, FONT_SIZE); + r = pFont->Construct(FONT_STYLE_BOLD, FONT_SIZE); SysTryReturn(NID_SHELL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); std::unique_ptr pTextObject(new (std::nothrow) TextObject()); -- 2.7.4