Fix prevent issues

[apps/core/preloaded/settings.git] / src / setting-plugin.c

diff --git a/src/setting-plugin.c b/src/setting-plugin.c
index 928b62a..c2fe5fc 100755 (executable)
--- a/src/setting-plugin.c
+++ b/src/setting-plugin.c
@@ -117,6 +117,8 @@ static void __drawer_add(const char *type, drawer_fp draw)
 
                _g_drawer_list = eina_list_append(_g_drawer_list, node);
        }
+
+       FREE(node);
 }
 
 
@@ -197,6 +199,7 @@ void setting_drawer_list_fini()
 
 static char* s_pkg_name;
 
+#if 0
 static char* substring(const char* str, size_t begin, size_t len)
 {
   if (str == 0 || strlen(str) == 0 || strlen(str) < begin || strlen(str) < (begin+len))
@@ -204,6 +207,7 @@ static char* substring(const char* str, size_t begin, size_t len)
 
   return strndup(str + begin, len);
 }
+#endif
 
 /**
  * package ID
@@ -274,7 +278,11 @@ static DBusHandlerResult __signal_filter(DBusConnection* conn, DBusMessage* mess
                // received key : checkbox1|N/A , value : INT|1
                //-------------------------------------------------------------
                //char* key = "checkbox1|N/A";
-               char* ptr = strchr(key, '|');
+               char* ptr = NULL;
+
+               if (key) {
+                       ptr = strchr(key, '|');
+               }
 
                xmlDocPtr doc = NULL;
                if (ptr && key)
@@ -508,7 +516,7 @@ static void ___click_softkey_back_cb(void *data, Evas_Object *obj,
 static void* group_func(void *data, xmlNode *xmlObj)
 {
        SETTING_TRACE_BEGIN;
-       ret_if(!data || !xmlObj);
+       retv_if(!data || !xmlObj, NULL);
 
        PluginNode* node = (PluginNode*)data;
        Draw_Data *pd = node->pd;
@@ -549,21 +557,21 @@ static void* group_func(void *data, xmlNode *xmlObj)
 static void* __link_list_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
-       ret_if(data == NULL);
-       retm_if(event_info == NULL, "Invalid argument: event info is NULL");
+       retv_if(data == NULL, NULL);
+       retvm_if(event_info == NULL, NULL, "Invalid argument: event info is NULL");
        Elm_Object_Item *item = (Elm_Object_Item *) event_info;
        elm_genlist_item_selected_set(item, 0);
        Setting_GenGroupItem_Data *list_item =
            (Setting_GenGroupItem_Data *) elm_object_item_data_get(item);
 
        xmlNode* xmlObj = data;
-       ret_if(!xmlObj);
+       retv_if(!xmlObj, NULL);
        const char *link_file = (char*)xmlGetProp(xmlObj, "value");
 
        if(!link_file)
        {
                SETTING_TRACE_ERROR("Invalidate liked file");
-               return;
+               return NULL;
        }
        char file[1024] = {0,};
        snprintf(file, sizeof(file), "%s/%s", PLUGIN_CFG_DIR, link_file);
@@ -580,15 +588,15 @@ static void* __link_list_cb(void *data, Evas_Object *obj, void *event_info)
 static void* __launch_list_cb(void *data, Evas_Object *obj, void *event_info)
 {
        SETTING_TRACE_BEGIN;
-       ret_if(data == NULL);
-       retm_if(event_info == NULL, "Invalid argument: event info is NULL");
+       retv_if(data == NULL, NULL);
+       retvm_if(event_info == NULL, NULL, "Invalid argument: event info is NULL");
        Elm_Object_Item *item = (Elm_Object_Item *) event_info;
        elm_genlist_item_selected_set(item, 0);
        Setting_GenGroupItem_Data *list_item =
            (Setting_GenGroupItem_Data *) elm_object_item_data_get(item);
 
        xmlNode* xmlObj = data;
-       ret_if(!xmlObj);
+       retv_if(!xmlObj, NULL);
        const char *key_str = (char*)xmlGetProp(xmlObj, "id");
        const char *title_str = (char*)xmlGetProp(xmlObj, "title");
        const char *appid_str = (char*)xmlGetProp(xmlObj, "appid");
@@ -608,7 +616,7 @@ static void* __launch_list_cb(void *data, Evas_Object *obj, void *event_info)
 static void* label_func(void *data, xmlNode *xmlObj)
 {
        SETTING_TRACE_BEGIN;
-       ret_if(!data || !xmlObj);
+       retv_if(!data || !xmlObj, NULL);
        PluginNode* node = (PluginNode*)data;
        Draw_Data *pd = node->pd;
 
@@ -626,7 +634,7 @@ static void* label_func(void *data, xmlNode *xmlObj)
 static void* link_func(void *data, xmlNode *xmlObj)
 {
        SETTING_TRACE_BEGIN;
-       ret_if(!data || !xmlObj);
+       retv_if(!data || !xmlObj, NULL);
        PluginNode* node = (PluginNode*)data;
        Draw_Data *pd = node->pd;
 
@@ -643,7 +651,7 @@ static void* link_func(void *data, xmlNode *xmlObj)
 static void* launch_func(void *data, xmlNode *xmlObj)
 {
        SETTING_TRACE_BEGIN;
-       ret_if(!data || !xmlObj);
+       retv_if(!data || !xmlObj, NULL);
        PluginNode* node = (PluginNode*)data;
        Draw_Data *pd = node->pd;
 
@@ -690,7 +698,7 @@ static void __slider_stop_cb(void *data, Evas_Object *obj,
 static void* slider_func(void *data, xmlNode *xmlObj)
 {
        SETTING_TRACE_BEGIN;
-       ret_if(!data || !xmlObj);
+       retv_if(!data || !xmlObj, NULL);
        PluginNode* node = (PluginNode*)data;
        Draw_Data *pd = node->pd;
 
@@ -841,7 +849,7 @@ static void __chk_btn_cb(void *data, Evas_Object *obj,
 static void* checkbox_func(void *data, xmlNode *xmlObj)
 {
        SETTING_TRACE_BEGIN;
-       ret_if(!data || !xmlObj);
+       retv_if(!data || !xmlObj, NULL);
 
        PluginNode* node = (PluginNode*)data;
        Draw_Data *pd = node->pd;
@@ -897,7 +905,11 @@ static void __entry_unfocus_cb(void *data, Evas_Object *obj, void *event_info)
        Setting_GenGroupItem_Data *list_item = data;
 
        xmlNode* xmlObj = list_item->userdata;
-       ret_if(!xmlObj);
+       if(!xmlObj) {
+               FREE(entry_str_utf8);
+               return;
+       }
+
        xmlAttrPtr newattr;
        const char *title = (char*)xmlSetProp(xmlObj, "value",entry_str_utf8);
 
@@ -952,7 +964,7 @@ static void __editbox_changed_cb(void *data, Evas_Object *obj,
 static void* editbox_func(void *data, xmlNode *xmlObj)
 {
        SETTING_TRACE_BEGIN;
-       ret_if(!data || !xmlObj);
+       retv_if(!data || !xmlObj, NULL);
 
        PluginNode* node = (PluginNode*)data;
        Draw_Data *pd = node->pd;
@@ -960,17 +972,44 @@ static void* editbox_func(void *data, xmlNode *xmlObj)
        const char *title = (char*)xmlGetProp(xmlObj, "title");
        const char *key_str= (char*)xmlGetProp(xmlObj, "value");
 
-       //const char *minlength= (char*)xmlGetProp(xmlObj, "minlength");
-       //const char *maxlength= (char*)xmlGetProp(xmlObj, "maxlength");
+       const char *minlength= (char*)xmlGetProp(xmlObj, "minlength");
+       const char *maxlength= (char*)xmlGetProp(xmlObj, "maxlength");
 
-       // TODO: minlength
-       // TODO: maxlength
-       Setting_GenGroupItem_Data *list_item =
-           setting_create_Gendial_field_def(pd->scroller, &(itc_1icon),
-                                            __editbox_list_cb,
-                                            pd, SWALLOW_Type_LAYOUT_ENTRY,
-                                            NULL, NULL, 0, title, key_str,
-                                            __editbox_changed_cb);
+       int max_len = -1;
+       if (maxlength)
+       {
+               max_len = atoi(maxlength);
+               SETTING_TRACE(" >> MAXLENGTH FILTER IS AVAILABLE !!!! maxlength = %d", max_len);
+       }
+
+       Setting_GenGroupItem_Data *list_item = NULL;
+
+       if (max_len == -1)
+       {
+               // without maxlength filter
+               list_item = setting_create_Gendial_field_def(pd->scroller, &(itc_1icon),
+                                                                __editbox_list_cb,
+                                                        pd, SWALLOW_Type_LAYOUT_ENTRY,
+                                                        NULL, NULL, 0, title, key_str,
+                                                        __editbox_changed_cb);
+
+       } else {
+               // add max length filter
+               list_item = setting_create_Gendial_field_entry(
+                                                                       pd->scroller,
+                                                                       &(itc_1icon),
+                                                                       __editbox_list_cb,
+                                                                       pd,
+                                                                       SWALLOW_Type_LAYOUT_ENTRY,
+                                                                       NULL, NULL, 0, title, key_str, __editbox_changed_cb,
+                                                                       ELM_INPUT_PANEL_LAYOUT_NORMAL,
+                                                                       false,
+                                                                       false,
+                                                                       max_len,
+                                                                       0,
+                                                                       NULL, NULL);
+
+       }
        if (list_item) {
                list_item->userdata = xmlObj;
                list_item->stop_change_cb = __entry_unfocus_cb;
@@ -1028,7 +1067,6 @@ static void __expanditem_func_exp_cb(void *data, Evas_Object *obj, void *event_i
        //char *value = (char*)xmlGetProp(xmlObj, "string");
        char *value = (char*)xmlGetProp(xmlObj, "value");
        SETTING_TRACE(">>> value = %s", value);
-       int i=0;
        Evas_Object *rgd = NULL;
 
        if (xmlObj->children && !data_parentItem->rgd) {//to protect from entering repeatly
@@ -1037,7 +1075,6 @@ static void __expanditem_func_exp_cb(void *data, Evas_Object *obj, void *event_i
                rgd = elm_radio_add(scroller);
                elm_radio_value_set(rgd, -1);
 
-               int i;
                char *type;
                char *subitem_title = NULL;
                int subitem_index = 0;
@@ -1068,8 +1105,6 @@ static void __expanditem_func_exp_cb(void *data, Evas_Object *obj, void *event_i
                                } else {
                                        SETTING_TRACE("invalid type[:%s]", type);
                                }
-
-                               i++;
                        }
                        cur = cur->next;
                }
@@ -1105,24 +1140,24 @@ static Evas_Object *setting_create_win_layout2(Evas_Object *win_layout, Evas_Obj
 {
 
     Evas_Object *layout = NULL;
-    Evas_Object *conform = elm_conformant_add(win_obj);
+    //Evas_Object *conform = elm_conformant_add(win_obj);
     //setting_main_appdata *ad = (setting_main_appdata *) data;
 
     /*  Base Layout */
