language/privacy/time: Svace found issues fixes 82/102382/2
authorBartlomiej Uliasz <b.uliasz@samsung.com>
Mon, 5 Dec 2016 12:33:03 +0000 (13:33 +0100)
committerBartlomiej Uliasz <b.uliasz@samsung.com>
Mon, 5 Dec 2016 12:35:59 +0000 (04:35 -0800)
Change-Id: I08518bb51ec013aca426d7575eea3ec107cf5a56
Signed-off-by: Bartlomiej Uliasz <b.uliasz@samsung.com>
setting-language-and-input/src/setting-language-and-input-view.c
setting-privacy/src/setting-privacy-main.c
setting-time/src/setting-time-main.c

index 0e3e8fe803d4685eac96134c2a582912ca15aba3..6fd890ba50a33763cc7f56f2ea63dd2e855f8f46 100644 (file)
@@ -103,6 +103,11 @@ static void setting_lang_create_keyboard_ug(SettingLaIData *ad)
                if (ret == PMINFO_R_OK) {
                        ret = pkgmgrinfo_appinfo_filter_foreach_appinfo(handle,
                                        _find_appid_ime_list, &app_id);
+                       if (ret != PMINFO_R_OK) {
+                               SETTING_TRACE_ERROR("Cannot get apps info");
+                               pkgmgrinfo_appinfo_filter_destroy(handle);
+                               return;
+                       }
                }
                pkgmgrinfo_appinfo_filter_destroy(handle);
        }
index 41e5ea2272064da9a52d5112bc2324c735831020..93f2c88c3dd539fb25d6f3d0ff25e830234d74bf 100755 (executable)
@@ -120,11 +120,9 @@ char *setting_location_is_enabled(void *data)
 
        if (1 == is_enabled)
                return KeyStr_On;
-       else if (0 == is_enabled)
-               return KeyStr_Off;
        else
                return KeyStr_Off;
-       /* @todo : need to check and modify - old return was
+       /* @TODO: need to check and modify - old return was
         * KeyStr_OffSETTING_VCONF_ERR_RETURN_STR_NULL */
 #endif
 }
index cf0da8081e2ba26ce41949c432292f27186a98d6..b24f05526900cc90738915af21a436f710c2a412 100755 (executable)
@@ -870,6 +870,8 @@ static int setting_time_main_create(void *cb)
                        time_t t_current = t_nitz + t_uptime - t_offset;
                        SETTING_TRACE("t_current:%d", t_current);
                        ret = _alarmmgr_set_systime_helper(t_current);
+                       if (ret != ALARMMGR_RESULT_SUCCESS)
+                               SETTING_TRACE_ERROR("Cannot set system time");
                }
                FREE(tzpath);
        }
@@ -1685,16 +1687,11 @@ static char *get_timezone_displayname()
 
        /* get timezone display name (check dst) */
        if (cal) {
-               if (pdata) {
-                       if (pdata->tm_isdst)
-                               status = i18n_ucalendar_get_timezone_displayname(cal, I18N_UCALENDAR_DST,
-                                               localeID, displayName,
-                                               SETTING_STR_SLP_LEN, &buf_size_needed);
-                       else
-                               status = i18n_ucalendar_get_timezone_displayname(cal, I18N_UCALENDAR_DST,
-                                               localeID, displayName,
-                                               SETTING_STR_SLP_LEN, &buf_size_needed);
-               }
+               if (pdata)
+                       status = i18n_ucalendar_get_timezone_displayname(cal,
+                                       I18N_UCALENDAR_DST,
+                                       localeID, displayName,
+                                       SETTING_STR_SLP_LEN, &buf_size_needed);
 
                if (I18N_ERROR_NONE != status) {
                        SETTING_TRACE_ERROR("i18n_ucalendar_get_timezone_displayname got "