From d0175341a58aafc4b65768bced50f203931c7b5a Mon Sep 17 00:00:00 2001 From: "jungmin76.park" Date: Fri, 22 Mar 2013 00:03:08 +0900 Subject: [PATCH] apply shorcut request listener capi change. Change-Id: Iba85b1fa2492b1091a4492e6a0600ea6c45679e0 Signed-off-by: jungmin76.park --- src/FShell_AppWidgetManagerImpl.cpp | 2 +- src/core/FShell_ShortcutManagerImpl.cpp | 8 ++++---- src/inc/FShell_ShortcutManagerImpl.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/FShell_AppWidgetManagerImpl.cpp b/src/FShell_AppWidgetManagerImpl.cpp index f05b1bb..0c4b037 100644 --- a/src/FShell_AppWidgetManagerImpl.cpp +++ b/src/FShell_AppWidgetManagerImpl.cpp @@ -166,7 +166,7 @@ _AppWidgetManagerImpl::IsAppWidgetProviderDefault(const Tizen::App::AppId& appId } // c - style callback for shortcut_set_request_cb -int AppWidgetRequestHandlerCallback(const char* providerId, const char* text, int type, const char* content_info, const char* icon, int pid, double period, void *data) +int AppWidgetRequestHandlerCallback(const char* providerId, const char* text, int type, const char* content_info, const char* icon, int pid, double period, bool allowDuplication, void *data) { SysLog(NID_APP, "Enter"); SysTryReturn(NID_APP, providerId, 0, E_SYSTEM, "[E_SYSTEM] providerId is null!"); diff --git a/src/core/FShell_ShortcutManagerImpl.cpp b/src/core/FShell_ShortcutManagerImpl.cpp index 02187b4..2185a36 100644 --- a/src/core/FShell_ShortcutManagerImpl.cpp +++ b/src/core/FShell_ShortcutManagerImpl.cpp @@ -62,7 +62,7 @@ _ShortcutManagerImpl::GetInstance() return __pShortcutManagerImpl; } -int ShortcutRequestEventHandlerCB(const char* appId, const char* text, int type, const char* content_info, const char* icon, int pid, double period, void *data) +int ShortcutRequestEventHandlerCB(const char* appId, const char* text, int type, const char* content_info, const char* icon, int pid, double period, bool allowDuplication, void *data) { SysTryReturn(NID_APP, appId, 0, E_SYSTEM, "[E_SYSTEM] appId is null!"); SysLog(NID_APP, "Tizen::Shell::ShortcutManager - Shortcut request received."); @@ -89,7 +89,7 @@ int ShortcutRequestEventHandlerCB(const char* appId, const char* text, int type, } // c - style callback for shortcut_set_request_cb -int ShortcutRequestEventReceiverCB(const char* appId, const char* text, int type, const char* content_info, const char* icon, int pid, double period, void *data) +int ShortcutRequestEventReceiverCB(const char* appId, const char* text, int type, const char* content_info, const char* icon, int pid, double period, allowDuplication, void *data) { SysTryReturn(NID_APP, appId, 0, E_SYSTEM, "[E_SYSTEM] providerId is null!"); @@ -97,14 +97,14 @@ int ShortcutRequestEventReceiverCB(const char* appId, const char* text, int type || type == SHORTCUT_DATA || type == SHORTCUT_DATA) { - ShortcutRequestEventHandlerCB(appId, text, type, content_info, icon, pid, period, data); + ShortcutRequestEventHandlerCB(appId, text, type, content_info, icon, pid, period, allowDuplication, data); } else { if( __pAppWidgetRequestHandlerCallback != null) { SysLog(NID_APP, "Invoking appwidget request handler."); - __pAppWidgetRequestHandlerCallback(appId, text, type, content_info, icon, pid, period, data); + __pAppWidgetRequestHandlerCallback(appId, text, type, content_info, icon, pid, period, allowDuplication, data); } } diff --git a/src/inc/FShell_ShortcutManagerImpl.h b/src/inc/FShell_ShortcutManagerImpl.h index 7673e37..576cfbf 100644 --- a/src/inc/FShell_ShortcutManagerImpl.h +++ b/src/inc/FShell_ShortcutManagerImpl.h @@ -111,7 +111,7 @@ public: result RemoveShortcutRequestListener(IShortcutRequestListener& listener); // internal - void SetAppWidgetRequestHandlerCallback(int(*PShortcutRequestCallback)(const char *appid, const char *name, int type, const char *content_info, const char *icon, int pid, double period, void *data)); + void SetAppWidgetRequestHandlerCallback(int(*PShortcutRequestCallback)(const char *appid, const char *name, int type, const char *content_info, const char *icon, int pid, double period, bool allowDuplication, void *data)); const Tizen::Base::Collection::ArrayListT* GetShortcutRequestListenerList(void) const; private: -- 2.7.4