-    layout = elm_layout_add(conform);
-    evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    layout = elm_layout_add(win_obj);
+    //evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
     setting_retvm_if(layout == NULL, FALSE, "layout == NULL");
 
     elm_layout_theme_set(layout, "layout", "application", "default");
-    evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    evas_object_size_hint_align_set(conform, EVAS_HINT_FILL, EVAS_HINT_FILL);
-    elm_win_resize_object_add(win_obj, conform);
-    elm_object_content_set(conform, layout);
+    evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    //elm_win_resize_object_add(win_obj, conform);
+    //elm_object_content_set(conform, layout);
 
     Evas_Object *bg = setting_create_bg(layout, win_obj, "group_list");
     elm_object_part_content_set(layout, "elm.swallow.bg", bg);
     evas_object_show(layout);
-    evas_object_show(conform);
+    //evas_object_show(conform);
 
     //ad->conformant = conform;
     return layout;
@@ -1149,7 +1184,7 @@ Evas_Object *setting_create_layout_navi_bar2(Evas_Object *win_layout, Evas_Objec
 static void* setting_func(void *data, xmlNode *xmlObj)
 {
        SETTING_TRACE_BEGIN;
-       ret_if(!data || !xmlObj);
+       retv_if(!data || !xmlObj, NULL);
 
 #if 1
        PluginNode* node = (PluginNode*)data;
@@ -1193,7 +1228,7 @@ static void* expanditem_func(void *data, xmlNode *xmlObj)
 static void* expandlist_func(void *data, xmlNode *xmlObj)
 {
        SETTING_TRACE_BEGIN;
-       ret_if(!data || !xmlObj);
+       retv_if(!data || !xmlObj, NULL);
 
        PluginNode* node = (PluginNode*)data;
        Draw_Data *pd = node->pd;
@@ -1419,6 +1454,12 @@ PluginNode* setting_plugin_create()
        PluginNode *node = calloc(1, sizeof(PluginNode));
 
        Draw_Data *pd = calloc(1, sizeof(Draw_Data));
+
+       if (node && !pd) {
+               free(node);
+               node = NULL;
+       }
+
        setting_retvm_if(!pd, -1, "Create Draw_Data obj failed");
        //eina_init();