From: Sung-jae Park <nicesj.park@samsung.com>
Date: Fri, 25 Oct 2013 08:34:22 +0000 (+0900)
Subject: Icon provider. do not sucide.
X-Git-Tag: accepted/tizen/generic/20140226.073944~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ccbbc8b86060d6aa928886b15e774e261c01235c;hp=d57e5f4ff0f2e1a41f308f6729f250ba243569e2;p=platform%2Fframework%2Fweb%2Fdata-provider-slave.git

Icon provider. do not sucide.

Its lifecycle will be managed by master.

Change-Id: I2827a24c30cb40c70836907b1b7ecfa50369d3ff
Signed-off-by: Sung-jae Park <nicesj.park@samsung.com>
---

diff --git a/icon_src/main.c b/icon_src/main.c
index 6597d94..785d702 100644
--- a/icon_src/main.c
+++ b/icon_src/main.c
@@ -62,12 +62,10 @@
 int script_handler_parse_desc(Evas_Object *edje, const char *descfile);
 
 static struct info {
-	Ecore_Timer *ttl_timer;
 	int client_fd;
 	const char *socket_file;
 	char *font_name;
 } s_info = {
-	.ttl_timer = NULL,
 	.client_fd = -1,
 	.socket_file = UTILITY_ADDR,
 	.font_name = NULL,
@@ -268,10 +266,6 @@ static struct packet *icon_create(pid_t pid, int handle, const struct packet *pa
 	char _group[16];
 	char *size_str;
 
-	if (s_info.ttl_timer) {
-		ecore_timer_reset(s_info.ttl_timer);
-	}
-
 	ret = packet_get(packet, "sssis", &edje_path, &group, &desc_file, &size_type, &output);
 	if (ret != 5) {
 		ErrPrint("Invalid parameters");
@@ -400,17 +394,6 @@ static inline int client_init(void)
 	return ret;
 }
 
-static Eina_Bool life_timer_cb(void *data)
-{
-	/* Terminated */
-
-	DbgPrint("Life timer expired\n");
-
-	s_info.ttl_timer = NULL;
-	elm_exit();
-	return ECORE_CALLBACK_CANCEL;
-}
-
 static inline void client_fini(void)
 {
 	if (s_info.client_fd < 0) {
@@ -493,11 +476,6 @@ static bool app_create(void *data)
 	/*!
 	 * Send a request to reigister as a service.
 	 */
-	s_info.ttl_timer = ecore_timer_add(TTL, life_timer_cb, NULL);
-	if (!s_info.ttl_timer) {
-		ErrPrint("Unable to register a life timer\n");
-	}
-
 	ret = vconf_notify_key_changed("db/setting/accessibility/font_name", font_changed_cb, NULL);
 	DbgPrint("System font is changed: %d\n", ret);
 
@@ -512,11 +490,6 @@ static void app_terminate(void *data)
 	ret = vconf_ignore_key_changed("db/setting/accessibility/font_name", font_changed_cb);
 	DbgPrint("Remove font change callback: %d\n", ret);
 
-	if (s_info.ttl_timer) {
-		ecore_timer_del(s_info.ttl_timer);
-		s_info.ttl_timer = NULL;
-	}
-
 	client_fini();
 
 	free(s_info.font_name);
diff --git a/packaging/org.tizen.data-provider-slave.spec b/packaging/org.tizen.data-provider-slave.spec
index 6f14b05..9bd1644 100644
--- a/packaging/org.tizen.data-provider-slave.spec
+++ b/packaging/org.tizen.data-provider-slave.spec
@@ -2,7 +2,7 @@
 
 Name: org.tizen.data-provider-slave
 Summary: Plugin type livebox service provider
-Version: 0.12.13
+Version: 0.12.14
 Release: 1
 Group: HomeTF/Livebox
 License: Flora License