diff options
| author | Sung-jae Park <nicesj.park@samsung.com> | 2013-06-13 11:07:04 +0900 |
|---|---|---|
| committer | Sung-jae Park <nicesj.park@samsung.com> | 2013-06-13 11:07:06 +0900 |
| commit | aa661c4f94437cfbd964740b67fbf5f37579f2f4 (patch) | |
| tree | 13f032fddbe76858772a50582439291ec11c6b63 | |
| parent | 621e0f9fd06df00d3b5539f4388ac627c199a908 (diff) | |
| parent | f795f5f9ea61546109a5c088d7a2a7e0e984cb2d (diff) | |
| download | livebox-edje-aa661c4f94437cfbd964740b67fbf5f37579f2f4.tar.gz livebox-edje-aa661c4f94437cfbd964740b67fbf5f37579f2f4.tar.bz2 livebox-edje-aa661c4f94437cfbd964740b67fbf5f37579f2f4.zip | |
Merge branch 'tizen_2.1' into tizen_2.2
Change-Id: I52c8c6957a1365da029e6577b299d48850e30041
| -rw-r--r-- | include/debug.h | 16 | ||||
| -rw-r--r-- | packaging/liblivebox-edje.spec | 2 | ||||
| -rw-r--r-- | src/script_port.c | 24 |
3 files changed, 38 insertions, 4 deletions
diff --git a/include/debug.h b/include/debug.h index 5904b4c..7583ba9 100644 --- a/include/debug.h +++ b/include/debug.h @@ -14,6 +14,18 @@ * limitations under the License. */ -#define DbgPrint(format, arg...) LOGD("[[32m%s/%s[0m:%d] " format, basename(__FILE__), __func__, __LINE__, ##arg) -#define ErrPrint(format, arg...) LOGE("[[32m%s/%s[0m:%d] " format, basename(__FILE__), __func__, __LINE__, ##arg) +#if !defined(SECURE_LOGD) +#define SECURE_LOGD LOGD +#endif + +#if !defined(SECURE_LOGE) +#define SECURE_LOGE LOGE +#endif + +#if !defined(SECURE_LOGW) +#define SECURE_LOGW LOGW +#endif + +#define DbgPrint(format, arg...) SECURE_LOGD("[[32m%s/%s[0m:%d] " format, basename(__FILE__), __func__, __LINE__, ##arg) +#define ErrPrint(format, arg...) SECURE_LOGE("[[32m%s/%s[0m:%d] " format, basename(__FILE__), __func__, __LINE__, ##arg) /* End of a file */ diff --git a/packaging/liblivebox-edje.spec b/packaging/liblivebox-edje.spec index de44c3f..7480574 100644 --- a/packaging/liblivebox-edje.spec +++ b/packaging/liblivebox-edje.spec @@ -1,6 +1,6 @@ Name: liblivebox-edje Summary: EDJE Script loader for the data provider master -Version: 0.5.6 +Version: 0.5.8 Release: 1 Group: HomeTF/Livebox License: Flora License diff --git a/src/script_port.c b/src/script_port.c index 50d601f..bd8d71b 100644 --- a/src/script_port.c +++ b/src/script_port.c @@ -85,9 +85,13 @@ struct obj_info { static struct { char *font_name; int font_size; + + Eina_List *handle_list; } s_info = { .font_name = NULL, .font_size = -100, + + .handle_list = NULL, }; static inline double scale_get(void) @@ -838,6 +842,7 @@ PUBLIC int script_update_image(void *_h, Evas *e, const char *id, const char *pa evas_object_image_fill_set(img, 0, 0, w, h); evas_object_size_hint_fill_set(img, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(img, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_image_filled_set(img, EINA_TRUE); } /*! @@ -1357,6 +1362,8 @@ PUBLIC void *script_create(const char *file, const char *group) return NULL; } + s_info.handle_list = eina_list_append(s_info.handle_list, handle); + return handle; } @@ -1367,6 +1374,13 @@ PUBLIC int script_destroy(void *_handle) handle = _handle; + if (!eina_list_data_find(s_info.handle_list, handle)) { + DbgPrint("Not found (already deleted?)\n"); + return LB_STATUS_ERROR_NOT_EXIST; + } + + s_info.handle_list = eina_list_remove(s_info.handle_list, handle); + edje = eina_list_nth(handle->obj_list, 0); if (edje) evas_object_del(edje); @@ -1602,8 +1616,16 @@ PUBLIC int script_init(void) PUBLIC int script_fini(void) { int ret; + Eina_List *l; + Eina_List *n; + struct info *handle; + + EINA_LIST_FOREACH_SAFE(s_info.handle_list, l, n, handle) { + script_destroy(handle); + } + ret = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_FONT_SIZE); - ret = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_FONT_TYPE); + ret = vconf_ignore_key_changed("db/setting/accessibility/font_name", font_changed_cb); ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, access_cb); elm_shutdown(); return LB_STATUS_SUCCESS; |