X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=common%2Fstt_config_mgr.c;h=bdd5f9cd0f999833312175b68f9da2c403409d0e;hb=d695f7f9ad071e11b1dd27e1087ce02b913dd0be;hp=11003a249ce8790987d34a09db53585f4e6bc048;hpb=e554eb4e9e1a4ec457a5557e77a8790b932bb4c1;p=platform%2Fcore%2Fuifw%2Fstt.git

diff --git a/common/stt_config_mgr.c b/common/stt_config_mgr.c
index 11003a2..bdd5f9c 100755
--- a/common/stt_config_mgr.c
+++ b/common/stt_config_mgr.c
@@ -112,7 +112,7 @@ int __stt_config_mgr_select_lang(const char* engine_id, char** language)
 {
 	if (NULL == engine_id || NULL == language) {
 		SLOG(LOG_ERROR, stt_tag(), "[ERROR] Input parameter is NULL");
-		return false;
+		return STT_CONFIG_ERROR_INVALID_PARAMETER;
 	}
 
 	GSList *iter = NULL;
@@ -120,7 +120,7 @@ int __stt_config_mgr_select_lang(const char* engine_id, char** language)
 
 	if (0 >= g_slist_length(g_engine_list)) {
 		SLOG(LOG_ERROR, stt_tag(), "[ERROR] There is no engine!!");
-		return false;
+		return STT_CONFIG_ERROR_OPERATION_FAILED;
 	}
 
 	/* Get a first item */
@@ -131,7 +131,8 @@ int __stt_config_mgr_select_lang(const char* engine_id, char** language)
 
 		if (NULL == engine_info) {
 			SLOG(LOG_ERROR, stt_tag(), "engine info is NULL");
-			return false;
+			iter = g_slist_next(iter);
+			continue;
 		}
 
 		if (0 != strcmp(engine_id, engine_info->uuid)) {
@@ -139,37 +140,20 @@ int __stt_config_mgr_select_lang(const char* engine_id, char** language)
 			continue;
 		}
 
-		GSList *iter_lang = NULL;
-		char* engine_lang = NULL;
-		if (g_slist_length(engine_info->languages) > 0) {
-			/* Get a first item */
-			iter_lang = g_slist_nth(engine_info->languages, 0);
-
-			while (NULL != iter_lang) {
-				engine_lang = iter_lang->data;
-				if (NULL != engine_lang) {
-					/* Default language is STT_BASE_LANGUAGE */
-					if (0 == strcmp(STT_BASE_LANGUAGE, engine_lang)) {
-						*language = strdup(engine_lang);
-						SLOG(LOG_DEBUG, stt_tag(), "Selected language : %s", (NULL == *language) ? "NULL" : *language);
-						return 0;
-					}
-				}
+		if (NULL == engine_info->default_lang) {
+			SLOG(LOG_ERROR, stt_tag(), "[ERROR] Default language of the engine info is NULL");
+			return STT_CONFIG_ERROR_INVALID_LANGUAGE;
+		}
 
-				iter_lang = g_slist_next(iter_lang);
-			}
+		*language = strdup(engine_info->default_lang);
 
-			/* Not support STT_BASE_LANGUAGE */
-			if (NULL != engine_lang) {
-				*language = strdup(engine_lang);
-				SLOG(LOG_DEBUG, stt_tag(), "Selected language : %s", (NULL == *language) ? "NULL" : *language);
-				return 0;
-			}
+		if (NULL != *language) {
+			SLOG(LOG_DEBUG, stt_tag(), "Selected language : %s", *language);
+			return STT_CONFIG_ERROR_NONE;
 		}
-		break;
 	}
 
-	return -1;
+	return STT_CONFIG_ERROR_OPERATION_FAILED;
 }
 
 Eina_Bool stt_config_mgr_inotify_event_cb(void* data, Ecore_Fd_Handler *fd_handler)
@@ -1707,7 +1691,7 @@ int stt_config_mgr_add_time_info(int index, int event, const char* text, long st
 	info->start_time = start_time;
 	info->end_time = end_time;
 
-	SLOG(LOG_DEBUG, stt_tag(), "[DEBUG] inside stt_config_mgr_add_time_info: index(%d), text(%s), start time(%d), end_time(%d)", info->index, (NULL == info->text) ? "NULL" : info->text, info->start_time, info->end_time);
+	SECURE_SLOG(LOG_DEBUG, stt_tag(), "[DEBUG] inside stt_config_mgr_add_time_info: index(%d), text(%s), start time(%ld), end_time(%ld)", info->index, (NULL == info->text) ? "NULL" : info->text, info->start_time, info->end_time);
 
 	/* Add item to global list */
 	g_time_list = g_slist_append(g_time_list, info);