summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyuho Jo <kyuho.jo@samsung.com>2015-02-24 21:11:23 +0900
committerKyuho Jo <kyuho.jo@samsung.com>2015-02-24 21:11:23 +0900
commitd474c8b851b991558556d367a27e761fb2c03170 (patch)
treed04ed484386991a10ee1004b08abd44ae00941cb
parent1b30d07bb82b2a7f8f4770eb4dc0b148391447af (diff)
downloadwidget-service-d474c8b851b991558556d367a27e761fb2c03170.tar.gz
widget-service-d474c8b851b991558556d367a27e761fb2c03170.tar.bz2
widget-service-d474c8b851b991558556d367a27e761fb2c03170.zip
modify API set by tizen API guide
Change-Id: I036c0f935ebd3b7e8b634c6897202e36b8f6ba77 Signed-off-by: Kyuho Jo <kyuho.jo@samsung.com>
-rwxr-xr-xdoc/widget_service_doc.h20
-rwxr-xr-xinclude/widget_buffer.h4
-rwxr-xr-xinclude/widget_errno.h9
-rwxr-xr-xinclude/widget_service.h193
-rwxr-xr-xpackaging/libwidget_service.spec2
-rwxr-xr-xsrc/widget_service.c343
6 files changed, 340 insertions, 231 deletions
diff --git a/doc/widget_service_doc.h b/doc/widget_service_doc.h
index 7d8f681..bd25584 100755
--- a/doc/widget_service_doc.h
+++ b/doc/widget_service_doc.h
@@ -18,37 +18,37 @@
#define __WIDGET_SERVICE_DOC_H__
/**
- * @defgroup WIDGET_SERVICE_MODULE Dynamic Box
+ * @defgroup WIDGET_SERVICE_MODULE widget
* @brief To get the information of installed Dynamic Boxes
* @ingroup CAPI_WIDGET_FRAMEWORK
* @section WIDGET_SERVICE_MODULE_HEADER Required Header
* \#include <widget_service.h>
* \#include <widget_errno.h>
* @section WIDGET_SERVICE_MODULE_OVERVIEW Overview
-<H1>1. Dynamic Box Service API</H1>
+<H1>1. widget Service API</H1>
Tizen supports various kinds of API set for retrieving information of Dynamic Boxes.
Every Dynamic Boxes are installed via package manager utilities.
The information of installed Dynamic Boxes are stored in the system DB.
-In some cases, application developer needs to send update request to its Dynamic Box.
+In some cases, application developer needs to send update request to its widget.
To make it possible, this module providers such kinds of API set.
Those APIs are for communicating with master service provider called data-provider-master.
-When it receives request from applications, it will find the proper service provider called data-provider-slave or application Dynamic Box Provider.
+When it receives request from applications, it will find the proper service provider called data-provider-slave or application widget Provider.
If master finds proper service provider, it will forward the requests to them.
-Then each Dynamic Box application can get update request.
+Then each widget application can get update request.
<H2>1.1 APIs for retrieving information of Dynamic Boxes</H2>
To get the information for installed dynamic boxes.
-<H2>1.2 APIs for communicating with running Dynamic Box instances</H2>
+<H2>1.2 APIs for communicating with running widget instances</H2>
-To trigger the update event or send the updated content string to the dynamic box.
+To trigger the update event or send the updated content string to the widget.
-<H1>2. Size of Dynamic Box</H1>
+<H1>2. Size of widget</H1>
-Dynamic Box has predefined size types.
+widget has predefined size types.
<TABLE>
<TH>
@@ -83,7 +83,7 @@ Dynamic Box has predefined size types.
</TR>
</TABLE>
-Dynamic Box also handles Easy Mode.
+widget also handles Easy Mode.
For the easy mode, there are different size types.
Called WIDGET_SIZE_TYPE_EASY_NxM
diff --git a/include/widget_buffer.h b/include/widget_buffer.h
index e278ee9..400f371 100755
--- a/include/widget_buffer.h
+++ b/include/widget_buffer.h
@@ -71,7 +71,7 @@ typedef enum widget_target_type {
/**
* @internal
- * @brief Dynamic Box Frame Buffer Info
+ * @brief widget Frame Buffer Info
* @since_tizen 2.3
*/
struct fb_info {
@@ -111,7 +111,7 @@ typedef struct widget_lock_info {
/**
* @internal
- * @brief Dynamic Box Buffer structure
+ * @brief widget Buffer structure
* @since_tizen 2.3
*/
typedef struct widget_buffer {
diff --git a/include/widget_errno.h b/include/widget_errno.h
index 7bd9c4a..8decfbc 100755
--- a/include/widget_errno.h
+++ b/include/widget_errno.h
@@ -17,6 +17,8 @@
#ifndef __WIDGET_ERRNO_H
#define __WIDGET_ERRNO_H
+#include <tizen_error.h>
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -31,13 +33,16 @@ extern "C" {
* @{
*/
+
+#define TIZEN_ERROR_WIDGET -0x02FE0000
+
/**
* @brief Enumeration for the result status of widget operation.
* @since_tizen 2.3
*/
typedef enum widget_status {
- WIDGET_STATUS_ERROR_NONE = 0x00000000, /**< Operation is successfully completed */
- WIDGET_STATUS_ERROR = 0x80000000, /**< This will be OR'd with other specific error value */
+ WIDGET_STATUS_ERROR_NONE = TIZEN_ERROR_NONE, /**< Operation is successfully completed */
+ WIDGET_STATUS_ERROR = TIZEN_ERROR_WIDGET, /**< This will be OR'd with other specific error value */
WIDGET_STATUS_ERROR_INVALID_PARAMETER = WIDGET_STATUS_ERROR | 0x0001, /**< Invalid request */
WIDGET_STATUS_ERROR_FAULT = WIDGET_STATUS_ERROR | 0x0002, /**< Fault - Unable to recover from the error */
WIDGET_STATUS_ERROR_OUT_OF_MEMORY = WIDGET_STATUS_ERROR | 0x0004, /**< Memory is not enough to do this operation */
diff --git a/include/widget_service.h b/include/widget_service.h
index 4fbc1f8..ba671c8 100755
--- a/include/widget_service.h
+++ b/include/widget_service.h
@@ -239,7 +239,7 @@ typedef enum widget_buffer_event {
/**
* @internal
- * @brief Dynamic Box Buffer Event Data
+ * @brief widget Buffer Event Data
* @since_tizen 2.4
*/
typedef struct widget_buffer_event_data {
@@ -296,11 +296,12 @@ typedef struct widget_pkglist_handle *widget_pkglist_h;
* @param[in] type Size type
* @param[out] width Pixel size width
* @param[out] height Pixel size height
- * @return int type
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
* @retval #WIDGET_STATUS_ERROR_PERMISSION_DENIED Permission denied
* @retval #WIDGET_STATUS_ERROR_NONE Successfully done
* @see widget_size_type()
- * @see widget_service_size_type()
+ * @see widget_service_get_size_type()
*/
extern int widget_service_get_size(widget_size_type_e type, int *width, int *height);
@@ -324,77 +325,84 @@ extern int widget_service_get_size(widget_size_type_e type, int *width, int *hei
* or\n
* #WIDGET_SIZE_TYPE_UNKNOWN for error.
* @since_tizen 2.4
+ * @feature http://tizen.org/feature/shell.appwidget
* @param[in] width Pixel size width
* @param[in] height Pixel size height
- * @feature http://tizen.org/feature/shell.appwidget
- * @return int type
- * @retval #WIDGET_SIZE_TYPE_[EASY_]WxH Size type of given pixel size
- * @retval #WIDGET_SIZE_TYPE_UNKNOWN If the given pixel size is not valid, widget_last_status() will returns reason of failure.
+ * @param[out] size_type Widget size type\n
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
+ * @retval #WIDGET_STATUS_ERROR_INVALID_PARAMETER Invalid parameter was given.
* @see widget_size_type()
* @see widget_service_get_size()
*/
-extern widget_size_type_e widget_service_size_type(int width, int height);
+extern int widget_service_get_size_type(int width, int height, widget_size_type_e *size_type);
/**
- * @brief Supports the mouse event of widget content.
- * @details This function will returns true/false, but even if this fails to access database to retrieve information,
- * This will returns 0. in that case, you can check it using widget_last_status() function.
- * If there is an error, it will returns proper error code.
+ * @brief Gets the need of mouse event for the given widget .
+ * @details This function gets need of mouse event for the given widget from database.\n
+ * The value of mouse event requirement means... \n
+ * 1 : The widget requires mouse event. A viewer must has to feed the mouse event to the widget instance\n
+ * 0 : The widget doesn't require mouse event.\n
* @since_tizen 2.4
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @param[in] widgetid widget AppId
- * @return int type
- * @retval 1 If the box requires mouse event, A viewer must has to feed the mouse event to the box instance
- * @retval 0 If the box doesn't requires mouse event, In this case, you can check whether it is error or not using widget_last_status() function.
- * @see widget_service_touch_effect()
- * @see widget_service_need_frame()
- * @see widget_last_status()
+ * @param[in] widget_id widget app id
+ * @param[in] size_type widget size type
+ * @param[out] need_of_mouse_event the need of mouse event
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
+ * @retval #WIDGET_STATUS_ERROR_INVALID_PARAMETER Invalid parameter was given.
+ * @retval #WIDGET_STATUS_ERROR_IO_ERROR Some error occurs on opening DB file.
+ * @see widget_size_type_e
+ * @see widget_service_get_need_of_touch_effect()
+ * @see widget_service_get_need_of_frame()
*/
-extern int widget_service_mouse_event(const char *widgetid, int size_type);
+extern int widget_service_get_need_of_mouse_event(const char *widget_id, widget_size_type_e size_type, int *need_of_mouse_event);
/**
- * @brief Requires touch effect.
- * @details If this API returns true(1), the viewer should make touch effect when a user click the widget.
- * This function returns 1 even if it fails to retrieve information from Database.
- * So if you need validate the information whether it is correct or not, you can use widget_last_status() function.
- * Even if this function returns 1, It is recommended to check last status of this function call.
+ * @brief Gets the need of touch effect for the given widget.
+ * @details This API gets the need of touch effect for the given widget from database.\n
+ * The value of the need of touch effect means... \n
+ * 1 : A viewer is required to make the touch effect when a user click the widget, but it is just recommendation.\n
+ * 0 : A viewer is not required to make the touch effect, the box will make touch effect itself.
* @since_tizen 2.4
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @param[in] widgetid widget AppId
+ * @param[in] widget_id widget app id
* @param[in] size_type Size type
- * @return int type
- * @retval 1 If the box requires touch effect, A viewer should make the touch effect, but it is just recomendation.
- * @retval 0 If the box doesn't requires touch effect, the box will make touch effect itself
- * @see widget_service_mouse_event()
- * @see widget_service_need_frame()
- * @see widget_last_status()
- */
-extern int widget_service_touch_effect(const char *widgetid, int size_type);
+ * @param[out] need_of_touch_event the need of touch effect
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
+ * @retval #WIDGET_STATUS_ERROR_INVALID_PARAMETER Invalid parameter was given.
+ * @retval #WIDGET_STATUS_ERROR_IO_ERROR Some error occurs on opening DB file.
+ * @see widget_size_type_e
+ * @see widget_service_get_need_of_mouse_event()
+ * @see widget_service_get_need_of_frame()
+ */
+extern int widget_service_get_need_of_touch_effect(const char *widget_id, widget_size_type_e size_type, int *need_of_touch_event);
/**
- * @brief Requires decoration frame.
- * @details If this API returns true(1), the viewer should make decoration border on the widget content.
- * If this function returns 0, you can validate it using widget_last_status() function.
- * If something goes wrong, so this fails to retrieve information, you can check reason why it fails to get it
- * using widget_last_status() function.
+ * @brief Gets the need of decoration frame for the given widget.
+ * @details This API gets the need of decoration frame for the given widget from database.\n
+ * The value of the need of touch effect means... \n
+ * 1 : the viewer should make decoration frame on outside of the widget.
+ * 0 : no need to amke decoration frame.
* @since_tizen 2.4
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @param[in] widgetid widget AppId
+ * @param[in] widget_id widget app id
* @param[in] size_type Size type
- * @return int type
- * @retval 1 If the box requires frame for decorating its contents
- * @retval 0 If the box doesn't requires frame
- * @see widget_service_mouse_event()
- * @see widget_service_touch_effect()
- * @see widget_last_status()
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
+ * @retval #WIDGET_STATUS_ERROR_INVALID_PARAMETER Invalid parameter was given.
+ * @retval #WIDGET_STATUS_ERROR_IO_ERROR Some error occurs on opening DB file.
+ * @see widget_service_get_need_of_mouse_event()
+ * @see widget_service_get_need_of_touch_effect()
*/
-extern int widget_service_need_frame(const char *widgetid, int size_type);
+extern int widget_service_get_need_of_frame(const char *widget_id, widget_size_type_e size_type, int *need_of_frame);
/**
* @brief Triggers the update event for given widget instance.
@@ -408,7 +416,8 @@ extern int widget_service_need_frame(const char *widgetid, int size_type);
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.provider
* @feature http://tizen.org/feature/shell.appwidget
- * @return int type
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
* @retval #WIDGET_STATUS_ERROR_INVALID_PARAMETER Invalid argument
* @retval #WIDGET_STATUS_ERROR_CANCEL Provider is paused, so this update request is canceld.(ignored), if you want to make update forcely, use force=1
* @retval #WIDGET_STATUS_ERROR_MEMORY Memory is not enough to make request
@@ -428,7 +437,8 @@ extern int widget_service_trigger_update(const char *widgetid, const char *insta
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.provider
* @feature http://tizen.org/feature/shell.appwidget
- * @return int type
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
* @retval #WIDGET_STATUS_ERROR_NONE Successfully changed(requested)
* @retval #WIDGET_STATUS_ERROR_INVALID_PARAMETER Invalid argument
* @retval #WIDGET_STATUS_ERROR_FAULT Failed to create a request packet
@@ -452,7 +462,8 @@ extern int widget_service_change_period(const char *widgetid, const char *instan
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @return int type
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
* @retval #WIDGET_STATUS_ERROR_IO_ERROR Failed to access DB
* @retval #WIDGET_STATUS_ERROR_INVALID_PARAMETER Invalid argument
* @retval #WIDGET_STATUS_ERROR_PERMISSION_DENIED Permission denied
@@ -475,7 +486,8 @@ extern int widget_service_get_pkglist(int (*cb)(const char *pkgid, const char *w
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @return int type
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
* @retval #WIDGET_STATUS_ERROR_NONE Status success
* @retval #WIDGET_STATUS_ERROR_INVALID_PARAMETER Invalid argument
* @retval #WIDGET_STATUS_ERROR_IO_ERROR Failed to access DB
@@ -497,7 +509,7 @@ extern int widget_service_get_applist(const char *widgetid, void (*cb)(const cha
* @retval appid Main application Id
* @see widget_last_status()
*/
-extern char *widget_service_mainappid(const char *widgetid);
+extern char *widget_service_get_main_app_id(const char *widgetid);
/**
* @internal
@@ -514,7 +526,8 @@ extern char *widget_service_mainappid(const char *widgetid);
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @return int type
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
* @retval int Count of widget packages
* @retval #WIDGET_STATUS_ERROR_INVALID_PARAMETER Invalid argument
* @retval #WIDGET_STATUS_ERROR_IO_ERROR Failed to access DB
@@ -552,14 +565,14 @@ extern int widget_service_get_pkglist_by_category(const char *category, int (*cb
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @param[in] id Dynamic Box Id or Package Id or UI App Id
+ * @param[in] id widget Id or Package Id or UI App Id
* @return char * type
* @retval @c NULL Failed to get primary widgetid, widget_last_status() will returns reason of failure.
* @retval widgetid Primary widget Id. which is allocated in the heap
* @pre Must be released returned string by manually.
* @see widget_service_package_id()
*/
-extern char *widget_service_widget_id(const char *id);
+extern char *widget_service_get_widget_id(const char *id);
/**
* @internal
@@ -569,7 +582,7 @@ extern char *widget_service_widget_id(const char *id);
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @return int type
+ * @return the primary flag of given widget id.
* @retval 0 If is not a primary, widget_last_status() will returns reason of failure if it fails.
* @retval 1 If it is a primary widget
*/
@@ -590,7 +603,7 @@ extern int widget_service_is_primary(const char *widgetid);
* @post N/A
* @see widget_service_widget_id()
*/
-extern char *widget_service_category(const char *widgetid);
+extern char *widget_service_get_category(const char *widgetid);
/**
* @brief Gets the name of a widget (provider name == widget appid), you have to release the return value after use it.
@@ -607,7 +620,7 @@ extern char *widget_service_category(const char *widgetid);
* @retval widgetid widget AppId which is allocated on the heap
* @post Returned string must be free'd manually.
*/
-extern char *widget_service_provider_name(const char *widgetid);
+extern char *widget_service_get_provider_name(const char *widgetid);
/**
* @brief Gets the appId of setup app which is specified by given widget Id's manifest.
@@ -626,7 +639,7 @@ extern char *widget_service_provider_name(const char *widgetid);
* @post Returned string must be free'd manually.
* @see widget_last_status()
*/
-extern char *widget_service_setup_appid(const char *widgetid);
+extern char *widget_service_get_app_id_of_setup_app(const char *widgetid);
/**
* @internal
@@ -642,7 +655,7 @@ extern char *widget_service_setup_appid(const char *widgetid);
* @post Returned string must be free'd manually.
* @see widget_service_widget_id()
*/
-extern char *widget_service_package_id(const char *widgetid);
+extern char *widget_service_get_package_id(const char *widgetid);
/**
* @internal
@@ -660,7 +673,7 @@ extern char *widget_service_package_id(const char *widgetid);
* @see widget_service_i18n_icon()
* @see widget_service_preview()
*/
-extern char *widget_service_i18n_name(const char *widgetid, const char *lang);
+extern char *widget_service_get_i18n_name(const char *widgetid, const char *lang);
/**
* @internal
@@ -679,7 +692,7 @@ extern char *widget_service_i18n_name(const char *widgetid, const char *lang);
* @see widget_service_i18n_icon()
* @see widget_service_i18n_name()
*/
-extern char *widget_service_preview(const char *widgetid, int size_type);
+extern char *widget_service_get_preview_image_path(const char *widgetid, int size_type);
/**
* @internal
@@ -698,7 +711,7 @@ extern char *widget_service_preview(const char *widgetid, int size_type);
* @pre Manifest has the default content string. &lt;content&gt;Default content string&lt;content&gt; tag.
* @post Returned string must be free'd manually.
*/
-extern char *widget_service_content(const char *widgetid);
+extern char *widget_service_get_content_string(const char *widgetid);
/**
* @brief Gives Internationalized icon path of given widget package.
@@ -716,7 +729,7 @@ extern char *widget_service_content(const char *widgetid);
* @see widget_service_i18n_name()
* @see widget_service_preview()
*/
-extern char *widget_service_i18n_icon(const char *pkgid, const char *lang);
+extern char *widget_service_get_i18n_icon(const char *pkgid, const char *lang);
/**
* @internal
@@ -726,12 +739,12 @@ extern char *widget_service_i18n_icon(const char *pkgid, const char *lang);
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @return int type
+ * @return the "nodisplay" value of given widget.
* @retval 1 The box should not be listed by the widget list app
* @retval 0 Box should be listed, widget_last_status() will returns reason of failure if it fails.
* @pre widget tag includes "nodisplay" attribute.
*/
-extern int widget_service_nodisplay(const char *widgetid);
+extern int widget_service_get_nodisplay(const char *widgetid);
/**
* @internal
@@ -746,7 +759,7 @@ extern int widget_service_nodisplay(const char *widgetid);
* @retval @c NULL Failed to get ABI of given widget, widget_last_status() will returns reason of failure if it fails.
* @post Returned string must be free'd manually.
*/
-extern char *widget_service_abi(const char *widgetid);
+extern char *widget_service_get_abi(const char *widgetid);
/**
* @internal
@@ -758,7 +771,7 @@ extern char *widget_service_abi(const char *widgetid);
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @return int type
+ * @return the status of the widget.
* @retval 1 Enabled
* @retval 0 Disabled
*/
@@ -779,7 +792,7 @@ extern int widget_service_is_enabled(const char *widgetid);
* @post Return'd string must be free'd manually.
* @see widget_service_widget_script_group()
*/
-extern char *widget_service_widget_script_path(const char *widgetid);
+extern char *widget_service_get_widget_script_path(const char *widgetid);
/**
* @internal
@@ -796,7 +809,7 @@ extern char *widget_service_widget_script_path(const char *widgetid);
* @post Return'd string must be free'd manually.
* @see widget_service_widget_script_path()
*/
-extern char *widget_service_widget_script_group(const char *widgetid);
+extern char *widget_service_get_widget_script_group(const char *widgetid);
/**
* @internal
@@ -812,7 +825,7 @@ extern char *widget_service_widget_script_group(const char *widgetid);
* @post Returned string must be free'd manually.
* @see widget_service_gbar_script_group()
*/
-extern char *widget_service_gbar_script_path(const char *widgetid);
+extern char *widget_service_get_gbar_script_path(const char *widgetid);
/**
* @internal
@@ -828,7 +841,7 @@ extern char *widget_service_gbar_script_path(const char *widgetid);
* @post Returned string must be free'd manually.
* @see widget_service_gbar_script_path()
*/
-extern char *widget_service_gbar_script_group(const char *widgetid);
+extern char *widget_service_get_gbar_script_group(const char *widgetid);
/**
* @internal
@@ -844,7 +857,8 @@ extern char *widget_service_gbar_script_group(const char *widgetid);
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @return int type
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
* @retval #WIDGET_STATUS_ERROR_NONE If succeed to get supported size list
* @retval #WIDGET_STATUS_ERROR_IO_ERROR Failed to access DB
* @retval #WIDGET_STATUS_ERROR_INVALID_PARAMETER Invalid argument
@@ -864,7 +878,8 @@ extern int widget_service_get_supported_sizes(const char *widgetid, int *cnt, in
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @return int type
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
* @retval #WIDGET_STATUS_ERROR_INVALID_PARAMETER Invalid argument
* @retval #WIDGET_STATUS_ERROR_IO_ERROR Failed to access DB
* @retval #WIDGET_STATUS_ERROR_NONE Successfully done
@@ -883,7 +898,8 @@ extern int widget_service_get_supported_size_types(const char *widgetid, int *cn
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @return int type
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
* @retval #WIDGET_STATUS_ERROR_NONE Successfully done
* @retval #WIDGET_STATUS_ERROR_IO_ERROR Failed to access DB
* @retval #WIDGET_STATUS_ERROR_INVALID_PARAMETER Invalid argument
@@ -901,7 +917,8 @@ extern int widget_service_enumerate_category_list(const char *cluster, int (*cb)
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @return int type
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
* @retval #WIDGET_STATUS_ERROR_INVALID_PARAMETER Invalid argument
* @retval #WIDGET_STATUS_ERROR_IO_ERROR Failed to access DB
* @retval #WIDGET_STATUS_ERROR_PERMISSION_DENIED Permission denied
@@ -923,7 +940,8 @@ extern int widget_service_enumerate_cluster_list(int (*cb)(const char *cluster,
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @return int type
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
* @retval #WIDGET_STATUS_ERROR_NONE Succeed to initialize
* @retval #WIDGET_STATUS_ERROR_IO_ERROR Failed to access a DB
* @retval #WIDGET_STATUS_ERROR_PERMISSION_DENIED Permission denied
@@ -938,7 +956,8 @@ extern int widget_service_init(void);
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @return int type
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
* @retval #WIDGET_STATUS_ERROR_NONE Succeed to finalize
* @retval #WIDGET_STATUS_ERROR_IO_ERROR Failed to close the DB (access failed to DB)
* @retval #WIDGET_STATUS_ERROR_PERMISSION_DENIED Permission denied
@@ -970,7 +989,7 @@ extern int widget_service_fini(void);
* @retval handle If it successfully create the package list iterator
* @see widget_service_pkglist_destroy()
*/
-extern widget_pkglist_h widget_service_pkglist_create(const char *widgetid, widget_pkglist_h handle);
+extern widget_pkglist_h widget_service_create_pkglist(const char *widgetid, widget_pkglist_h handle);
/**
* @internal
@@ -983,7 +1002,8 @@ extern widget_pkglist_h widget_service_pkglist_create(const char *widgetid, widg
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @return int type
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
* @retval #WIDGET_STATUS_ERROR_NONE Successfully get the record
* @retval #WIDGET_STATUS_ERROR_INVALID_PARAMETER Invalid argument
* @retval #WIDGET_STATUS_ERROR_NOT_EXIST Reach to the end of result set. you can rewind the iterator call widget_service_pkglist_create() again with current handle
@@ -1002,20 +1022,21 @@ extern int widget_service_get_pkglist_item(widget_pkglist_h handle, char **widge
* @privlevel public
* @privilege %http://tizen.org/privilege/widget.viewer
* @feature http://tizen.org/feature/shell.appwidget
- * @return int type
+ * @return #WIDGET_STATUS_ERROR_NONE on success,
+ * otherwise an error code (see #WIDGET_STATUS_ERROR_XXX) on failure
* @retval #WIDGET_STATUS_ERROR_INVALID_PARAMETER Invalid handle
* @retval #WIDGET_STATUS_ERROR_NONE Successfully destroyed
* @pre Handle must be created by widget_service_pkglist_create().
* @post You have not to use the handle again after destroy it.
* @see widget_service_pkglist_create()
*/
-extern int widget_service_pkglist_destroy(widget_pkglist_h handle);
+extern int widget_service_destroy_pkglist(widget_pkglist_h handle);
/**
* @internal
- * @brief Getting the activated instance count.
+ * @brief Gets the activated instance count.
* @since_tizen 2.4
- * @param[in] widgetid widget Id, if you want to get whole instnaces list, use NULL.
+ * @param[in] widgetid widget Id, if you want to get whole instances list, use NULL.
* @param[in] cluster Cluster name if you don't know what this is, use NULL.
* @param[in] category Sub-cluster(category) name if you don't know what this is, use NULL.
* @privlevel public
@@ -1041,7 +1062,7 @@ extern int widget_service_get_instance_count(const char *widgetid, const char *c
* @retval @c NULL No libexec attribute, or widget_last_status() will returns reason of failure if it fails.
* @post Returned string must be free'd manually.
*/
-extern char *widget_service_libexec(const char *widgetid);
+extern char *widget_service_get_libexec(const char *widgetid);
/**
* @internal
@@ -1058,7 +1079,7 @@ extern char *widget_service_libexec(const char *widgetid);
* @retval address heap address of pkgname
* @post return'd string should be released by "free()"
*/
-extern char *widget_service_widget_id_by_libexec(const char *libexec);
+extern char *widget_service_get_widget_id_by_libexec(const char *libexec);
/**
* @}
diff --git a/packaging/libwidget_service.spec b/packaging/libwidget_service.spec
index 87834c9..6f6e595 100755
--- a/packaging/libwidget_service.spec
+++ b/packaging/libwidget_service.spec
@@ -4,7 +4,7 @@ Name: libwidget_service
Summary: Service API for gathering installed widget information
Version: 1.0.0
Release: 1
-Group: HomeTF/DynamicBox
+Group: HomeTF/widget
License: Flora
Source0: %{name}-%{version}.tar.gz
Source1001: %{name}.manifest
diff --git a/src/widget_service.c b/src/widget_service.c
index a885164..49f4dc3 100755
--- a/src/widget_service.c
+++ b/src/widget_service.c
@@ -658,7 +658,7 @@ EAPI int widget_service_trigger_update(const char *pkgname, const char *id, cons
return ret;
}
-EAPI widget_pkglist_h widget_service_pkglist_create(const char *pkgid, widget_pkglist_h handle)
+EAPI widget_pkglist_h widget_service_create_pkglist(const char *pkgid, widget_pkglist_h handle)
{
int ret;
@@ -779,7 +779,7 @@ EAPI int widget_service_get_pkglist_item(widget_pkglist_h handle, char **appid,
return WIDGET_STATUS_ERROR_NONE;
}
-EAPI int widget_service_pkglist_destroy(widget_pkglist_h handle)
+EAPI int widget_service_destroy_pkglist(widget_pkglist_h handle)
{
if (!handle || handle->type != PKGLIST_TYPE_WIDGET_LIST) {
return WIDGET_STATUS_ERROR_INVALID_PARAMETER;
@@ -1052,7 +1052,7 @@ out:
return ret;
}
-EAPI char *widget_service_mainappid(const char *widgetid)
+EAPI char *widget_service_get_main_app_id(const char *widgetid)
{
sqlite3_stmt *stmt;
const char *tmp;
@@ -1172,7 +1172,7 @@ out:
return ret;
}
-EAPI char *widget_service_content(const char *pkgid)
+EAPI char *widget_service_get_content_string(const char *pkgid)
{
sqlite3_stmt *stmt;
sqlite3 *handle;
@@ -1227,7 +1227,7 @@ out:
return content;
}
-EAPI char *widget_service_setup_appid(const char *widgetid)
+EAPI char *widget_service_get_app_id_of_setup_app(const char *widgetid)
{
sqlite3_stmt *stmt;
sqlite3 *handle;
@@ -1287,7 +1287,7 @@ out:
return appid;
}
-EAPI int widget_service_nodisplay(const char *pkgid)
+EAPI int widget_service_get_nodisplay(const char *pkgid)
{
sqlite3_stmt *stmt;
sqlite3 *handle;
@@ -1335,87 +1335,112 @@ out:
return ret;
}
-EAPI int widget_service_need_frame(const char *pkgid, int size_type)
+EAPI int widget_service_get_need_of_frame(const char *pkgid, widget_size_type_e size_type, int *need_of_frame)
{
- char *widgetid;
- sqlite3_stmt *stmt;
- sqlite3 *handle;
- int ret;
+ char *widgetid = NULL;
+ sqlite3_stmt *stmt = NULL;
+ sqlite3 *handle = NULL;
+ int ret = WIDGET_STATUS_ERROR_NONE;
+ int ret_sqlite = 0;
+ int result_need_of_frame = 0;
+
+ if (pkgid == NULL || need_of_frame == NULL) {
+ ret = WIDGET_STATUS_ERROR_INVALID_PARAMETER;
+ goto out;
+ }
handle = open_db();
if (!handle) {
ErrPrint("Unable to open a DB\n");
- return 0;
+ ret = WIDGET_STATUS_ERROR_IO_ERROR;
+ goto out;
}
- ret = sqlite3_prepare_v2(handle, "SELECT need_frame FROM box_size WHERE pkgid = ? AND size_type = ?", -1, &stmt, NULL);
- if (ret != SQLITE_OK) {
- widget_set_last_status(WIDGET_STATUS_ERROR_FAULT);
+ ret_sqlite = sqlite3_prepare_v2(handle, "SELECT need_frame FROM box_size WHERE pkgid = ? AND size_type = ?", -1, &stmt, NULL);
+ if (ret_sqlite != SQLITE_OK) {
+ ret = WIDGET_STATUS_ERROR_FAULT;
ErrPrint("Error: %s\n", sqlite3_errmsg(handle));
- close_db(handle);
- return 0;
+ goto out;
}
- /*!
- */
- widgetid = widget_service_widget_id(pkgid);
+ widgetid = widget_service_get_widget_id(pkgid);
if (!widgetid) {
ErrPrint("Invalid appid (%s)\n", pkgid);
- ret = 0;
+ result_need_of_frame = 0;
goto out;
}
- ret = sqlite3_bind_text(stmt, 1, widgetid, -1, SQLITE_TRANSIENT);
+ ret_sqlite = sqlite3_bind_text(stmt, 1, widgetid, -1, SQLITE_TRANSIENT);
free(widgetid);
- if (ret != SQLITE_OK) {
- widget_set_last_status(WIDGET_STATUS_ERROR_FAULT);
+ if (ret_sqlite != SQLITE_OK) {
ErrPrint("Error: %s\n", sqlite3_errmsg(handle));
- ret = 0;
+ ret = WIDGET_STATUS_ERROR_FAULT;
+ result_need_of_frame = 0;
goto out;
}
- ret = sqlite3_bind_int(stmt, 2, size_type);
- if (ret != SQLITE_OK) {
- widget_set_last_status(WIDGET_STATUS_ERROR_FAULT);
+ ret_sqlite = sqlite3_bind_int(stmt, 2, size_type);
+ if (ret_sqlite != SQLITE_OK) {
ErrPrint("Error: %s\n", sqlite3_errmsg(handle));
- ret = 0;
+ ret = WIDGET_STATUS_ERROR_FAULT;
+ result_need_of_frame = 0;
goto out;
}
- ret = sqlite3_step(stmt);
- if (ret == SQLITE_ROW) {
- ret = !!sqlite3_column_int(stmt, 0);
- } else {
- ret = 0;
+ ret_sqlite = sqlite3_step(stmt);
+ if (ret_sqlite != SQLITE_ROW) {
+ result_need_of_frame = 0;
ErrPrint("There is no such result\n");
- widget_set_last_status(WIDGET_STATUS_ERROR_NOT_EXIST);
+ ret = WIDGET_STATUS_ERROR_NOT_EXIST;
+ goto out;
}
+
+ result_need_of_frame = !!sqlite3_column_int(stmt, 0);
+
out:
- sqlite3_reset(stmt);
- sqlite3_finalize(stmt);
- close_db(handle);
+ if(need_of_frame)
+ *need_of_frame = result_need_of_frame;
+
+ if (stmt) {
+ sqlite3_reset(stmt);
+ sqlite3_finalize(stmt);
+ }
+
+ if (handle)
+ close_db(handle);
+
+ if (ret != WIDGET_STATUS_ERROR_NONE)
+ ErrPrint("Error: %d\n", ret);
+
return ret;
}
-EAPI int widget_service_touch_effect(const char *pkgid, int size_type)
+EAPI int widget_service_get_need_of_touch_effect(const char *pkgid, widget_size_type_e size_type, int *need_of_touch_event)
{
- char *widgetid;
- sqlite3_stmt *stmt;
- sqlite3 *handle;
- int ret;
+ char *widgetid = NULL;
+ sqlite3_stmt *stmt = NULL;
+ sqlite3 *handle = NULL;
+ int ret = WIDGET_STATUS_ERROR_NONE;
+ int ret_sqlite;
+ int result_need_of_touch_event = 0;
+
+ if (pkgid == NULL || need_of_touch_event == NULL) {
+ ret = WIDGET_STATUS_ERROR_INVALID_PARAMETER;
+ goto out;
+ }
handle = open_db();
if (!handle) {
ErrPrint("Unable to open a DB\n");
- return 1;
+ ret = WIDGET_STATUS_ERROR_IO_ERROR;
+ goto out;
}
- ret = sqlite3_prepare_v2(handle, "SELECT touch_effect FROM box_size WHERE pkgid = ? AND size_type = ?", -1, &stmt, NULL);
- if (ret != SQLITE_OK) {
+ ret_sqlite = sqlite3_prepare_v2(handle, "SELECT touch_effect FROM box_size WHERE pkgid = ? AND size_type = ?", -1, &stmt, NULL);
+ if (ret_sqlite != SQLITE_OK) {
ErrPrint("Error: %s\n", sqlite3_errmsg(handle));
- widget_set_last_status(WIDGET_STATUS_ERROR_FAULT);
- close_db(handle);
- return 1;
+ ret = WIDGET_STATUS_ERROR_FAULT;
+ goto out;
}
/**
@@ -1424,104 +1449,136 @@ EAPI int widget_service_touch_effect(const char *pkgid, int size_type)
* call the exported API in the exported API is not recomended
* but... I used.
*/
- widgetid = widget_service_widget_id(pkgid);
+ widgetid = widget_service_get_widget_id(pkgid);
if (!widgetid) {
ErrPrint("Invalid appid (%s)\n", pkgid);
- ret = 1;
+ ret = widget_last_status();
+ result_need_of_touch_event = 1;
goto out;
}
- ret = sqlite3_bind_text(stmt, 1, widgetid, -1, SQLITE_TRANSIENT);
+ ret_sqlite = sqlite3_bind_text(stmt, 1, widgetid, -1, SQLITE_TRANSIENT);
free(widgetid);
- if (ret != SQLITE_OK) {
- widget_set_last_status(WIDGET_STATUS_ERROR_FAULT);
+ if (ret_sqlite != SQLITE_OK) {
ErrPrint("Error: %s\n", sqlite3_errmsg(handle));
- ret = 1;
+ ret = WIDGET_STATUS_ERROR_FAULT;
+ result_need_of_touch_event = 1;
goto out;
}
- ret = sqlite3_bind_int(stmt, 2, size_type);
- if (ret != SQLITE_OK) {
- widget_set_last_status(WIDGET_STATUS_ERROR_FAULT);
+ ret_sqlite = sqlite3_bind_int(stmt, 2, size_type);
+ if (ret_sqlite != SQLITE_OK) {
ErrPrint("Error: %s\n", sqlite3_errmsg(handle));
- ret = 1;
+ ret = WIDGET_STATUS_ERROR_FAULT;
+ result_need_of_touch_event = 1;
goto out;
}
- ret = sqlite3_step(stmt);
- if (ret == SQLITE_ROW) {
- ret = !!sqlite3_column_int(stmt, 0);
- } else {
- ret = 1; /**< Default true: In this case the DB is corrupted. */
+ ret_sqlite = sqlite3_step(stmt);
+ if (ret_sqlite != SQLITE_ROW) {
+ result_need_of_touch_event = 1; /**< Default true: In this case the DB is corrupted. */
ErrPrint("There is no result\n");
- widget_set_last_status(WIDGET_STATUS_ERROR_NOT_EXIST);
+ ret = WIDGET_STATUS_ERROR_NOT_EXIST;
+ goto out;
}
+ result_need_of_touch_event = !!sqlite3_column_int(stmt, 0);
+
out:
- sqlite3_reset(stmt);
- sqlite3_finalize(stmt);
- close_db(handle);
+ if (need_of_touch_event)
+ *need_of_touch_event = result_need_of_touch_event;
+
+ if (stmt) {
+ sqlite3_reset(stmt);
+ sqlite3_finalize(stmt);
+ }
+
+ if (handle)
+ close_db(handle);
+
+ if (ret != WIDGET_STATUS_ERROR_NONE)
+ ErrPrint("Error: %d\n", ret);
+
return ret;
}
-EAPI int widget_service_mouse_event(const char *pkgid, int size_type)
+EAPI int widget_service_get_need_of_mouse_event(const char *pkgid, widget_size_type_e size_type, int *need_of_mouse_event)
{
- sqlite3_stmt *stmt;
- sqlite3 *handle;
- char *widgetid;
- int ret;
+ sqlite3_stmt *stmt = NULL;
+ sqlite3 *handle = NULL;
+ char *widgetid = NULL;
+ int ret_sqlite = 0;
+ int ret = WIDGET_STATUS_ERROR_NONE;
+ int result_need_of_mouse_event = 0;
+
+ if (pkgid == NULL || need_of_mouse_event == NULL) {
+ ret = WIDGET_STATUS_ERROR_INVALID_PARAMETER;
+ goto out;
+ }
- handle = open_db();
- if (!handle) {
- return 0;
+ if (!(handle = open_db())) {
+ ErrPrint("open_db failed : %s\n", sqlite3_errmsg(handle));
+ ret = WIDGET_STATUS_ERROR_IO_ERROR;
+ goto out;
}
- ret = sqlite3_prepare_v2(handle, "SELECT mouse_event FROM box_size WHERE pkgid = ? AND size_type = ?", -1, &stmt, NULL);
- if (ret != SQLITE_OK) {
- ErrPrint("Error: %s\n", sqlite3_errmsg(handle));
- widget_set_last_status(WIDGET_STATUS_ERROR_FAULT);
- close_db(handle);
- return 0;
+ ret_sqlite = sqlite3_prepare_v2(handle, "SELECT mouse_event FROM box_size WHERE pkgid = ? AND size_type = ?", -1, &stmt, NULL);
+
+ if (ret_sqlite != SQLITE_OK) {
+ ErrPrint("sqlite3_prepare_v2 failed : %s\n", sqlite3_errmsg(handle));
+ ret = WIDGET_STATUS_ERROR_FAULT;
+ goto out;
}
- widgetid = widget_service_widget_id(pkgid);
+ widgetid = widget_service_get_widget_id(pkgid);
if (!widgetid) {
ErrPrint("Failed to get widgetid: %s\n", pkgid);
- ret = 0;
+ ret = widget_last_status();
goto out;
}
- ret = sqlite3_bind_text(stmt, 1, widgetid, -1, SQLITE_TRANSIENT);
+ ret_sqlite = sqlite3_bind_text(stmt, 1, widgetid, -1, SQLITE_TRANSIENT);
free(widgetid);
- if (ret != SQLITE_OK) {
- widget_set_last_status(WIDGET_STATUS_ERROR_FAULT);
+
+ if (ret_sqlite != SQLITE_OK) {
ErrPrint("Error: %s\n", sqlite3_errmsg(handle));
- ret = 0;
+ ret = WIDGET_STATUS_ERROR_FAULT;
goto out;
}
- ret = sqlite3_bind_int(stmt, 2, size_type);
- if (ret != SQLITE_OK) {
- widget_set_last_status(WIDGET_STATUS_ERROR_FAULT);
+ ret_sqlite = sqlite3_bind_int(stmt, 2, size_type);
+ if (ret_sqlite != SQLITE_OK) {
ErrPrint("Error: %s\n", sqlite3_errmsg(handle));
- ret = 0;
+ ret = WIDGET_STATUS_ERROR_FAULT;
goto out;
}
- ret = sqlite3_step(stmt);
- if (ret == SQLITE_ROW) {
- ret = !!sqlite3_column_int(stmt, 0);
- widget_set_last_status(WIDGET_STATUS_ERROR_NONE);
+ ret_sqlite = sqlite3_step(stmt);
+
+ if (ret_sqlite == SQLITE_ROW) {
+ result_need_of_mouse_event = !!sqlite3_column_int(stmt, 0);
+ ret = WIDGET_STATUS_ERROR_NONE;
} else {
- ret = 0; /**< Default is false, In this case the DB is corrupted */
ErrPrint("There is no result.\n");
- widget_set_last_status(WIDGET_STATUS_ERROR_NOT_EXIST);
+ result_need_of_mouse_event = 0; /**< Default is false, In this case the DB is corrupted */
+ ret = WIDGET_STATUS_ERROR_NOT_EXIST;
}
out:
- sqlite3_reset(stmt);
- sqlite3_finalize(stmt);
- close_db(handle);
+ if (need_of_mouse_event)
+ *need_of_mouse_event = result_need_of_mouse_event;
+
+ if (stmt) {
+ sqlite3_reset(stmt);
+ sqlite3_finalize(stmt);
+ }
+
+ if (handle)
+ close_db(handle);
+
+ if (ret != WIDGET_STATUS_ERROR_NONE)
+ ErrPrint("Error: %d\n", ret);
+
return ret;
}
@@ -1617,7 +1674,7 @@ out:
return appid;
}
-EAPI char *widget_service_preview(const char *pkgid, int size_type)
+EAPI char *widget_service_get_preview_image_path(const char *pkgid, int size_type)
{
sqlite3_stmt *stmt;
sqlite3 *handle;
@@ -1731,7 +1788,7 @@ out:
return preview;
}
-EAPI char *widget_service_i18n_icon(const char *pkgid, const char *lang)
+EAPI char *widget_service_get_i18n_icon(const char *pkgid, const char *lang)
{
sqlite3_stmt *stmt;
sqlite3 *handle;
@@ -1822,7 +1879,7 @@ out:
return icon;
}
-EAPI char *widget_service_i18n_name(const char *pkgid, const char *lang)
+EAPI char *widget_service_get_i18n_name(const char *pkgid, const char *lang)
{
sqlite3_stmt *stmt;
sqlite3 *handle;
@@ -1954,7 +2011,7 @@ out:
return ret;
}
-EAPI char *widget_service_abi(const char *widgetid)
+EAPI char *widget_service_get_abi(const char *widgetid)
{
sqlite3_stmt *stmt;
sqlite3 *handle;
@@ -2031,7 +2088,7 @@ out:
return abi;
}
-EAPI char *widget_service_widget_id_by_libexec(const char *libexec)
+EAPI char *widget_service_get_widget_id_by_libexec(const char *libexec)
{
sqlite3_stmt *stmt;
sqlite3 *handle;
@@ -2118,7 +2175,7 @@ out:
return pkgid;
}
-EAPI char *widget_service_libexec(const char *pkgid)
+EAPI char *widget_service_get_libexec(const char *pkgid)
{
sqlite3_stmt *stmt;
sqlite3 *handle;
@@ -2211,7 +2268,7 @@ out:
return libexec;
}
-EAPI char *widget_service_widget_id(const char *appid)
+EAPI char *widget_service_get_widget_id(const char *appid)
{
char *widget_pkgname;
pkgmgrinfo_appinfo_h handle;
@@ -2260,7 +2317,7 @@ EAPI char *widget_service_widget_id(const char *appid)
return widget_pkgname;
}
-EAPI char *widget_service_package_id(const char *pkgname)
+EAPI char *widget_service_get_package_id(const char *pkgname)
{
sqlite3_stmt *stmt;
char *appid;
@@ -2371,7 +2428,7 @@ out:
return appid;
}
-EAPI char *widget_service_provider_name(const char *widgetid)
+EAPI char *widget_service_get_provider_name(const char *widgetid)
{
char *ret;
int stage = 0;
@@ -2508,7 +2565,7 @@ out:
return ret;
}
-EAPI char *widget_service_category(const char *widgetid)
+EAPI char *widget_service_get_category(const char *widgetid)
{
sqlite3_stmt *stmt;
char *category = NULL;
@@ -2591,7 +2648,7 @@ out:
return category;
}
-EAPI char *widget_service_widget_script_path(const char *pkgid)
+EAPI char *widget_service_get_widget_script_path(const char *pkgid)
{
sqlite3_stmt *stmt;
sqlite3 *handle;
@@ -2681,7 +2738,7 @@ out:
return path;
}
-EAPI char *widget_service_widget_script_group(const char *pkgid)
+EAPI char *widget_service_get_widget_script_group(const char *pkgid)
{
sqlite3_stmt *stmt;
sqlite3 *handle;
@@ -2745,7 +2802,7 @@ out:
return group;
}
-EAPI char *widget_service_gbar_script_path(const char *pkgid)
+EAPI char *widget_service_get_gbar_script_path(const char *pkgid)
{
sqlite3_stmt *stmt;
sqlite3 *handle;
@@ -2836,7 +2893,7 @@ out:
return path;
}
-EAPI char *widget_service_gbar_script_group(const char *pkgid)
+EAPI char *widget_service_get_gbar_script_group(const char *pkgid)
{
sqlite3_stmt *stmt;
sqlite3 *handle;
@@ -3036,9 +3093,17 @@ EAPI int widget_service_get_size(widget_size_type_e type, int *width, int *heigh
return convert_size_from_type(type, width, height);
}
-EAPI widget_size_type_e widget_service_size_type(int width, int height)
+EAPI int widget_service_get_size_type(int width, int height, widget_size_type_e *size_type)
{
int idx;
+ int output_size_type = WIDGET_SIZE_TYPE_UNKNOWN;
+ int ret = WIDGET_STATUS_ERROR_NONE;
+
+ if (size_type == NULL) {
+ ErrPrint("WIDGET_STATUS_ERROR_INVALID_PARAMETER\n");
+ ret = WIDGET_STATUS_ERROR_INVALID_PARAMETER;
+ goto out;
+ }
if (util_update_resolution(&s_info, SIZE_LIST) < 0) {
ErrPrint("Failed to update the size list\n");
@@ -3052,36 +3117,54 @@ EAPI widget_size_type_e widget_service_size_type(int width, int height)
switch (idx) {
case 0:
- return WIDGET_SIZE_TYPE_1x1;
+ output_size_type = WIDGET_SIZE_TYPE_1x1;
+ break;
case 1:
- return WIDGET_SIZE_TYPE_2x1;
+ output_size_type = WIDGET_SIZE_TYPE_2x1;
+ break;
case 2:
- return WIDGET_SIZE_TYPE_2x2;
+ output_size_type = WIDGET_SIZE_TYPE_2x2;
+ break;
case 3:
- return WIDGET_SIZE_TYPE_4x1;
+ output_size_type = WIDGET_SIZE_TYPE_4x1;
+ break;
case 4:
- return WIDGET_SIZE_TYPE_4x2;
+ output_size_type = WIDGET_SIZE_TYPE_4x2;
+ break;
case 5:
- return WIDGET_SIZE_TYPE_4x3;
+ output_size_type = WIDGET_SIZE_TYPE_4x3;
+ break;
case 6:
- return WIDGET_SIZE_TYPE_4x4;
+ output_size_type = WIDGET_SIZE_TYPE_4x4;
+ break;
case 7:
- return WIDGET_SIZE_TYPE_4x5;
+ output_size_type = WIDGET_SIZE_TYPE_4x5;
+ break;
case 8:
- return WIDGET_SIZE_TYPE_4x6;
+ output_size_type = WIDGET_SIZE_TYPE_4x6;
+ break;
case 9:
- return WIDGET_SIZE_TYPE_EASY_1x1;
+ output_size_type = WIDGET_SIZE_TYPE_EASY_1x1;
+ break;
case 10:
- return WIDGET_SIZE_TYPE_EASY_3x1;
+ output_size_type = WIDGET_SIZE_TYPE_EASY_3x1;
+ break;
case 11:
- return WIDGET_SIZE_TYPE_EASY_3x3;
+ output_size_type = WIDGET_SIZE_TYPE_EASY_3x3;
+ break;
case 12:
- return WIDGET_SIZE_TYPE_0x0;
+ output_size_type = WIDGET_SIZE_TYPE_0x0;
+ break;
default:
+ ret = WIDGET_STATUS_ERROR_INVALID_PARAMETER;
break;
}
- return WIDGET_SIZE_TYPE_UNKNOWN;
+out:
+ if (size_type)
+ *size_type = output_size_type;
+
+ return ret;
}
EAPI void widget_set_last_status(widget_status_e status)