summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjinwang.an <jinwang.an@samsung.com>2017-08-22 21:10:33 +0900
committerjinwang.an <jinwang.an@samsung.com>2017-08-23 19:16:23 +0900
commit9c5fd396ad00593e98a0287b7c78936d5b799764 (patch)
tree067c3a56a8135da9b90520c3c6f0a6259f830835
parentafbae11794ab376a4e0eac59e8d0768dd0559c5b (diff)
downloadwatch-setting-9c5fd396ad00593e98a0287b7c78936d5b799764.tar.gz
watch-setting-9c5fd396ad00593e98a0287b7c78936d5b799764.tar.bz2
watch-setting-9c5fd396ad00593e98a0287b7c78936d5b799764.zip
Added background menu.
- Settings > Watch face and style > Background Style Change-Id: Id1672f4547810758dc7574a2e6cd4bd3ee79f6c3 Signed-off-by: jinwang.an <jinwang.an@samsung.com>
-rwxr-xr-xCMakeLists.txt8
-rwxr-xr-xdata/media-data-sdk/settings/Wallpaper/BG_preview_00.pngbin0 -> 7447 bytes
-rwxr-xr-xdata/media-data-sdk/settings/Wallpaper/BG_preview_01.pngbin0 -> 22090 bytes
-rwxr-xr-xdata/media-data-sdk/settings/Wallpaper/BG_preview_02.pngbin0 -> 22369 bytes
-rwxr-xr-xdata/media-data-sdk/settings/Wallpaper/BG_preview_03.pngbin0 -> 20152 bytes
-rwxr-xr-xdata/media-data-sdk/settings/Wallpaper/BG_preview_04.pngbin0 -> 112947 bytes
-rwxr-xr-xdata/media-data-sdk/settings/Wallpaper/BG_preview_05.pngbin0 -> 89563 bytes
-rwxr-xr-xdata/media-data-sdk/settings/Wallpaper/BG_preview_06.pngbin0 -> 94053 bytes
-rwxr-xr-xdata/media-data-sdk/settings/Wallpaper/BG_preview_07.pngbin0 -> 69282 bytes
-rw-r--r--packaging/org.tizen.watch-setting.spec3
-rw-r--r--src/setting-clock.c280
-rw-r--r--src/setting-double.c2
-rw-r--r--src/setting-homescreen.c3
-rw-r--r--src/setting-info.c1
-rw-r--r--src/setting-language.c5
-rw-r--r--src/setting-sound.c4
-rw-r--r--src/setting-volume-page.c1
-rw-r--r--src/setting-volume.c2
18 files changed, 274 insertions, 35 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed4b88e..9c8f060 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,14 +56,6 @@ SET(CHANGEABLE_PATH "${PREFIX}/shared/res/tables")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -Werror")
-#IF(FEATURE_SETTING_TIZENW2)
-# MESSAGE("tiznew2 build!!!!!!!!!")
-# ADD_DEFINITIONS("-DFEATURE_SETTING_TIZENW2")
-#ELSE(FEATURE_SETTING_TIZENW2)
-# MESSAGE("tiznew build!!!!!!!!!")
-#ENDIF(FEATURE_SETTING_TIZENW2)
-
-
IF(FEATURE_SETTING_SDK)
MESSAGE("tiznew2 sdk build!!!!!!!!!")
diff --git a/data/media-data-sdk/settings/Wallpaper/BG_preview_00.png b/data/media-data-sdk/settings/Wallpaper/BG_preview_00.png
new file mode 100755
index 0000000..4beefcd
--- /dev/null
+++ b/data/media-data-sdk/settings/Wallpaper/BG_preview_00.png
Binary files differ
diff --git a/data/media-data-sdk/settings/Wallpaper/BG_preview_01.png b/data/media-data-sdk/settings/Wallpaper/BG_preview_01.png
new file mode 100755
index 0000000..bb8bb14
--- /dev/null
+++ b/data/media-data-sdk/settings/Wallpaper/BG_preview_01.png
Binary files differ
diff --git a/data/media-data-sdk/settings/Wallpaper/BG_preview_02.png b/data/media-data-sdk/settings/Wallpaper/BG_preview_02.png
new file mode 100755
index 0000000..aa82a58
--- /dev/null
+++ b/data/media-data-sdk/settings/Wallpaper/BG_preview_02.png
Binary files differ
diff --git a/data/media-data-sdk/settings/Wallpaper/BG_preview_03.png b/data/media-data-sdk/settings/Wallpaper/BG_preview_03.png
new file mode 100755
index 0000000..ba38c2f
--- /dev/null
+++ b/data/media-data-sdk/settings/Wallpaper/BG_preview_03.png
Binary files differ
diff --git a/data/media-data-sdk/settings/Wallpaper/BG_preview_04.png b/data/media-data-sdk/settings/Wallpaper/BG_preview_04.png
new file mode 100755
index 0000000..e4796a7
--- /dev/null
+++ b/data/media-data-sdk/settings/Wallpaper/BG_preview_04.png
Binary files differ
diff --git a/data/media-data-sdk/settings/Wallpaper/BG_preview_05.png b/data/media-data-sdk/settings/Wallpaper/BG_preview_05.png
new file mode 100755
index 0000000..9ad7a3f
--- /dev/null
+++ b/data/media-data-sdk/settings/Wallpaper/BG_preview_05.png
Binary files differ
diff --git a/data/media-data-sdk/settings/Wallpaper/BG_preview_06.png b/data/media-data-sdk/settings/Wallpaper/BG_preview_06.png
new file mode 100755
index 0000000..d816d74
--- /dev/null
+++ b/data/media-data-sdk/settings/Wallpaper/BG_preview_06.png
Binary files differ
diff --git a/data/media-data-sdk/settings/Wallpaper/BG_preview_07.png b/data/media-data-sdk/settings/Wallpaper/BG_preview_07.png
new file mode 100755
index 0000000..57f7fee
--- /dev/null
+++ b/data/media-data-sdk/settings/Wallpaper/BG_preview_07.png
Binary files differ
diff --git a/packaging/org.tizen.watch-setting.spec b/packaging/org.tizen.watch-setting.spec
index 82f8018..db7e0c5 100644
--- a/packaging/org.tizen.watch-setting.spec
+++ b/packaging/org.tizen.watch-setting.spec
@@ -100,9 +100,6 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} \
%ifarch %{ix86}
-DFEATURE_EMUL=YES \
%endif
-#%if "%{?sec_build_project_name}" == "rinato_eur_open"
-# -DFEATURE_SETTING_TIZENW2=YES \
-#%endif
make %{?jobs:-j%jobs}
diff --git a/src/setting-clock.c b/src/setting-clock.c
index 20643c6..d703aeb 100644
--- a/src/setting-clock.c
+++ b/src/setting-clock.c
@@ -35,6 +35,7 @@
#define SETTINGS_DEFAULT_FONT_NAME "Default"
#define SETTING_FONT_PRELOAD_FONT_PATH "/usr/share/fonts"
#define SETTING_FONT_DOWNLOADED_FONT_PATH TZ_SYS_GLOBALUSER_DATA_D"/fonts"
+#define SETTING_HOME_SCREEN_DIR_PATH TZ_SYS_GLOBALUSER_DATA_D"/settings/Wallpaper"
EAPI Evas_Object *elm_widget_top_get(const Evas_Object *obj);
@@ -51,9 +52,9 @@ static void _mouse_up_cb(void *data, Evas *evas, Evas_Object *obj, void *event_i
static void _mouse_move_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info);
static void _page_show(void *data, Evas *e, Evas_Object *obj, void *event_info);
Evas_Object *_clock_type_cb(void *data);
-void _clock_type_cb_gen_item(void *data, Evas_Object *obj, void *event_info);
static void _clock_cb(void *data, Evas_Object *obj, void *event_info);
+static void _clock_bg_cb(void *data, Evas_Object *obj, void *event_info);
static Evas_Object *_gl_clock_noti_indicator_check_get(void *data, Evas_Object *obj, const char *part);
static void _clock_gl_clock_noti_indicator_cb(void *data, Evas_Object *obj, void *event_info);
static void _clock_gl_clock_noti_indicator_check_cb(void *data, Evas_Object *obj, void *event_info);
@@ -86,7 +87,6 @@ void _clock_gl_font_style_cb(void *data, Evas_Object *obj, void *event_info);
void _clock_gl_font_size_cb(void *data, Evas_Object *obj, void *event_info);
static struct _clock_menu_item clock_menu_its[] = {
- //{ "IDS_ST_BODY_CLOCK_TYPE_ABB", 1, _clock_type_cb_gen_item },
{ "WDS_WMGR_HEADER_WATCH_FACES", SETTING_CLOCK_WATCH_FACE, _clock_cb},
{ "WDS_CLOCK_MBODY_NOTIFICATION_INDICATOR", SETTING_CLOCK_NOTIFICATION_INDICATOR, _clock_gl_clock_noti_indicator_cb },
#if FEATURE_SETTING_EMUL
@@ -96,7 +96,7 @@ static struct _clock_menu_item clock_menu_its[] = {
// { "IDS_ST_BODY_DATE_AND_TIME_ABB", 0, _dt_cb },
// { "IDS_ST_BODY_HOURLY_ALERT_ABB", 0, _hourly_alert_cb },
#endif
- { "Background style", SETTING_CLOCK_BACKGROUND_STYLE, _clock_gl_font_cb },
+ { "Background style", SETTING_CLOCK_BACKGROUND_STYLE, _clock_bg_cb },
{ "IDS_ST_BODY_FONT", SETTING_CLOCK_FONT, _clock_gl_font_cb },
};
@@ -225,6 +225,7 @@ static Clock_Type_Item *_get_selected_clock()
if (pitem->pkgid) {
if (!strcmp(pkgid, pitem->pkgid)) {
/*DBG("pkgid for selected idleclock is %s", pitem->pkgid); */
+ FREE(pkgid);
return pitem;
}
}
@@ -232,6 +233,7 @@ static Clock_Type_Item *_get_selected_clock()
}
}
+ FREE(pkgid);
return NULL;
}
@@ -281,6 +283,7 @@ static void update_clock_list(void *data, Eina_Bool reload, Eina_Bool show)
int R = 0x00, G = 0x00, B = 0x00;
bg_color = vconf_get_str("db/wms/home_bg_palette");
colorstr_to_decimal(bg_color, &R, &G, &B);
+ FREE(bg_color);
DBG("R : [%d] G : [%d] B : [%d]", R, G, B);
Evas_Object *color_page = evas_object_rectangle_add(evas_object_evas_get(page_layout));
evas_object_color_set(color_page, R, G, B, 255);
@@ -295,6 +298,7 @@ static void update_clock_list(void *data, Eina_Bool reload, Eina_Bool show)
evas_object_size_hint_weight_set(wall_page, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(wall_page, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_part_content_set(clock_layout, "clock-wallpaper", wall_page);
+ FREE(bg_wallpaper);
}
/*clock image */
@@ -541,6 +545,7 @@ void initialize_clock(void *data)
register_vconf_changing("db/wms/home_bg_mode", update_clock_list_cb, ad);
register_vconf_changing(VCONFKEY_WMS_CLOCKS_SET_IDLE, update_clock_list_cb, ad);
+ FREE(lang);
}
void _clear_clock_cb(void *data , Evas *e, Evas_Object *obj, void *event_info)
@@ -766,10 +771,16 @@ static Evas_Object *_create_index(Evas_Object *parent, void *data)
char *bg_color = NULL;
char *bg_color_default = "000000";
int R = 0x00, G = 0x00, B = 0x00;
+ bool bg_color_null = false;
bg_color = vconf_get_str("db/wms/home_bg_palette");
- if (bg_color == NULL)
+ if (bg_color == NULL) {
bg_color = bg_color_default;
+ bg_color_null = true;
+ }
colorstr_to_decimal(bg_color, &R, &G, &B);
+ if (bg_color_null == false) {
+ FREE(bg_color);
+ }
DBG("R : [%d] G : [%d] B : [%d]", R, G, B);
Evas_Object *color_page = evas_object_rectangle_add(evas_object_evas_get(page_layout));
evas_object_color_set(color_page, R, G, B, 255);
@@ -832,6 +843,214 @@ static Evas_Object *_create_index(Evas_Object *parent, void *data)
return layout;
}
+
+static int bg_prev_x = 0;
+static int bg_touch_mode = NONE;
+
+static void _bg_mouse_down_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+{
+ bg_touch_mode = TOUCH_DOWN;
+
+ Evas_Event_Mouse_Down *ev = event_info;
+ bg_prev_x = ev->canvas.x;
+}
+
+static void _bg_mouse_up_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+{
+ if (bg_touch_mode == TOUCH_MOVE)
+ return;
+
+ int img_idx = (int)data;
+ char img_path[512] = {0};
+ snprintf(img_path, 511, SETTING_HOME_SCREEN_DIR_PATH"/BG_preview_%02d.png",img_idx);
+
+ bg_prev_x = 0;
+ bg_touch_mode = NONE;
+
+ feedback_play(FEEDBACK_PATTERN_TAP);
+
+ vconf_set_str(VCONFKEY_BGSET, img_path);
+ /* set gb vconf */
+ if (temp_ad != NULL) {
+ elm_naviframe_item_pop(temp_ad->nf);
+ back_button_cb_pop();
+ }
+}
+
+static void _bg_mouse_move_cb(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+{
+ Evas_Event_Mouse_Move *ev = event_info;
+
+ int cur_x = ev->cur.canvas.x;
+ if (abs(cur_x - bg_prev_x) > 15) {
+ /* todo : confirm and remove */
+ bg_touch_mode = TOUCH_MOVE;
+ }
+}
+
+static int _get_selected_background()
+{
+ char * bg_path = NULL;
+ char * str = NULL;
+ static char buf[1024] = {0};
+ int ret = 0;
+
+ bg_path = vconf_get_str(VCONFKEY_BGSET);
+ if (bg_path == NULL)
+ return 0;
+ str = strrchr(bg_path, '/');
+
+ snprintf(buf, 1023, "%s", str ? str + 1 : bg_path );
+
+ FREE(bg_path);
+
+ str = strchr(buf, '0');
+ if(str == NULL)
+ return 0;
+
+ ret = *(str + 1) - '0';
+
+ return ret;
+}
+
+static void _bg_page_show(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+ int page = _get_selected_background();
+ int w, h;
+ elm_scroller_region_get(obj, NULL, NULL, &w, &h);
+ printf("%d %d\n", w, h);
+
+ elm_scroller_page_show(obj, page, 0);
+}
+
+static Evas_Object *_create_background_index(Evas_Object *parent, void *data)
+{
+ Evas_Object *layout, *scroller, *box, *page_layout;
+
+ temp_ad = (appdata *)data;
+ if (temp_ad == NULL)
+ return NULL;
+
+ if (parent == NULL)
+ return NULL;
+
+ /* Create Layout */
+ layout = elm_layout_add(parent);
+ if (layout == NULL)
+ return NULL;
+
+ /*elm_layout_file_set(layout, EDJE_PATH, "setting-test/index"); */
+ elm_layout_file_set(layout, EDJE_PATH, "scroller_custom_layout");
+ evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_show(layout);
+
+ /* Create Scroller */
+ scroller = elm_scroller_add(layout);
+ elm_scroller_loop_set(scroller, EINA_FALSE, EINA_FALSE);
+ evas_object_size_hint_weight_set(scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(scroller, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_scroller_page_relative_set(scroller, 1.0, 0.0);
+ elm_scroller_policy_set(scroller, ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF);
+ elm_scroller_page_scroll_limit_set(scroller, 1, 0);
+ elm_object_scroll_lock_y_set(scroller, EINA_TRUE);
+ elm_object_part_content_set(layout, "scroller", scroller);
+ elm_object_style_set(scroller, "effect");
+ evas_object_show(scroller);
+
+ Evas_Object *circle_scroller = NULL;
+ circle_scroller = eext_circle_object_scroller_add(scroller, temp_ad->circle_surface);
+ if (circle_scroller == NULL)
+ return NULL;
+ eext_circle_object_scroller_policy_set(circle_scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+ eext_rotary_object_event_activated_set(circle_scroller, EINA_TRUE);
+
+ /* Create Box */
+ box = elm_box_add(scroller);
+ elm_box_horizontal_set(box, EINA_TRUE);
+ elm_object_content_set(scroller, box);
+ evas_object_show(box);
+ g_clock_box = box;
+
+ int selected = _get_selected_background();
+ int i;
+ for (i = 0; i <= 7; i++) {
+ char img_path[512] = {0};
+ snprintf(img_path, 511, SETTING_HOME_SCREEN_DIR_PATH"/BG_preview_%02d.png",i);
+ /* Create Pages */
+ page_layout = elm_layout_add(box);
+ /*elm_layout_file_set(page_layout, EDJE_PATH, "setting/bg_thumbnail"); */
+ elm_layout_theme_set(page_layout, "layout", "body_thumbnail", "default");
+ evas_object_size_hint_weight_set(page_layout, 0, 0);
+ evas_object_size_hint_align_set(page_layout, 0, EVAS_HINT_FILL);
+ evas_object_show(page_layout);
+
+ Evas_Object *clock_layout = elm_layout_add(page_layout);
+ elm_layout_file_set(clock_layout, EDJE_PATH, "setting-test/clock-type");
+ evas_object_size_hint_weight_set(clock_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(clock_layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_show(clock_layout);
+
+ char *bg_color = NULL;
+ char *bg_color_default = "000000";
+ int R = 0x00, G = 0x00, B = 0x00;
+ bool bg_color_null = false;
+ bg_color = vconf_get_str("db/wms/home_bg_palette");
+ if (bg_color == NULL) {
+ bg_color = bg_color_default;
+ bg_color_null = true;
+ }
+ colorstr_to_decimal(bg_color, &R, &G, &B);
+ if (bg_color_null == false) {
+ FREE(bg_color);
+ }
+ DBG("R : [%d] G : [%d] B : [%d]", R, G, B);
+ Evas_Object *color_page = evas_object_rectangle_add(evas_object_evas_get(page_layout));
+ evas_object_color_set(color_page, R, G, B, 255);
+ evas_object_size_hint_weight_set(color_page, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(color_page, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_object_part_content_set(clock_layout, "clock-color", color_page);
+
+ /*clock image */
+ Evas_Object *page = elm_image_add(clock_layout);
+ elm_image_file_set(page, img_path, NULL);
+ evas_object_size_hint_weight_set(page, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(page, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+ /* touch event */
+ evas_object_event_callback_add(page, EVAS_CALLBACK_MOUSE_DOWN, _bg_mouse_down_cb, NULL);
+ evas_object_event_callback_add(page, EVAS_CALLBACK_MOUSE_UP, _bg_mouse_up_cb, (void *)i);
+ evas_object_event_callback_add(page, EVAS_CALLBACK_MOUSE_MOVE, _bg_mouse_move_cb, NULL);
+
+ elm_object_part_content_set(clock_layout, "clock-image", page);
+ if (i == selected) {
+ elm_object_signal_emit(page_layout, "elm,state,thumbnail,focus", "*");
+ } else {
+ elm_object_signal_emit(page_layout, "elm,state,thumbnail,unfocus", "*");
+ }
+
+ elm_object_part_content_set(page_layout, "elm.icon", clock_layout);
+
+ Evas_Object *table;
+ Evas_Coord w = 0, h = 0;
+ elm_win_screen_size_get((const Elm_Win *)elm_widget_top_get(parent), NULL, NULL, &w, &h);
+ table = _elm_min_set(page_layout, box, w, h);
+ evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_show(table);
+ elm_box_pack_end(box, table);
+ }
+
+ evas_object_event_callback_add(scroller, EVAS_CALLBACK_RESIZE, _bg_page_show, NULL);
+
+ int ret;
+ ret = feedback_initialize();
+ if (ret != FEEDBACK_ERROR_NONE) {
+ DBG("feedback_initialize failed");
+ }
+
+ return layout;
+}
+
int watch_metadata_func(const char *key, const char *value, void *user_data)
{
Clock_Type_Data *pclockdata = (Clock_Type_Data *)user_data;
@@ -953,26 +1172,6 @@ Evas_Object *_clock_type_cb(void *data)
return layout_inner;
}
-void _clock_type_cb_gen_item(void *data, Evas_Object *obj, void *event_info)
-{
- /*elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE); */
-
- appdata *ad = NULL;
-
- ad = (appdata *)data;
- if (ad == NULL)
- return;
-
- temp_ad = ad;
-
- /* Evas_Object *layout_inner = NULL; */
- /* layout_inner = _create_index(ad->nf, ad); */
- /* Elm_Object_Item *it = NULL; */
- /*it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout_inner, NULL); */
- /*elm_naviframe_item_title_enabled_set(it, EINA_FALSE, EINA_FALSE); */
-
- return;
-}
//void _hourly_alert_cb(void *data, Evas_Object *obj, void *event_info)
//{
@@ -1329,6 +1528,7 @@ char *_get_str_from_icu(const char *pattern)
i18n_udate_destroy(formatter);
ret_str = strdup(formattedString);
+ FREE(locale_tmp);
return ret_str;
}
@@ -2005,6 +2205,38 @@ static void _clock_cb(void *data, Evas_Object *obj, void *event_info)
}
+static void _clock_bg_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ Evas_Object *layout = NULL;
+ Elm_Object_Item *nf_it = NULL;
+ appdata *ad = (appdata *)data;
+
+ if (ad == NULL) {
+ DBG("Setting - ad is null");
+ return;
+ }
+
+ if (is_running_clock) {
+ elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
+ return;
+ }
+
+ temp_ad = ad;
+ layout = _create_background_index(ad->nf, ad);
+ if (layout == NULL) {
+ DBG("%s", "clock cb - layout is null");
+ return;
+ }
+ nf_it = elm_naviframe_item_push(ad->nf, NULL, NULL, NULL, layout, NULL);
+ back_button_cb_push(&back_key_generic_cb, data, NULL, g_clock_genlist , "g_clock_genlist");
+ evas_object_event_callback_add(layout, EVAS_CALLBACK_DEL, _clear_clock_cb, ad);
+ elm_naviframe_item_title_enabled_set(nf_it, EINA_FALSE, EINA_FALSE);
+
+ elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
+ is_running_clock = 1;
+
+}
+
static void _clock_gl_clock_noti_indicator_cb(void *data, Evas_Object *obj, void *event_info)
{
elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE);
diff --git a/src/setting-double.c b/src/setting-double.c
index 26947db..fa1f085 100644
--- a/src/setting-double.c
+++ b/src/setting-double.c
@@ -529,6 +529,7 @@ static void change_language_cb(keynode_t *key, void *data)
i18n_ucollator_create(lang, &coll);
update_double_app_list(ad);
+ FREE(lang);
}
#if 0 /* _NOT_USED_ */
@@ -877,6 +878,7 @@ void init_double_pressing(void *data)
register_vconf_changing(VCONFKEY_SETAPPL_DOUBLE_PRESS_HOME_KEY, change_double_pressing_cb, ad);
register_vconf_changing(VCONFKEY_LANGSET, change_language_cb, ad);
+ FREE(lang);
}
Evas_Object *create_double_list(void *data)
diff --git a/src/setting-homescreen.c b/src/setting-homescreen.c
index dac2f94..bc371de 100644
--- a/src/setting-homescreen.c
+++ b/src/setting-homescreen.c
@@ -880,6 +880,7 @@ static void _update_wallpaper()
elm_object_part_content_set(thumbnail_layout, "thumb", color_page);
evas_object_show(color_page);
g_color_page = color_page;
+ FREE(bg_color);
}
if (thumbIdx == 1) {
@@ -992,6 +993,7 @@ static void _wallpaper_vconf_color_changed_cb(keynode_t *node, void *data)
colorstr_to_decimal(bg_color, &R, &G, &B);
evas_object_color_set(g_color_page, R, G, B, 255);
evas_object_show(g_color_page);
+ FREE(bg_color);
}
static void _wallpaper_vconf_wallpaper_changed_cb(keynode_t *node, void *data)
@@ -1112,6 +1114,7 @@ static Evas_Object *_create_wallpaper_thumbnail(Evas_Object *parent)
elm_object_part_content_set(thumbnail_layout, "thumb", color_page);
evas_object_show(color_page);
g_color_page = color_page;
+ FREE(bg_color);
}
if (thumbIdx == 1) {
diff --git a/src/setting-info.c b/src/setting-info.c
index 1c12bef..da21f2d 100644
--- a/src/setting-info.c
+++ b/src/setting-info.c
@@ -459,6 +459,7 @@ char *_gl_info__detail_title_get(void *data, Evas_Object *obj, const char *part)
} else {
snprintf(buf, sizeof(buf) - 1, "%s", _(_info_detail_menu_list[index].name));
}
+ FREE(lang);
} else {
snprintf(buf, sizeof(buf) - 1, "%s", _(_info_detail_menu_list[index].name));
}
diff --git a/src/setting-language.c b/src/setting-language.c
index 04e849c..f7e180e 100644
--- a/src/setting-language.c
+++ b/src/setting-language.c
@@ -268,6 +268,9 @@ void _gl_lang_sel_cb(void *data, Evas_Object *obj, void *event_info)
if (tmp_ad) {
back_key_generic_cb(tmp_ad, obj, event_info);
}
+
+ FREE(temp);
+ FREE(locale);
}
void _lang_sel_changed_cb(void *data, Evas_Object *obj, void *event_info)
@@ -613,5 +616,7 @@ const char *setting_get_lang_title(void)
lang_list = eina_list_next(lang_list);
}
+ FREE(language);
+
return title;
}
diff --git a/src/setting-sound.c b/src/setting-sound.c
index e0f0fa0..e0695b9 100644
--- a/src/setting-sound.c
+++ b/src/setting-sound.c
@@ -291,6 +291,8 @@ static void get_sound_file_list(char *dir, int type)
}
}
}
+
+ FREE(cur_ring_path);
closedir(dp);
}
@@ -486,6 +488,8 @@ char *_gl_Sound_title_get(void *data, Evas_Object *obj, const char *part)
#endif
}
}
+
+ FREE(pa_cur_ringtone);
return strdup(buf);
}
diff --git a/src/setting-volume-page.c b/src/setting-volume-page.c
index c22d232..191cb4d 100644
--- a/src/setting-volume-page.c
+++ b/src/setting-volume-page.c
@@ -1272,6 +1272,7 @@ static void _play_sound_all_type(int sound_type, float volume)
set_looping(TRUE);
}
+ FREE(sound_path);
return;
}
diff --git a/src/setting-volume.c b/src/setting-volume.c
index 89a8ea8..1313133 100644
--- a/src/setting-volume.c
+++ b/src/setting-volume.c
@@ -737,6 +737,8 @@ static void _play_sound_all_type(int sound_type, float volume)
break;
}
+ FREE(sound_path);
+
ERR(">>>>> Play Sound path : %s", buf);
int err = -1;