From: Jing Yigang <yigang.jing@samsung.com>
Date: Wed, 29 Aug 2012 10:42:38 +0000 (+0800)
Subject: [Bug] Fix  font reset issue and remove some build warnings .
X-Git-Tag: accepted/2.0alpha/20121023.233853~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ca1c7970fe862f19a04da0fbe2e52ff8ec61abc;p=profile%2Fivi%2Fsettings.git

[Bug] Fix  font reset issue and remove some build warnings .

Change-Id: I8a238b0db2e3657c676c38632f83f9eeadb44ed3
---

diff --git a/setting-font/include/setting-font.h b/setting-font/include/setting-font.h
index 8492348..a8b7f6a 100755
--- a/setting-font/include/setting-font.h
+++ b/setting-font/include/setting-font.h
@@ -75,7 +75,7 @@ struct _SettingFontUG {
 	int prev_font;
 	char *font_name;
 
-	int *ret_font_size;
+	int ret_font_size;
 
 	FontUGViewMode viewmode;
 
diff --git a/setting-font/src/setting-font-main.c b/setting-font/src/setting-font-main.c
index 9eba3d2..0f2b094 100755
--- a/setting-font/src/setting-font-main.c
+++ b/setting-font/src/setting-font-main.c
@@ -27,6 +27,8 @@
 #include <Ecore_X.h>
 #include <system_settings.h>
 
+#define SETTING_FONT_MAX_LEN 10
+
 static int setting_font_main_create(void *cb);
 static int setting_font_main_destroy(void *cb);
 static int setting_font_main_update(void *cb);
@@ -506,13 +508,17 @@ static void __setting_font_main_click_softkey_back_cb(void *data, Evas_Object *o
 			return;
 
 		int err;
-		int ret = setting_set_int_slp_key(INT_SLP_SETTING_ACCESSIBILITY_FONT_SIZE, &ad->ret_font_size, &err);
+		int ret = setting_set_int_slp_key(INT_SLP_SETTING_ACCESSIBILITY_FONT_SIZE, ad->ret_font_size, &err);
+		setting_retm_if(ret == -1, "Failed to set vconf");
+
+		char font_size[SETTING_FONT_MAX_LEN] = {0,};
+		snprintf(font_size, SETTING_FONT_MAX_LEN, "%d", ad->ret_font_size);
 
 		service_add_extra_data(svc, "category", "FontSize");
-		service_add_extra_data(svc, "FontSize", ad->ret_font_size);
+		service_add_extra_data(svc, "FontSize", font_size);
 
 		SETTING_TRACE(" SERVICE_ADD_EXTRA : %s %s","category", "FontSize");
-		SETTING_TRACE(" SERVICE_ADD_EXTRA : %s %s","FontSize", ad->ret_font_size);
+		SETTING_TRACE(" SERVICE_ADD_EXTRA : %s %s","FontSize", font_size);
 
 
 		ug_send_result(ad->ug, svc);
diff --git a/setting-font/src/setting-font.c b/setting-font/src/setting-font.c
index c8f7d72..686ea5f 100755
--- a/setting-font/src/setting-font.c
+++ b/setting-font/src/setting-font.c
@@ -321,7 +321,7 @@ UG_MODULE_API int setting_plugin_reset(service_h service, void *priv)
 	font_config_set("HelveticaNeue");
 
 	/* reset font size */
-	ret += vconf_set_int(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, 1);
+	ret += vconf_set_int(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, 3); // 3 is normal size
 	setting_retvm_if(ret == -1, -1, "Failed to set vconf");
 	font_size_set();
 #endif