Fix build warnings

Change-Id: I51d91fc4b197f33a3b10e9218ef932733a203c92
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/src/request_mgr.cpp b/src/request_mgr.cpp
index 822103b..e5e8629 100644 (file)
--- a/src/request_mgr.cpp
+++ b/src/request_mgr.cpp
@@ -249,7 +249,7 @@ void smr::request_mgr::string_to_unicode(vector<string>& replies) {
                        size_t idx = it->find(emoticon.first);
                        if (idx != string::npos) {
                                int length;
-                               const Eina_Unicode unicode_event[2] = { emoticon.second, 0 };
+                               const Eina_Unicode unicode_event[2] = { (Eina_Unicode)emoticon.second, 0 };
                                char* utf_8 = eina_unicode_unicode_to_utf8(unicode_event, &length);
                                it->replace(idx, emoticon.first.length(), string(utf_8));
                                _SI("[utf-8]Before : %s, After : %s", emoticon.first.c_str(), utf_8);

diff --git a/src/smart_reply_daemon.cpp b/src/smart_reply_daemon.cpp
index 5b59296..bca7035 100644 (file)
--- a/src/smart_reply_daemon.cpp
+++ b/src/smart_reply_daemon.cpp
@@ -32,8 +32,8 @@ static bool started = false;
 Ecore_Timer* smart_reply_daemon::timer = NULL;
 const double smart_reply_daemon::engine_duration_secs = 600;
 
-smr::smart_reply_daemon::smart_reply_daemon() : _engine_mgr(Sophie::language_engine_mgr::get_instance()),
-               _request_mgr(request_mgr::get_instance()), _language_mgr(system_language_mgr::get_instance()) {
+smr::smart_reply_daemon::smart_reply_daemon() : _request_mgr(request_mgr::get_instance()),
+               _language_mgr(system_language_mgr::get_instance()), _engine_mgr(Sophie::language_engine_mgr::get_instance()) {
 }
 
 smr::smart_reply_daemon::~smart_reply_daemon() {

diff --git a/src/system_language_mgr.cpp b/src/system_language_mgr.cpp
index 42e4a80..5162ecc 100644 (file)
--- a/src/system_language_mgr.cpp
+++ b/src/system_language_mgr.cpp
@@ -49,14 +49,18 @@ void smr::system_language_mgr::init(system_language_callback* callback) {
 }
 
 void smr::system_language_mgr::on_language_changed(system_settings_key_e key, void *user_data) {
-       char * locale_str;
+       char * locale_str = NULL;
        int ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &locale_str);
-       string lang(locale_str);
-       free(locale_str);
+       if (SYSTEM_SETTINGS_ERROR_NONE == ret) {
+               string lang(locale_str);
+               string prev = system_language_mgr::get_instance()._current_language;
+               system_language_mgr::get_instance()._current_language = lang;
+               system_language_mgr::get_instance()._callback->on_changed_system_language(lang, prev);
+       }
 
-       string prev = system_language_mgr::get_instance()._current_language;
-       system_language_mgr::get_instance()._current_language = lang;
-       system_language_mgr::get_instance()._callback->on_changed_system_language(lang, prev);
+       if (locale_str != NULL) {
+               free(locale_str);
+       }
 }
 
 const std::string& smr::system_language_mgr::get_current_language() {