Remove build warnings 83/152583/8 accepted/tizen/4.0/unified/20171012.074340 accepted/tizen/unified/20171012.075031 submit/tizen/20171010.083016 submit/tizen/20171011.081434 submit/tizen_4.0/20171010.082947 submit/tizen_4.0/20171011.081501 tizen_4.0.IoT.p1_release
authorKiseok Chang <kiso.chang@samsung.com>
Tue, 26 Sep 2017 10:49:21 +0000 (19:49 +0900)
committerKiseok Chang <kiso.chang@samsung.com>
Tue, 10 Oct 2017 06:45:00 +0000 (15:45 +0900)
Change-Id: Iacbf11805b25aa2cbd601a2c234185708578c236
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>
28 files changed:
include/setting-debug.h [changed mode: 0644->0755]
setting-about/src/setting-about-main.c [changed mode: 0644->0755]
setting-common/include/setting-common-draw-widget.h [changed mode: 0644->0755]
setting-common/include/setting-common-general-func.h [changed mode: 0644->0755]
setting-common/include/setting-common-search.h [changed mode: 0644->0755]
setting-common/src/setting-common-draw-genlist.c [changed mode: 0644->0755]
setting-common/src/setting-common-general-func.c [changed mode: 0644->0755]
setting-common/src/setting-common-search.c [changed mode: 0644->0755]
setting-common/src/setting-common-sound.c [changed mode: 0644->0755]
setting-display/src/setting-display-brightness.c [changed mode: 0644->0755]
setting-display/src/setting-display-main.c [changed mode: 0644->0755]
setting-font/src/setting-font-font-size.c [changed mode: 0644->0755]
setting-font/src/setting-font-main.c [changed mode: 0644->0755]
setting-font/src/setting-font.c [changed mode: 0644->0755]
setting-phone/src/setting-phone-display-language.c [changed mode: 0644->0755]
setting-phone/src/setting-phone.c [changed mode: 0644->0755]
setting-profile/src/setting-profile-common.c [changed mode: 0644->0755]
setting-profile/src/setting-profile-sound-main.c [changed mode: 0644->0755]
setting-ringtone/include/setting-ringtone-util.h [changed mode: 0644->0755]
setting-ringtone/src/setting-ringtone-util.c [changed mode: 0644->0755]
setting-storage/src/setting-storage-SD.c [changed mode: 0644->0755]
setting-storage/src/setting-storage-default.c [changed mode: 0644->0755]
setting-storage/src/setting-storage-main.c [changed mode: 0644->0755]
setting-storage/src/setting-storage-miscellaneous.c [changed mode: 0644->0755]
setting-time/src/setting-time-main.c [changed mode: 0644->0755]
src/conf_util/setting_confutil.c [changed mode: 0644->0755]
src/setting-main.c [changed mode: 0644->0755]
src/setting-support-shortcut/support_help_ringtone.c [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index 6b71385..bbfad10
@@ -70,7 +70,6 @@
 /* Genlist Update is in progress. */
 
 #define FUNCTION_SYSTEM_SETTING 1
-#define SETTING_SEARCH 1
 
 /*##menu options##*/
 #define SUPPORT_FONT                           1
old mode 100644 (file)
new mode 100755 (executable)
index d7b92e3..658feae
@@ -1300,12 +1300,8 @@ int setting_about_main_generate_genlist(void *data)
        bool is_emul_bin = isEmulBin();
 
        Evas_Object *scroller = ad->genlsit;
-       Elm_Object_Item *item = NULL;
        Setting_GenGroupItem_Data *item_data = NULL;
        char str[MAX_DISPLAY_STR_LEN_ON_PHONE_INFO] = { 0, };
-       int i = 0;
-       int ret_value = 0;
-       int ret_get_app_info = 0;
 
        /* 1. Name */
        /* Device name */
@@ -1337,7 +1333,7 @@ int setting_about_main_generate_genlist(void *data)
                                                                                 NULL, SWALLOW_Type_INVALID, NULL,
                                                                                 NULL, 0, "IDS_ST_MBODY_TIZEN_VERSION", str, NULL);
        if (item_data) {
-               elm_object_item_disabled_set(str, EINA_TRUE);
+               elm_object_item_disabled_set(item_data->item, EINA_TRUE);
                elm_genlist_item_select_mode_set(item_data->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
        } else {
                SETTING_TRACE_ERROR("item_data is NULL");
@@ -1353,7 +1349,7 @@ int setting_about_main_generate_genlist(void *data)
                                                                                         NULL, SWALLOW_Type_INVALID, NULL,
                                                                                         NULL, 0, "IDS_ST_MBODY_BLUETOOTH_ADDRESS", str, NULL); /*ad->itc_2text_2 */
                if (ad->item_data_bt) {
-                       elm_object_item_disabled_set(str, EINA_TRUE);
+                       elm_object_item_disabled_set(ad->item_data_bt->item, EINA_TRUE);
                        elm_genlist_item_select_mode_set(ad->item_data_bt->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
                        __BACK_POINTER_SET(ad->item_data_bt);
                } else {
@@ -1372,7 +1368,7 @@ int setting_about_main_generate_genlist(void *data)
                                                                                 NULL, SWALLOW_Type_INVALID, NULL,
                                                                                 NULL, 0, "IDS_ST_BODY_WI_FI_MAC_ADDRESS", str, NULL);
        if (ad->item_data_wifi) {
-               elm_object_item_disabled_set(str, EINA_TRUE);
+               elm_object_item_disabled_set(ad->item_data_wifi->item, EINA_TRUE);
                elm_genlist_item_select_mode_set(ad->item_data_wifi->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
                __BACK_POINTER_SET(ad->item_data_wifi);
        } else {
@@ -1387,7 +1383,7 @@ int setting_about_main_generate_genlist(void *data)
                                                                                 NULL, SWALLOW_Type_INVALID, NULL,
                                                                                 NULL, 0, "IDS_ST_BUTTON_BATTERY_POWER_ABB", str, NULL);
        if (item_data) {
-               elm_object_item_disabled_set(str, EINA_TRUE);
+               elm_object_item_disabled_set(item_data->item, EINA_TRUE);
                elm_genlist_item_select_mode_set(item_data->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
                ad->item_data_battery = item_data;
                __BACK_POINTER_SET(ad->item_data_battery);
@@ -1410,7 +1406,7 @@ int setting_about_main_generate_genlist(void *data)
                                                                                                                         NULL, SWALLOW_Type_INVALID, NULL,
                                                                                                                         NULL, 0, SETTING_ABOUT_CPU_USAGE_STR, str, NULL);
        if (ad->item_data_cpu) {
-               elm_object_item_disabled_set(str, EINA_TRUE);
+               elm_object_item_disabled_set(ad->item_data_cpu->item, EINA_TRUE);
                elm_genlist_item_select_mode_set(ad->item_data_cpu->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
                __BACK_POINTER_SET(ad->item_data_cpu);
        } else {
old mode 100644 (file)
new mode 100755 (executable)
index 0e31938..f6c0508
@@ -90,32 +90,6 @@ extern const Elm_Genlist_Item_Class itc_1text_1icon_divider;
                } \
        }
 
-#define ADD_GL_HELP(scroller, str) \
-       {\
-               if (str) {\
-                       Setting_GenGroupItem_Data *item_data = setting_create_Gendial_field_def(scroller, &itc_multiline_text,\
-                                                                                                                                                                       NULL,\
-                                                                                                                                                                       NULL,\
-                                                                                                                                                                       SWALLOW_Type_LAYOUT_SPECIALIZTION_X,\
-                                                                                                                                                                       NULL, NULL, 0, str, NULL, NULL);\
-                       setting_retvm_if(NULL == item_data, NULL, "item_data is NULL");\
-                       elm_genlist_item_select_mode_set(item_data->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);\
-               } \
-       }
-
-#define ADD_GL_HELP_NO_SEP(scroller, str) \
-       {\
-               if (str) {\
-                       Setting_GenGroupItem_Data *item_data = setting_create_Gendial_field_def(scroller, &itc_multiline_text,\
-                                                                                                                                                                       NULL,\
-                                                                                                                                                                       NULL,\
-                                                                                                                                                                       SWALLOW_Type_LAYOUT_SPECIALIZTION_X,\
-                                                                                                                                                                       NULL, NULL, 0,  str, NULL, NULL);\
-                       setting_retvm_if(NULL == item_data, NULL, "item_data is NULL");\
-                       elm_genlist_item_select_mode_set(item_data->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);\
-               } \
-       }
-
 #define ADD_GL_BUTTON(scroller, btn_str, btn_cb, cb_data) \
        {\
                if (btn_str) {\
old mode 100644 (file)
new mode 100755 (executable)
index a34b792..bd7d5b0
@@ -110,7 +110,7 @@ extern char *multilanguage_text_upper(const char *s);
 
 extern bool get_substring_int(const char **ipStr, int *ipValue, char delim);
 extern bool is_ip_string(const char *ipstr, char **output);
-extern int setting_invoke_reset_function(char *ug_name, app_control_h service, void *ext);
+
 extern int excuteCmd(char *exec_path, int option_num, ...);
 
 extern char *get_icon_path(const char *package);
old mode 100644 (file)
new mode 100755 (executable)
index 3448431..d157b01
@@ -90,7 +90,4 @@ extern void setting_add_db_search_index(sqlite3 *db, char *locale, char *keystr,
 extern int setting_searchdb_open(sqlite3 **ppdb);
 extern void setting_searchdb_close(sqlite3 *db);
 
-extern int __setting_init_search_index_app();
-extern int __setting_init_search_index_module();
-
 #endif /* _SETTING_SEARCH_H_ */
old mode 100644 (file)
new mode 100755 (executable)
index 77ebbfe..18b9d6c
@@ -28,8 +28,6 @@
 
 #define DEF_BUF_SIZE 32
 
-static char *_gl_Gendial_text_get(void *data, Evas_Object *obj, const char *part);
-
 static Evas_Object *_gl_Gendial_content_get(void *data, Evas_Object *obj, const char *part);
 static char *_gl_Gendial_new_text_get(void *data, Evas_Object *obj, const char *part);
 
@@ -373,37 +371,6 @@ static char *_gl_Gendial_new_text_get(void *data, Evas_Object *obj,
 
 
 
-static char *_gl_Gendial_text_get(void *data, Evas_Object *obj,
-                                                                 const char *part)
-{
-       /*SETTING_TRACE_BEGIN; */
-       Setting_GenGroupItem_Data *item_data =
-               (Setting_GenGroupItem_Data *) data;
-       /* SETTING_TRACE("part:%s", part); */
-
-       char *ret_str = NULL;
-       if (!safeStrCmp(part, "elm.text.main") || !safeStrCmp(part, "elm.text.main.left") || !safeStrCmp(part, "elm.text.main.left.top")) {     /* title */
-               if (item_data->keyStr) {
-                       ret_str = (char *)g_strdup(_(item_data->keyStr));       /* use item_data->keyStr */
-               }
-
-       } else if (!safeStrCmp(part, "elm.text.2") || !safeStrCmp(part, "elm.text.sub.left.bottom")) {  /* bottom or right */
-               if (item_data->sub_desc) {
-                       ret_str = (char *)g_strdup(_(item_data->sub_desc));
-               }
-
-       } else if (!safeStrCmp(part, "elm.text.multiline")) {   /* title */
-               if (item_data->keyStr) {
-                       ret_str = (char *)g_strdup(_(item_data->keyStr));
-               }
-       } else {
-               FREE(ret_str);
-               return NULL;
-       }
-
-       return ret_str;
-}
-
 static Evas_Object *__add_check_invisible(Setting_GenGroupItem_Data *item_data, Evas_Object *parent)
 {
        retv_if(!item_data || !parent, NULL);
@@ -1180,6 +1147,10 @@ static Evas_Object *__add_datefield_new(Setting_GenGroupItem_Data *item_data, Ev
 
        param->item_data->btn_left = btn_left;
        param->item_data->btn_right = btn_right;
+
+       FREE(date);
+       FREE(time);
+
        Evas_Object *box = elm_box_add(parent);
        evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
old mode 100644 (file)
new mode 100755 (executable)
index bb282b7..e2deea4
@@ -1330,53 +1330,6 @@ bool is_ip_string(const char *ipstr, char **output)
        return TRUE;
 }
 
-EXPORT_PUBLIC
-int setting_invoke_reset_function(char *ug_name, app_control_h service, void *ext)
-{
-       SETTING_TRACE("Enter %s with ug_name:%s", __FUNCTION__, ug_name);
-       int (*reset)(app_control_h pair, void *ptr);
-       int ret = OPERATE_LIB_SUCESS;
-
-       /*1.first do exist-checking in /opt/ug/lib */
-       char ug_file[PATH_MAX + 1];
-       snprintf(ug_file, PATH_MAX, "%s/libug-%s.so", SETTING_UG_PATH, ug_name);
-       struct stat st;
-       if (stat(ug_file, &st) != 0) {
-
-               /*2.if it does not exit in /opt/ug/lib, then do exist-checking in (_TZ_SYS_RO_UG)/lib */
-               memset(ug_file, 0x00, PATH_MAX + 1);
-               snprintf(ug_file, PATH_MAX, "%s/libug-%s.so", SETTING_UG_PATH_USR, ug_name);
-               if (stat(ug_file, &st) != 0) {
-                       /*both not exist,skip it */
-                       SETTING_TRACE_ERROR(" libug-%s.so is *NOT* present, so skip it..\n", ug_name);
-                       return OPERATE_LIB_SUCESS;
-               }
-       }
-       /*------------------------------------------------------------------------------------- */
-       void *handle = dlopen(ug_file, RTLD_LAZY);
-       if (!handle) {
-               SETTING_TRACE_ERROR(" >>>>>>>>>>> %s", dlerror());
-               return LOAD_LIB_FAILED;
-       }
-
-       char *error = NULL;
-       reset = dlsym(handle, "setting_plugin_reset");
-       if ((error = dlerror()) != NULL) {
-               SETTING_TRACE_ERROR(" >>>>>>>>>>> %s", error);
-               dlclose(handle);
-               return UNDEFINED_LIB_SYMBOL;
-       }
-
-       if (reset)
-               ret = (*reset)(service, ext);    /*      CALL */
-
-       if (ret < 0) ret += UNDEFINED_LIB_SYMBOL;/*from -2 on */
-
-       dlclose(handle);
-       return ret;
-}
-
-
 EXPORT_PUBLIC
 int excuteCmd(char *exec_path, int option_num, ...)
 {
old mode 100644 (file)
new mode 100755 (executable)
index 7eb49e2..b7973da
@@ -531,7 +531,7 @@ int setting_search_get_module_item_state(char *keyword, char *ug_name, Cfg_Item_
        if (query_ops && keyword) {
                /* OPS RETURNS NULL, IT'S PROBLEM */
                cfg_func_table *ops = NULL;
-               /* ret = (*query_ops) ("MOCK_STR_ID", &ops);   /*  CALL * / */
+               /* ret = (*query_ops) ("MOCK_STR_ID", &ops);   //  CALL  */
                ret = (*query_ops)(keyword, (void **)&ops);       /*  CALL */
                SETTING_TRACE(" ops = %x ", ops);
                /*------------------------------------------------------------- */
@@ -550,268 +550,3 @@ int setting_search_get_module_item_state(char *keyword, char *ug_name, Cfg_Item_
 }
 #endif
 
-
-EXPORT_PUBLIC
-int __setting_init_search_index_module()
-{
-
-       /* test, adding sql query */
-       sqlite3 *db = NULL;
-       setting_searchdb_open(&db);
-       SETTING_TRACE("search db = %d", db);
-
-       char *backup_langset =  vconf_get_str(VCONFKEY_LANGSET);
-       char *ug_name_arr[] = {
-               "setting-display-efl",                                  /* finish */
-               "setting-profile-efl",                                  /* finish */
-               "setting-call-efl",                                             /* NO CODE !!! -- put  node here for testing */
-               "setting-cloud-efl",                                    /*finish */
-               "quickcommand-setting-efl",                             /* finish */
-               "setting-mobileap-efl",                                 /* finish */
-               "lockscreen-options",                                   /* finish */
-               "email-setting-efl",                                    /* NO CODE !!! */
-               "emergency-msg-setting-efl",                    /* NO CODE !!! */
-               "msg-setting-efl",                                              /* NO CODE !!! */
-               "setting-allshare-cast-efl",                    /* NO CODE !!! */
-               "setting-allshare-efl",                                 /* NO CODE !!! */
-               "setting-blockingmode-efl",                             /* NO CODE !!! */
-               /*"ug-bluetooth-efl", */
-               "setting-dock-efl",                                             /* NO CODE !!! */
-               "setting-drivingmode-efl",                              /* NO CODE !!! */
-               "setting-gallery-efl",                                  /* NO CODE !!! */
-               "setting-homescreen-efl",                               /* NO CODE !!! */
-               "setting-ledindicator-efl",                             /* NO CODE !!! */
-               "setting-location-efl",                                 /* NO CODE !!! */
-               "setting-manage-applications-efl",              /* NO CODE !!! */
-               "setting-manage-certificates-efl",              /* NO CODE !!! */
-               "setting-myaccount-efl",                                /* NO CODE !!! */
-               "setting-phone-efl",                                    /* NO CODE !!! */
-               "setting-readytoshare-efl",                             /* NO CODE !!! */
-               "setting-synchronise-efl",                              /* NO CODE !!! */
-               "wifi-efl-UG",                                                  /* NO CODE !!! */
-               "setting-wifidirect-efl",                               /* NO CODE !!! */
-               "worldclock-efl"                                                /* NO CODE !!! */
-               "setting-nfc-efl",                                              /* NO CODE !!! */
-               "setting-font-efl",                                             /* NO CODE !!! */
-               "quickpanel-setting-efl",                               /* NO CODE !!! */
-               "setting-easymode-efl",                                 /* NO CODE !!! */
-               "setting-accessibility-efl",                    /* NO CODE !!! */
-               "setting-personalpage-efl",                             /* NO CODE !!! */
-               "setting-voice-efl",                                    /* NO CODE !!! */
-               "setting-motion-efl",                                   /* NO CODE !!! */
-               "setting-palmmotion-efl",                               /* NO CODE !!! */
-               "setting-time-efl",                                             /* NO CODE !!! */
-               "setting-accessory-efl",                                /* NO CODE !!! */
-               "setting-powersaving-efl",                              /* NO CODE !!! */
-               "setting-storage-efl",                                  /* NO CODE !!! */
-               "setting-security-efl",                                 /* NO CODE !!! */
-               "setting-privacy-efl",                                  /* NO CODE !!! */
-               "isfsetting-efl",                                       /* NO CODE !!! */
-               "setting-developeroption-efl",                  /* NO CODE !!! */
-               "setting-about-efl",                                            /* NO CODE !!! */
-               "setting-network-efl",                          /*finish */
-               "setting-datausage-efl",
-               "setting-fingerscanner-efl",
-               "setting-vpn-efl",
-       };
-
-       int i;
-       for (i = 0; i < sizeof(ug_name_arr) / sizeof(ug_name_arr[0]); i++) {
-               /*SETTING_TRACE("---------> UG NAME : %s", ug_name_arr[i]); */
-               int ret = -1;
-               Eina_List *plist = NULL;
-               Setting_Cfg_Node_T *n = calloc(1, sizeof(Setting_Cfg_Node_T));
-               if (n) {
-                       n->key_name = strdup("Sentinal");
-                       plist = eina_list_append(plist, n);
-               }
-
-               char *domainname = NULL;
-               ret =  setting_invoke_search_db_function(ug_name_arr[i], NULL, &plist, &domainname);
-               if (ret != OPERATE_LIB_SUCESS) {
-                       SETTING_TRACE_ERROR(" no plugin -- code : %s : %d ", ug_name_arr[i], ret);
-                       continue;
-               } else {
-                       /*SETTING_TRACE(" return : %d", ret); */
-                       SETTING_TRACE(" plugin -- code : %s O.K : %d ", ug_name_arr[i], ret);
-               }
-
-               if (!domainname) {
-                       SETTING_TRACE_ERROR("domainname == NULL, it's error by plugin, not go next");
-                       Eina_List *l = NULL;
-                       Setting_Cfg_Node_T *node = NULL;
-                       /*int count = 0; */
-                       EINA_LIST_FOREACH(plist, l, node) {
-                               FREE(node->key_name);
-                               FREE(node->ug_args);
-                               FREE(node->icon_path);
-                               FREE(node->data);
-                               FREE(node);
-                       }
-                       eina_list_free(plist);
-                       plist = NULL;
-                       FREE(domainname);
-                       continue;
-               }
-               char *p = strchr(domainname, ':');
-
-               char *domain_appname = NULL;
-#if 1
-               if (p) {
-                       char *tempp;
-                       domain_appname = strtok_r(domainname, ":", &tempp);
-
-                       SETTING_TRACE("p1:appname : %s\n", domain_appname);
-                       SETTING_TRACE("p2:localedir : %s\n", p + 1);
-                       /* set */
-                       setting_set_i18n(domain_appname, p + 1);
-               } else {
-                       domain_appname = domainname;
-                       /* default locale */
-                       setting_set_i18n(domain_appname, _TZ_SYS_RO_UG"/res/locale");
-               }
-#endif
-
-               /* test */
-               Eina_List *langlist = setting_get_language_list2(LANGLIST_ALL_FILE_PATH);
-
-               Eina_List *elist = NULL;
-               setting_lang_entry *pnode = NULL;
-               char *locale = NULL;
-               EINA_LIST_FOREACH(langlist, elist, pnode) {
-                       locale = pnode->locale;
-
-                       char str[256];
-                       snprintf(str, 256, "%s.UTF-8", locale);
-                       (void)setlocale(LC_MESSAGES, str);
-
-                       /*-------------------------------------------------------------- */
-                       SETTING_TRACE(" (locale : %s) --------- BEFORE EINA LOOP : %x ", locale, plist);
-                       /* loop and print */
-                       Eina_List *l = NULL;
-                       Setting_Cfg_Node_T *node = NULL;
-                       int count = 0;
-                       EINA_LIST_FOREACH(plist, l, node) {
-                               if (count != 0) {
-#if 0
-                                       SETTING_TRACE(" key_name : %s", node->key_name);
-                                       SETTING_TRACE(" ug_args : %s", node->ug_args);
-                                       SETTING_TRACE(" icon_path : %s", node->icon_path);
-
-                                       SETTING_TRACE(" pos : %d", node->pos);
-                                       SETTING_TRACE(" reset_type : %d", node->reset_type);
-                                       SETTING_TRACE(" click_times : %d", node->click_times);
-                                       SETTING_TRACE(" item_type : %d", node->item_type);
-                                       SETTING_TRACE(" data : %x", node->data);
-                                       SETTING_TRACE(" -----------------------------");
-#else
-                                       SETTING_TRACE(" add DB :: key_name : %s", node->key_name);
-
-
-                                       char *subindex = (node->sub_index) ? node->sub_index : "";
-                                       char *icon_path = (node->icon_path) ? node->icon_path : "";
-
-                                       setting_add_db_search_index(db, locale, __(node->key_name, domain_appname), node->ug_args, node->item_type, ug_name_arr[i], __(subindex, domain_appname), icon_path);
-#endif
-                               }
-                               count++;
-                       }
-                       /*SETTING_TRACE(" --------- AFTER EINA LOOP "); */
-
-               } /* locale - LOOP */
-
-               /*free the list */
-               Eina_List *l = NULL;
-               Setting_Cfg_Node_T *node = NULL;
-
-               EINA_LIST_FOREACH(plist, l, node) {
-                       FREE(node->key_name);
-                       FREE(node->ug_args);
-                       FREE(node->icon_path);
-                       FREE(node->data);
-                       FREE(node->sub_index);
-                       FREE(node);
-               }
-               eina_list_free(plist);
-               plist = NULL;
-               FREE(domainname);
-               /*-------------------------------------------------------------- */
-       }       /* end of for loop */
-
-
-       /* roll back */
-       (void)setlocale(LC_MESSAGES, backup_langset);
-       setting_searchdb_close(db);
-
-       return 0;
-}
-
-EXPORT_PUBLIC
-int __setting_init_search_index_app()
-{
-       /* test, adding sql query */
-       sqlite3 *db = NULL;
-       setting_searchdb_open(&db);
-       SETTING_TRACE("search db = %d", db);
-
-       /* clean all entries */
-       setting_add_db_search_clean(db);
-
-       /* add index for testing */
-       Setting_Cfg_Node_T *pitem = get_cfg_node_first();       /* head */
-       int size = get_cfg_array_size();
-       SETTING_TRACE(" size of array : %d ", size);
-
-       char *locale = NULL;
-       char *backup_langset =  vconf_get_str(VCONFKEY_LANGSET);
-
-       /* get langlist // load language table from XML file */
-       Eina_List *elist = NULL;
-       setting_lang_entry *pnode = NULL;
-       Eina_List *langlist = setting_get_language_list2(LANGLIST_ALL_FILE_PATH);
-
-       EINA_LIST_FOREACH(langlist, elist, pnode) {
-               /*SETTING_TRACE(" locale = %s --- language = %s --- mcc = %s ", pnode->locale, pnode->title, pnode->mcc); */
-               locale = pnode->locale;
-
-               char str[256];
-               snprintf(str, 256, "%s.UTF-8", locale);
-               (void)setlocale(LC_MESSAGES, str);
-
-               int i;
-               for (i = 0; i < size; i++) {
-                       /*SETTING_TRACE(" index : %d ", i); */
-                       char *subindex = (pitem[i].sub_index) ? _(pitem[i].sub_index) : "";
-                       char *icon_path = (pitem[i].icon_path) ? pitem[i].icon_path : "";
-                       if (pitem[i].item_type == Cfg_Item_Title_Node) {
-
-                               setting_add_db_search_index(db, locale, _(pitem[i].key_name), pitem[i].ug_args, pitem[i].item_type/*title in Genlist*/, "", subindex, icon_path);
-
-                       } else if (pitem[i].item_type == Cfg_Item_Ug_Node
-                                          || pitem[i].item_type == Cfg_Item_Ug_Node_Toggle
-                                          || pitem[i].item_type == Cfg_Item_AppLauncher_Node
-                                          || pitem[i].item_type == Cfg_Item_AppLauncher_Node_Toggle
-                                         ) {
-
-                               if (pitem[i].key_name && _(pitem[i].key_name)) {
-                                       setting_add_db_search_index(db, locale, _(pitem[i].key_name), pitem[i].ug_args, pitem[i].item_type/*UG name*/, "", subindex, icon_path);
-                               }
-                       } else if (pitem[i].item_type == Cfg_Item_App_Node) {
-
-                               if (pitem[i].key_name && _(pitem[i].key_name)) {
-                                       setting_add_db_search_index(db, locale, _(pitem[i].key_name), pitem[i].ug_args, pitem[i].item_type/*App Launching*/, "", subindex, icon_path);
-                               }
-                       } else if (pitem[i].item_type == Cfg_Item_Ui_Node
-                                          || pitem[i].item_type == Cfg_Item_Ui_Node_Toggle
-                                         ) {
-
-                               setting_add_db_search_index(db, locale, _(pitem[i].key_name), pitem[i].ug_args, pitem[i].item_type/*UI type*/, "", subindex, icon_path);
-                       }
-               }
-
-       }
-       /* roll back */
-       (void)setlocale(LC_MESSAGES, backup_langset);
-       setting_searchdb_close(db);
-       return 0;
-}
old mode 100644 (file)
new mode 100755 (executable)
index 8764f61..8a0f7ca
@@ -22,8 +22,6 @@
 #include <setting-common-data-slp-setting.h>
 #include <feedback.h>
 
-#define EXPORT_PUBLIC __attribute__((visibility("default")))
-
 /**
  * @brief Initialize function for tap sound playing
  *
old mode 100644 (file)
new mode 100755 (executable)
index 44710da..e61e1dc
@@ -599,7 +599,6 @@ void construct_brightness(void *data, Evas_Object *genlist)
 {
        SettingDisplayUG *ad = (SettingDisplayUG *) data;
        const char *left_icon = NULL;
-       int err;
        int ret = -1;
        int value = SETTING_BRIGHTNESS_LEVEL5;
        char *temp = NULL;
old mode 100644 (file)
new mode 100755 (executable)
index 2976d02..070dd2b
@@ -271,7 +271,6 @@ static int setting_display_main_create(void *cb)
        Evas_Object *scroller = NULL;
        int value = 0;
        int ret = 0;
-       Elm_Object_Item *item = NULL;
 
        SETTING_TRACE_BEGIN;
        /* error check */
old mode 100644 (file)
new mode 100755 (executable)
index 59db69e..dda552b
@@ -151,7 +151,13 @@ static int setting_font_font_size_create(void *cb)
 
 
        /* [UI] help text */
-       ADD_GL_HELP(scroller, STR_FONT_SIZE_CHANGING);
+       Setting_GenGroupItem_Data *item_data = setting_create_Gendial_field_def(scroller, &itc_multiline_text,
+                                                                                                                                                       NULL, NULL,
+                                                                                                                                                       SWALLOW_Type_LAYOUT_SPECIALIZTION_X,
+                                                                                                                                                       NULL, NULL, 0,
+                                                                                                                                                       STR_FONT_SIZE_CHANGING, NULL, NULL);
+       setting_retvm_if(NULL == item_data, SETTING_DRAW_ERR_FAIL_SCROLLER, "item_data is NULL");
+       elm_genlist_item_select_mode_set(item_data->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
 
        /* update check status - init values */
        setting_update_chk_status(ad->size_rdg, INT_SLP_SETTING_ACCESSIBILITY_FONT_SIZE);
old mode 100644 (file)
new mode 100755 (executable)
index 4c41d59..8c01963
@@ -251,6 +251,12 @@ static int setting_font_style_is_exist_string(const Eina_List *list, const char
        return 0;
 }
 
+
+static int strcmp_cb(const void *s1, const void *s2)
+{
+       return safeStrCmp((const char *)s1, (const char *)s2);
+}
+
 /**
  * [API] get a font list from current system
  * REFACTORING: move this feature to system-settings
@@ -333,7 +339,7 @@ static Eina_List *__setting_font_main_available_list_get()
                                                }
                                        }
                                        if (family_result && !setting_font_style_is_exist_string(list, family_result)) {
-                                               list = eina_list_sorted_insert(list, safeStrCmp, strdup(family_result));
+                                               list = eina_list_sorted_insert(list, strcmp_cb, strdup(family_result));
                                                SETTING_TRACE_DEBUG("-------- ADDED FONT - family = %s", family_result);
                                                /* list = eina_list_append(list, family_result); */
                                                /* for TEST because there's 1 font on target. */
@@ -542,21 +548,20 @@ static void __font_vconf_change_cb(keynode_t *key, void *data)
 
        if (!safeStrCmp(vconf_name, VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME)) {
 
-
                char *font_type_name = NULL;
                int ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_FONT_TYPE, &font_type_name);
                if (ret != 0) {
                        SETTING_TRACE("system-setting call failed with error code %d", ret);
                }
                SETTING_TRACE("---------------- system-setting call : (%s) ", font_type_name);
-               char *default_font_name = NULL;
-               default_font_name = _get_default_font();
+               char *default_font_name = _get_default_font();
                char trans_font_type_name[FONT_BUF_SIZE] = {0,};
                if (!safeStrCmp(default_font_name, font_type_name)) {
                        snprintf(trans_font_type_name, FONT_BUF_SIZE, "%s", SETTING_DEFAULT_FONT_TYPE);
                } else {
                        ret = get_font_name_id(font_type_name, trans_font_type_name, FONT_BUF_SIZE);
                }
+               G_FREE(default_font_name);
 
                if (ad->font_type) {
                        G_FREE(ad->font_type->sub_desc);
@@ -647,7 +652,6 @@ static int _slider_endpoint_x()
 static int _slider_startpoint_x(void *data)
 {
        SETTING_TRACE_BEGIN;
-       SettingFontUG *ad = (SettingFontUG *)data;
        int width = 47;
 
        return width;
@@ -885,7 +889,9 @@ static int setting_font_main_create(void *cb)
        __setting_get_font_type_str(ad, font_name);
        int size = -1;
        ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_FONT_SIZE, &size);
+       FREE(font_name);
        setting_retvm_if(ret != 0, SETTING_RETURN_SUCCESS, "fail to get vconf");
+       
        __setting_get_font_size_str(ad, size);
 
        SETTING_TRACE_DEBUG("ad->font_size_str = %s", ad->font_size_str);
@@ -952,13 +958,17 @@ static int setting_font_main_create(void *cb)
        rgd = elm_radio_add(ad->genlist);
        elm_radio_value_set(rgd, -1);
 
-       char *default_font_name = NULL;
-       default_font_name = _get_default_font();
+       char *default_font_name = _get_default_font();
        if (NULL != default_font_name) {
                /*char font_name_dispaly[FONT_BUF_SIZE] = {0,}; */
                SETTING_TRACE_DEBUG("default_font_name:%s", default_font_name);
                Setting_GenGroupItem_Data *item_data = (Setting_GenGroupItem_Data *) calloc(1, sizeof(Setting_GenGroupItem_Data));
-               setting_retvm_if(!item_data, SETTING_RETURN_SUCCESS, "calloc failed");
+               if (!item_data) {
+                       SETTING_TRACE_ERROR("calloc failed");
+                       G_FREE(default_font_name);
+                       return SETTING_RETURN_SUCCESS;
+               }
+
                item_data->keyStr2 = (char *)g_strdup(SETTING_DEFAULT_FONT_TYPE);/*for display */
                item_data->keyStr = (char *)g_strdup(_(SETTING_DEFAULT_FONT_TYPE));/*for tts reading */
                item_data->swallow_type = SWALLOW_Type_1RADIO_RIGHT;
@@ -991,7 +1001,12 @@ static int setting_font_main_create(void *cb)
                        get_font_name_id((char *)font_data, temp, FONT_BUF_SIZE);
                        SETTING_TRACE_DEBUG("font data : %s", (char *)font_data);
                        Setting_GenGroupItem_Data *item_data = (Setting_GenGroupItem_Data *) calloc(1, sizeof(Setting_GenGroupItem_Data));
-                       setting_retvm_if(!item_data, SETTING_RETURN_SUCCESS, "calloc failed");
+                       if (!item_data) {
+                               SETTING_TRACE_ERROR("calloc failed");
+                               G_FREE(default_font_name);
+                               return SETTING_RETURN_SUCCESS;
+                       }
+
                        item_data->keyStr2 = (char *)g_strdup(temp);/*for display */
                        item_data->keyStr = (char *)g_strdup(keyStr);/*for tts reading */
                        item_data->swallow_type = SWALLOW_Type_1RADIO_RIGHT;
old mode 100644 (file)
new mode 100755 (executable)
index 88dcb52..30f9942
@@ -326,29 +326,6 @@ UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops)
  *
  ***************************************************/
 
-/**
-* Reset function to 'reset' the settings of the UG, it will be invoked by 'Reset' UG
-*/
-UG_MODULE_API int setting_plugin_reset(app_control_h service, void *priv)
-{
-       SETTING_TRACE_BEGIN;
-       int ret = 0;
-
-       /* reset font type, default is HelveticaNeue */
-       /*font_config_set("HelveticaNeue"); */
-       char *default_font_name = NULL;
-       default_font_name = _get_default_font();
-       if (NULL != default_font_name) {
-               ret += system_settings_set_value_string(SYSTEM_SETTINGS_KEY_FONT_TYPE, default_font_name);
-       } else {
-               SETTING_TRACE_ERROR("Failed to get default font type");
-       }
-       ret += vconf_set_int(VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, SYSTEM_SETTINGS_FONT_SIZE_NORMAL);
-       setting_retvm_if(ret == -1, ret, "Failed to set vconf");
-       font_size_set();
-
-       return ret;
-}
 static Setting_Cfg_Node_T s_cfg_node_array[] = {
        {"IDS_ST_BODY_FONT_TYPE", NULL, "viewtype:FontType_expand;tab:first;keyword:IDS_ST_BODY_FONT_TYPE", 0, 0, 0, Cfg_Item_View_Node, NULL, NULL, NULL, NULL},
        {"IDS_ST_MBODY_FONT_SIZE", NULL, "viewtype:FontSize_expand;tab:first;keyword:IDS_ST_MBODY_FONT_SIZE", 0, 0, 0, Cfg_Item_View_Node, NULL, NULL, NULL, NULL},
old mode 100644 (file)
new mode 100755 (executable)
index edecfb5..9100d8c
@@ -328,7 +328,6 @@ static int setting_phone_display_language_create(void *cb)
        setting_lang_entry *pnode = NULL;
        int idx = SETTING_LANG_KOREA;           /* 2 */
        int item_idx = 0;
-       Setting_GenGroupItem_Data *last_item = NULL;
        Setting_GenGroupItem_Data *item_data = NULL;
 
        /* load language table from XML file */
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
index 8e3f6ed..9087c96
@@ -295,7 +295,7 @@ static void __enable_sound_menu(void *data)
                if (ad->is_ringtone_slidering) return;/*do need to restore from BACKUP VOLUME */
 
                int mm_value = 0;
-               int ret =  sound_manager_get_volume(SOUND_TYPE_RINGTONE, &mm_value);
+               sound_manager_get_volume(SOUND_TYPE_RINGTONE, &mm_value);
                if (mm_value <= 0) mm_value = 1;
                /*SETTING_TRACE("ret:%d", ret); */
                sound_manager_set_volume(SOUND_TYPE_RINGTONE, mm_value);
@@ -859,8 +859,6 @@ void __setting_sound_ug_key_grab(SettingProfileUG *ad)
        Ecore_X_Display *disp = NULL;
 #endif
 
-       int ret = 0;
-
        if (ad == NULL)
                return;
 
@@ -907,8 +905,6 @@ void __setting_sound_ug_key_ungrab(SettingProfileUG *ad)
        Ecore_X_Display *disp = NULL;
 #endif
 
-       int ret = 0;
-
        if (ad == NULL)
                return;
 
@@ -1036,7 +1032,7 @@ void setting_sound_create_warning_popup_during_call(void *data)
        ret_if(data == NULL);
        SettingProfileUG *ad = (SettingProfileUG *) data;
 
-       int call_status = CM_CALL_STATUS_IDLE;
+       cm_call_status_e call_status = CM_CALL_STATUS_IDLE;
        cm_client_h cm_handle = NULL;
        cm_init(&cm_handle);
        cm_get_call_status(cm_handle, &call_status);
old mode 100644 (file)
new mode 100755 (executable)
index 8acb193..1395380
@@ -305,7 +305,6 @@ static void __get_lite_main_list(void *data)
        ret_if(!data);
        SettingProfileUG *ad = (SettingProfileUG *)data;
 
-       int vconf_value = 0;
        char *sub_desc = NULL;
        char *left_icon = NULL;
        int mm_value = 0;
@@ -443,7 +442,7 @@ void vibration_state_event_handler(const char *event_name, bundle *data, void *u
        SETTING_TRACE("vibration_state_set(%s)", vibration_state_set);
 }
 
-int vibration_state_reg_id;
+unsigned int vibration_state_reg_id;
 
 static Eina_Bool
 setting_soudn_main_click_softkey_back_cb(void *data, Evas_Object *obj,
@@ -767,6 +766,7 @@ setting_sound_main_mouse_up_Gendial_list_cb(void *data,
        Elm_Object_Item *item = (Elm_Object_Item *) event_info;
        elm_genlist_item_selected_set(item, 0);
        Setting_GenGroupItem_Data *list_item = elm_object_item_data_get(item);
+       ret_if(list_item == NULL);
 
        SettingProfileUG *ad = data;
 
old mode 100644 (file)
new mode 100755 (executable)
index 22c85ff..b4a7529
@@ -16,7 +16,6 @@ struct _ugFsNodeInfo {
 
 int get_filelist_from_dir_path(char *path, Eina_List **file_list);
 char *get_filename_from_fullname(const char *fullname);
-inline char *strlower(char *str);
 void ringtone_play_sound(const char *sound_file, player_h **mp_handle);
 void ringtone_stop_sound(void *data);
 
old mode 100644 (file)
new mode 100755 (executable)
index 71fd7c2..3ee28e2
 
 #include "setting-ringtone-util.h"
 
-inline char *strlower(char *str)
-{
-       if (!str) return NULL;
-       char *orig = str;
-       for (; *str != '\0 '; str++)
-               *str = tolower(*str);
-       return orig;
-};
-
 /*remove ext name */
 char *get_filename_from_fullname(const char *fullname)
 {
@@ -80,7 +71,7 @@ int get_filelist_from_dir_path(char *path, Eina_List **file_list)
 {
        SETTING_TRACE_BEGIN;
        DIR *pDir = NULL;
-       struct dirent ent, *result;
+       struct dirent *ent;
 
        retvm_if(path == NULL, -1, "dir path is null");
        retvm_if(file_list == NULL, -1, "file_list is null");
@@ -91,16 +82,15 @@ int get_filelist_from_dir_path(char *path, Eina_List **file_list)
                return -2;
        }
 
-       while (readdir_r(pDir , &ent , &result) == 0) {
-               if (result == NULL) break;
+       while ((ent = readdir(pDir)) != NULL) {
 
                fileNodeInfo *pNode = NULL;
 
-               if (strncmp(ent.d_name, ".", 1) == 0 || strcmp(ent.d_name, "..") == 0) {
+               if (strncmp(ent->d_name, ".", 1) == 0 || strcmp(ent->d_name, "..") == 0) {
                        continue;
                }
 
-               if ((ent.d_type & DT_REG) == 0) {
+               if ((ent->d_type & DT_REG) == 0) {
                        continue;
                }
 
@@ -111,7 +101,7 @@ int get_filelist_from_dir_path(char *path, Eina_List **file_list)
                memset(pNode, 0, sizeof(fileNodeInfo));
 
                pNode->path = g_strdup(path);
-               pNode->name = g_strdup(ent.d_name);
+               pNode->name = g_strdup(ent->d_name);
                pNode->media_name = get_media_basename(pNode->path, pNode->name);
 
                *file_list = eina_list_append(*file_list, pNode);
old mode 100644 (file)
new mode 100755 (executable)
index 1cabfbe..adf52f6
@@ -454,7 +454,10 @@ static inline void storageUg_SD_remove_info(SettingStorageUG *ad)
 
 void storageUg_main_append_SD_info(SettingStorageUG *ad)
 {
+#if 0
        char *str;
+#endif
+
        int mmc_mode;
 
        ret_if(ad == NULL);
old mode 100644 (file)
new mode 100755 (executable)
index 154dbdf..ebfebb5
@@ -249,7 +249,9 @@ static void storageUg_default_main_item_sel(void *data, Evas_Object *obj,
        SettingStorageUG *ad = (SettingStorageUG *) data;
        Elm_Object_Item *parentItem = event_info;       /* parent item */
        elm_genlist_item_selected_set(parentItem, 0);
+
        Setting_GenGroupItem_Data *data_parentItem = elm_object_item_data_get(parentItem);      /* parent data */
+       ret_if(data_parentItem == NULL);
 
        /* create popup */
        if (ad->popup) {
@@ -260,8 +262,9 @@ static void storageUg_default_main_item_sel(void *data, Evas_Object *obj,
        Evas_Object *scroller = NULL;
        ad->popup = setting_create_popup_with_list(&scroller, ad, ad->win,
                                                                                           data_parentItem->keyStr, NULL, 0, false, false, 0);
-       _P(ad->popup);
+       ret_if(ad->popup == NULL);
 
+       _P(ad->popup);
 
        Evas_Object *rgd;
 
@@ -384,7 +387,17 @@ static int storageUg_default_create(void *data)
                SETTING_TRACE_ERROR("ad->data_installapp is NULL");
        }
 
-       ADD_GL_HELP(genlist, STORAGEUG_STR_APP_LOC_NOTICE);
+
+       Setting_GenGroupItem_Data *item_data = setting_create_Gendial_field_def(genlist, &itc_multiline_text,
+                                                                                                                                                       NULL, NULL,
+                                                                                                                                                       SWALLOW_Type_LAYOUT_SPECIALIZTION_X,
+                                                                                                                                                       NULL, NULL, 0,
+                                                                                                                                                       STORAGEUG_STR_APP_LOC_NOTICE, NULL, NULL);
+       setting_retvm_if(NULL == item_data, SETTING_DRAW_ERR_FAIL_SCROLLER, "item_data is NULL");
+       elm_genlist_item_select_mode_set(item_data->item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY);
+
+
+
 
        ret = vconf_notify_key_changed(storageUg_MMC_stat, storageUg_default_mmc_changed_cb,
                                                                   ad);
old mode 100644 (file)
new mode 100755 (executable)
index 4c914c2..5569858
@@ -121,54 +121,54 @@ static inline void storageUg_main_pie_graph_cairo(Evas_Object *pie_image,
 
        /*all, use avaliable color */
        cairo_set_line_width(cr, 4);
-       cairo_arc(cr, cairo_w / 2, cairo_h / 2, cairo_w / 2, 0, 2 * M_PI);
+       cairo_arc(cr, cairo_w / 2., cairo_h / 2., cairo_w / 2., 0, 2 * M_PI);
        cairo_set_source_rgba(cr, 230 / 255., 226 / 255., 218 / 255., 1);
        cairo_fill(cr);
 
        /*system memory */
        account_size = 0.75;
-       cairo_line_to(cr, cairo_w / 2, cairo_h / 2);
-       cairo_arc_negative(cr, cairo_w / 2, cairo_h / 2, cairo_w / 2, account_size * 2 * M_PI,
+       cairo_line_to(cr, cairo_w / 2., cairo_h / 2.);
+       cairo_arc_negative(cr, cairo_w / 2., cairo_h / 2., cairo_w / 2., account_size * 2 * M_PI,
                                           (account_size - system_sz) * 2 * M_PI);
        cairo_set_source_rgba(cr, 153 / 255., 66 / 255., 194 / 255., 1);
        cairo_fill(cr);
        account_size -= system_sz;
 
        /*app */
-       cairo_line_to(cr, cairo_w / 2, cairo_h / 2);
-       cairo_arc_negative(cr, cairo_w / 2, cairo_h / 2, cairo_w / 2, account_size * 2 * M_PI,
+       cairo_line_to(cr, cairo_w / 2., cairo_h / 2.);
+       cairo_arc_negative(cr, cairo_w / 2., cairo_h / 2., cairo_w / 2., account_size * 2 * M_PI,
                                           (account_size - apps_sz) * 2 * M_PI);
        cairo_set_source_rgba(cr, 255 / 255., 189 / 255., 8 / 255., 1);
        cairo_fill(cr);
        account_size -= apps_sz;
 
        /*pic */
-       cairo_line_to(cr, cairo_w / 2, cairo_h / 2);
-       cairo_arc_negative(cr, cairo_w / 2, cairo_h / 2, cairo_w / 2, account_size * 2 * M_PI,
+       cairo_line_to(cr, cairo_w / 2., cairo_h / 2.);
+       cairo_arc_negative(cr, cairo_w / 2., cairo_h / 2., cairo_w / 2., account_size * 2 * M_PI,
                                           (account_size - pics_sz) * 2 * M_PI);
        cairo_set_source_rgba(cr, 119 / 255., 222 / 255., 60 / 255., 1);
        cairo_fill(cr);
        account_size -= pics_sz;
 
        /*audio */
-       cairo_line_to(cr, cairo_w / 2, cairo_h / 2);
-       cairo_arc_negative(cr, cairo_w / 2, cairo_h / 2, cairo_w / 2, account_size * 2 * M_PI,
+       cairo_line_to(cr, cairo_w / 2., cairo_h / 2.);
+       cairo_arc_negative(cr, cairo_w / 2., cairo_h / 2., cairo_w / 2., account_size * 2 * M_PI,
                                           (account_size - audio_size) * 2 * M_PI);
        cairo_set_source_rgba(cr, 28 / 255., 140 / 255., 252 / 255., 1);
        cairo_fill(cr);
        account_size -= audio_size;
 
        /*miscellaneous files */
-       cairo_line_to(cr, cairo_w / 2, cairo_h / 2);
-       cairo_arc_negative(cr, cairo_w / 2, cairo_h / 2, cairo_w / 2, account_size * 2 * M_PI,
+       cairo_line_to(cr, cairo_w / 2., cairo_h / 2.);
+       cairo_arc_negative(cr, cairo_w / 2., cairo_h / 2., cairo_w / 2., account_size * 2 * M_PI,
                                           (account_size - misces_sz) * 2 * M_PI);
        cairo_set_source_rgba(cr, 52 / 255., 220 / 255., 250 / 255., 1);
        cairo_fill(cr);
        account_size -= misces_sz;
 
        /*cache files */
-       cairo_line_to(cr, cairo_w / 2, cairo_h / 2);
-       cairo_arc_negative(cr, cairo_w / 2, cairo_h / 2, cairo_w / 2, account_size * 2 * M_PI,
+       cairo_line_to(cr, cairo_w / 2., cairo_h / 2.);
+       cairo_arc_negative(cr, cairo_w / 2., cairo_h / 2., cairo_w / 2., account_size * 2 * M_PI,
                                           (account_size - cache_sz) * 2 * M_PI);
        cairo_set_source_rgba(cr, 26 / 255., 49 / 255., 125 / 255., 1);
        cairo_fill(cr);
@@ -219,7 +219,6 @@ static inline void storageUg_main_part_pie_graph_set(Evas_Object *parent,
 Evas_Object *storageUg_main_pie_item_get_icon(void *data, Evas_Object *obj,
                                                                                          const char *part)
 {
-       int layout_w, layout_h;
        double used_size;
        Evas_Object *layout;
        SettingStorageUG *ad = data;
@@ -230,11 +229,8 @@ Evas_Object *storageUg_main_pie_item_get_icon(void *data, Evas_Object *obj,
        retv_if(NULL == data, NULL);
        retvm_if(safeStrCmp(part, "elm.swallow.content"), NULL, "part(%s) Invaild", part);
 
-       layout_w = SETTING_STORAGE_PIE_RECT_WIDTH;
-       layout_h = SETTING_STORAGE_PIE_RECT_HEIGHT;
-
        layout = elm_layout_add(obj);
-       Eina_Bool res = elm_layout_file_set(layout, SETTING_THEME_EDJ_NAME, "storage_pie");
+       elm_layout_file_set(layout, SETTING_THEME_EDJ_NAME, "storage_pie");
 
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
@@ -547,6 +543,7 @@ static void storageUg_media_filesys_changed_cb(
        media_content_type_e media_type,
        char *uuid,
        char *path,
+       char *mime_type,
        void *user_data)
 {
        SETTING_TRACE_BEGIN;
old mode 100644 (file)
new mode 100755 (executable)
index 842c6a8..464186b
@@ -97,6 +97,7 @@ more_ctxpopup_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
        evas_object_event_callback_del_full(nf, EVAS_CALLBACK_RESIZE, naviframe_resize_cb, ctxpopup);
 }
 
+/*
 static void
 win_rotation_changed_cb(void *data, Evas_Object *obj, void *event_info)
 {
@@ -104,6 +105,7 @@ win_rotation_changed_cb(void *data, Evas_Object *obj, void *event_info)
        Evas_Object *ctxpopup = data;
        move_more_ctxpopup(ctxpopup);
 }
+*/
 
 /*static inline void storageUg_misces_gl_remove_select_all_item(SettingStorageUG *ad); */
 static void _genlist_check_hide(SettingStorageUG *ad, bool hide)
@@ -177,10 +179,7 @@ static void create_ctxpopup_more_button_cb(void *data, Evas_Object *obj, void *e
 {
        SETTING_TRACE_BEGIN;
        SettingStorageUG  *ad = (SettingStorageUG *) data;
-       Evas_Object *it_obj;
        Evas_Object *nf = ad->navi;
-       Evas_Object *win;
-       Elm_Object_Item *it;
 
        if (ctxpopup != NULL) {
                evas_object_del(ctxpopup);
@@ -336,7 +335,7 @@ static inline void storageUg_meisces_get_list(SettingStorageUG *ad)
 {
        int ret;
        char condition[1024];
-       char *tz_user_content = tzplatform_getenv(TZ_USER_CONTENT);
+       const char *tz_user_content = tzplatform_getenv(TZ_USER_CONTENT);
        filter_h filter = NULL;
 
        ret_if(NULL == ad);
@@ -1049,25 +1048,12 @@ storageUg_misces_cancel_cb(void *data, Evas_Object *obj, void *event_info)
        SETTING_TRACE_END;
 }
 
-static void
-setting_storage_click_softkey_delete_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       SETTING_TRACE_BEGIN;
-       /* error check */
-       retm_if(data == NULL, "Data parameter is NULL");
-
-       SettingStorageUG *ad = (SettingStorageUG *) data;
-
-       return;
-}
-
 /*-------------------------------------------------- */
 /*     name: "storageview_layout"; */
 /*-------------------------------------------------- */
 static int storageUg_misces_create(void *data)
 {
        SettingStorageUG *ad = data;
-       Evas_Object *sel_all = NULL;
 
        retv_if(data == NULL, SETTING_GENERAL_ERR_NULL_DATA_PARAMETER);
 
old mode 100644 (file)
new mode 100755 (executable)
index c43fe06..8b5f724
@@ -198,7 +198,11 @@ bool setting_update_timezone(SettingTimeUG *ad)
        if (displayTimezone != NULL) {
                ret = snprintf(time_zone_sub_str, CITY_BUF_SIZE + GMT_BUF_SIZE + 2, "%s, GMT %s",
                                           displayTimezone, gmt_offset);
-               retv_if(ret < 0, 0);
+               if (ret < 0) {
+                       FREE(displayTimezone);
+                       return 0;
+               }
+
        } else {
                ret = snprintf(time_zone_sub_str, CITY_BUF_SIZE + GMT_BUF_SIZE + 2, "Korean Standard Time, GMT +9:00");
                retv_if(ret < 0, 0);
@@ -245,6 +249,7 @@ static void setting_time_main_int_vconf_change_cb(keynode_t *key, void *data)
 
                strncpy(time_arr, time, DEF_BUF_SIZE);
                time_arr[DEF_BUF_SIZE - 1] = '\0';
+               FREE(time);
 
                elm_object_text_set(ad->data_time->btn_right, time_arr);
                FREE(pa_time_format);
@@ -1033,17 +1038,18 @@ static void __setting_update_datefield_cb(void *cb)
                SETTING_TRACE("year : %d, month : %d, day : %d, hour : %d, min : %d",
                                          ts_ret.tm_year, ts_ret.tm_mon, ts_ret.tm_mday, ts_ret.tm_hour, ts_ret.tm_min);
                if (ts) {
-
                        char *region = NULL;
                        int err = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &region);
                        if (err != SYSTEM_SETTINGS_ERROR_NONE) {
                                SETTING_TRACE("Failed to call system_settings_get_value_string with error code %d", err);
                        }
-                       char *date = __setting_phone_lang_get_by_pattern(region, "MMM/d/yyyy");
-                       char *time;
+                       char *date = NULL, *time = NULL;
                        static char date_arr[DEF_BUF_SIZE], time_arr[DEF_BUF_SIZE];
+
                        char *pa_time_format = get_pa_time_format_str();
                        setting_retm_if(NULL == pa_time_format, "pa_time_format is NULL");
+                       
+                       date = __setting_phone_lang_get_by_pattern(region, "MMM/d/yyyy");
                        if (!strncmp(pa_time_format, "IDS_ST_BODY_12_HOURS", strlen("IDS_ST_BODY_12_HOURS")))
                                time = __setting_phone_lang_get_by_pattern(region, "hhmm");
                        else
@@ -1065,7 +1071,11 @@ static void __setting_update_datefield_cb(void *cb)
                        else {
                                SETTING_TRACE_ERROR("ad->data_time->btn_right is NULL");
                        }
-                       SETTING_TRACE_BEGIN;
+
+
+                       FREE(date);
+                       FREE(time);
+
                        FREE(pa_time_format);
                }
        }
old mode 100644 (file)
new mode 100755 (executable)
index 67408c6..20259de
@@ -124,16 +124,7 @@ int main(int argc, char *argv[])
                generate_setting_cfg();
        } else if ((argc == 2) && (0 == strcmp(argv[1], "mig_cfg"))) {
                migrate_setting_cfg();
-       }
-#if SETTING_SEARCH
-       else if ((argc == 2) && (0 == strcmp(argv[1], "search_db_indexing"))) {
-               /* app db search */
-               __setting_init_search_index_app();
-
-               __setting_init_search_index_module();
-       }
-#endif
-       else {
+       } else {
                /* cfg create */
                /* TRUE or FALSE */
                setting_cfg_create(false);
old mode 100644 (file)
new mode 100755 (executable)
index d6ec7b2..06f52cf
@@ -372,15 +372,13 @@ Evas_Object *setting_main_layout_conform_create(Evas_Object *win_layout, Evas_Ob
  ** @param obj evas object
  ** @param event_info event type
  **/
-static Eina_Bool
+static void
 setting_main_click_softkey_back_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
 
        /* Send destroy request */
        ui_app_exit();
-
-       return EINA_FALSE;
 }
 /**
 * @brief create all view layout
old mode 100644 (file)
new mode 100755 (executable)
index 951e32b..0a74ad8
@@ -32,9 +32,6 @@
 #include <efl_extension.h>
 #include <setting-common-general-func.h>
 
-#define EXPORT_PUBLIC __attribute__((visibility("default")))
-
-
 typedef struct _support_help_appdata {
 
        ui_gadget_h ug;