Remove OLD_GENLIST_STYLE macro 98/67698/1
authorkiso.chang <kiso.chang@samsung.com>
Thu, 28 Apr 2016 05:38:59 +0000 (14:38 +0900)
committerkiso.chang <kiso.chang@samsung.com>
Thu, 28 Apr 2016 05:40:19 +0000 (14:40 +0900)
 - Remove OLD_GENLIST_STYLE definition and unused functions

Change-Id: I3a2162775ab7e96671b650b7b588b77f619d1248
Signed-off-by: kiso.chang <kiso.chang@samsung.com>
14 files changed:
CMakeLists.txt
include/setting-debug.h
org.tizen.setting.xml.in
setting-appmgr/include/setting-appmgr-main.h
setting-appmgr/src/setting-appmgr-main.c
setting-appmgr/src/setting-appmgr-runinfo.c
setting-appmgr/src/setting-appmgr.c
setting-common/include/setting-common-data-type.h
setting-common/include/setting-common-draw-widget.h
setting-common/src/setting-common-draw-genlist.c
setting-fileview/include/setting-fileview.h
setting-network/src/setting-network-main.c
setting-profile/src/setting-profile-common.c
setting-storage/src/setting-storage-utils.c

index caab26e73a887943a3e9e1ee3797051866267509..818362fea2b16c8c11c364069a1e5738fef7af9e 100755 (executable)
@@ -125,7 +125,7 @@ ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_PASSWORD})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FONT})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FILEVIEW})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_RINGTONE})
-#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_APPMGR})
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_APPMGR})
 ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_FLIGHTMODE})
 #ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/${SETTING_ACCESSIBILITY})
 
index 3961fc383c0c4777f4e606935e7b9fd1cd9bdd37..33637834de64390d97920b0cd0514931e7851b12 100644 (file)
@@ -68,9 +68,6 @@
 /*macros to control program flow*/
 
 /* Genlist Update is in progress. */
-#if 0
-#define OLD_GENLIST_STYLE
-#endif
 
 #define FUNCTION_SYSTEM_SETTING 1
 #define SETTING_SEARCH 1
index c5bb37ea5438a4a7727650604f244e1b803c39b6..e39763213e18abee0db9774c64e95498370e99bf 100755 (executable)
                <privilege>http://tizen.org/privilege/account.write</privilege>
                <privilege>http://tizen.org/privilege/notification</privilege>
                <privilege>http://tizen.org/privilege/volume.set</privilege>
+               <privilege>http://tizen.org/privilege/haptic</privilege>
                <privilege>http://tizen.org/privilege/telephony.admin</privilege>
                <privilege>http://tizen.org/privilege/systemsettings.admin</privilege>
                <privilege>http://tizen.org/privilege/telephony</privilege>
                <privilege>http://tizen.org/privilege/display</privilege>
                <privilege>http://tizen.org/privilege/nfc.admin</privilege>
+
+               <privilege>http://tizen.org/privilege/packagemanager.install</privilege>
+               <privilege>http://tizen.org/privilege/packagemanager.admin</privilege>
+               <privilege>http://tizen.org/privilege/packagemanager.info</privilege>
+               <privilege>http://tizen.org/privilege/system</privilege>
+               <privilege>http://tizen.org/privilege/systemmanager</privilege>
+
+
+               <privilege>http://tizen.org/privilege/application.launch</privilege>
+               <privilege>http://tizen.org/privilege/content.read</privilege>
+               <privilege>http://tizen.org/privilege/filesystem.read</privilege>
+               <privilege>http://tizen.org/privilege/filesystem.write</privilege>
+               <privilege>http://tizen.org/privilege/fullscreen</privilege>
+
+               <privilege>http://tizen.org/privilege/http</privilege>
+               <privilege>http://tizen.org/privilege/ime</privilege>
+               <privilege>http://tizen.org/privilege/internet</privilege>
+               <privilege>http://tizen.org/privilege/mediastorage</privilege>
+               <privilege>http://tizen.org/privilege/network.get</privilege>
+               <privilege>http://tizen.org/privilege/network.profile</privilege>
+               <privilege>http://tizen.org/privilege/network.set</privilege>
+               <privilege>http://tizen.org/privilege/package.info</privilege>
+               <privilege>http://tizen.org/privilege/setting</privilege>
+               <privilege>http://tizen.org/privilege/system</privilege>
+
+
        </privileges>
 </manifest>
index 68b04b65f273d2be3fcf80b61f90d77b14d0e0f7..d1e568822f9439f44ff19d3d50cbca9a8e5b5121 100644 (file)
@@ -23,9 +23,6 @@
 
 void appmgrUg_main_init(SettingAppMgrUG *ad);
 void appmgrUg_main_genlist_append_items(SettingAppMgrUG *ad);
-char *appmgrUg_main_gl_label_get(void *data, Evas_Object *obj, const char *part);
-Evas_Object *appmgrUg_main_gl_icon_get(void *data, Evas_Object *obj,
-                                                                          const char *part);
 
 char *appmgrUg_main_gl_label_new_get(void *data, Evas_Object *obj, const char *part);
 Evas_Object *appmgrUg_main_gl_icon_new_get(void *data, Evas_Object *obj, const char *part);
index 5299218c250c6475d8b64f191f88037f9c439783..3bec374e31aad5711ac6373a6137dc97188436bb 100644 (file)
@@ -396,39 +396,22 @@ char *appmgrUg_main_gl_label_new_get(void *data, Evas_Object *obj, const char *p
        return label;
 }
 
-char *appmgrUg_main_gl_label_get(void *data, Evas_Object *obj, const char *part)
-{
-       char *label = NULL;
-       appmgr_listinfo *info = data;
-
-       retv_if(data == NULL, NULL);
-
-       if (0 == strcmp(part, "elm.text.main.left.top")) {
-               label = SAFE_STRDUP(info->pkg_label);
-       } else if (0 == strcmp(part, "elm.text.sub.left.bottom")) {
-               char desc[APPMGRUG_MAX_STR_LEN] = {0};
-               if (info->valid_size) {
-                       appmgrUg_size_to_str(info->total_size, desc, sizeof(desc));
-                       label = strdup(desc);
-               } else {
-                       label = strdup(_(MGRAPP_STR_COMPUTING));
-               }
-       }
-
-       return label;
-}
-
 static inline char *appmgrUg_get_listinfo_default_icon(const char *appid)
 {
+
+       
        int ret;
        char *icon;
        pkgmgrinfo_appinfo_h handle = NULL;
 
        ret = pkgmgrinfo_appinfo_get_appinfo(appid, &handle);
        warn_if(PMINFO_R_OK != ret, "pkgmgrinfo_appinfo_get_appinfo() Fail(%d)", ret);
+       
 
        icon = appmgrUg_get_defualt_icon(handle);
 
+       SETTING_TRACE(" ==> appid [%s], icon [%s]", appid, icon);
+
        pkgmgrinfo_appinfo_destroy_appinfo(handle);
 
        return icon;
@@ -440,7 +423,6 @@ Evas_Object *appmgrUg_main_gl_icon_new_get(void *data, Evas_Object *obj, const c
        SETTING_TRACE(" ------------> content get [%s]",part);
 
        Evas_Object *icon = NULL;
-       Evas_Object *lay = NULL;
        appmgr_listinfo *info = data;
 
        retv_if(data == NULL, NULL);
@@ -448,51 +430,31 @@ Evas_Object *appmgrUg_main_gl_icon_new_get(void *data, Evas_Object *obj, const c
        if (!safeStrCmp(part, "elm.swallow.icon")) {
                icon = elm_icon_add(obj);
 
+               SETTING_TRACE(" -------> info->icon_path : %s",info->icon_path);
+
                if (NULL == info->icon_path)
                        info->icon_path = appmgrUg_get_listinfo_default_icon(info->mainappid);
 
                elm_image_file_set(icon, info->icon_path, NULL);
+               elm_image_resizable_set(icon, EINA_TRUE, EINA_TRUE);
+               
                evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-               lay = elm_layout_add(obj);
-               retv_if(lay == NULL, NULL);
-               elm_layout_theme_set(lay, "layout", "list/B/type.2", "default");
-               elm_layout_content_set(lay, "elm.swallow.content", icon);
-
-               return lay;
-       } else {
-               return NULL;
-       }
-}
-
-
-
-Evas_Object *appmgrUg_main_gl_icon_get(void *data, Evas_Object *obj,
-                                                                          const char *part)
-{
-       Evas_Object *icon = NULL;
-       Evas_Object *lay = NULL;
-       appmgr_listinfo *info = data;
-
-       retv_if(data == NULL, NULL);
-
-       if (!safeStrCmp(part, "elm.icon.1")) {
-               icon = elm_icon_add(obj);
-
-               if (NULL == info->icon_path)
-                       info->icon_path = appmgrUg_get_listinfo_default_icon(info->mainappid);
+               
 
-               elm_image_file_set(icon, info->icon_path, NULL);
-               evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
+#if 1
+               return icon;
+#else
+               Evas_Object *lay = NULL;
                lay = elm_layout_add(obj);
                retv_if(lay == NULL, NULL);
                elm_layout_theme_set(lay, "layout", "list/B/type.2", "default");
                elm_layout_content_set(lay, "elm.swallow.content", icon);
 
                return lay;
+#endif
        } else {
                return NULL;
        }
index 6ebb66bf6c33113dc6f7d597da83d8e277265242..39c55e5e9593b035c86514f666356136be7b6b1f 100644 (file)
@@ -323,8 +323,7 @@ Evas_Object *appmgrUg_run_gl_stop_btn(void *data, Evas_Object *obj,
        SettingAppMgrUG *ad = data;
 
        retv_if(NULL == data, NULL);
-       if (0 != safeStrCmp(part, "elm.icon"))
-               return NULL;
+//     if (0 != safeStrCmp(part, "elm.icon"))  return NULL;
 
        Evas_Object *box = elm_box_add(obj);
        elm_box_horizontal_set(box, 1);
index db30056f9d2af2b1ff4ac14ee97a6e7c49474923..21b5d335ef4b74ecbb979e9c33a6fbaba7031403 100644 (file)
@@ -77,19 +77,11 @@ static inline void appmgrUg_init_itcs(SettingAppMgrUG *ad)
        ad->itc_sep.func.state_get = NULL;
        ad->itc_sep.func.del = NULL;
 
-#if OLD_GENLIST_STYLE
-       ad->itc_main.item_style = SETTING_GENLIST_2LINE_STYLE;
-       ad->itc_main.func.text_get = appmgrUg_main_gl_label_get;
-       ad->itc_main.func.content_get = appmgrUg_main_gl_icon_get;
-       ad->itc_main.func.state_get = NULL;
-       ad->itc_main.func.del = _main_gl_del_cb;
-#else
        ad->itc_main.item_style = SETTING_GENLIST_2LINE_STYLE;
        ad->itc_main.func.text_get = appmgrUg_main_gl_label_new_get;
        ad->itc_main.func.content_get = appmgrUg_main_gl_icon_new_get;
        ad->itc_main.func.state_get = NULL;
        ad->itc_main.func.del = _main_gl_del_cb;
-#endif
 
        ad->itc_1ic.item_style = "1icon";
        ad->itc_1ic.func.text_get = NULL;
@@ -97,19 +89,11 @@ static inline void appmgrUg_init_itcs(SettingAppMgrUG *ad)
        ad->itc_1ic.func.state_get = NULL;
        ad->itc_1ic.func.del = NULL;
 
-#if OLD_GENLIST_STYLE
-       ad->itc_info_title.item_style = SETTING_GENLIST_2LINE_STYLE;
-       ad->itc_info_title.func.text_get = appmgrUg_info_title_gl_label_get;
-       ad->itc_info_title.func.content_get = appmgrUg_info_title_gl_icon_get;
-       ad->itc_info_title.func.state_get = NULL;
-       ad->itc_info_title.func.del = NULL;
-#else
        ad->itc_info_title.item_style = SETTING_GENLIST_2LINE_STYLE;
        ad->itc_info_title.func.text_get = appmgrUg_info_title_gl_label_get;
        ad->itc_info_title.func.content_get = appmgrUg_info_title_gl_icon_get;
        ad->itc_info_title.func.state_get = NULL;
        ad->itc_info_title.func.del = NULL;
-#endif
 
        ad->itc_2button1.item_style = "1icon";
        ad->itc_2button1.func.text_get = NULL;
index f738e2a4065d35e66d74edf70416bb0d51418a1c..839bd2c6af755bff0a1df1135b54eff20cf548eb 100644 (file)
 #define PWD_FILE       _TZ_SYS_DATA"/setting/set_info"
 
 
-#ifdef OLD_GENLIST_STYLE
+#if 0 /* OLD_GENLIST_STYLE */
 #define SETTING_GENLIST_GROUP_INDEX_STYLE "groupindex"
 #define SETTING_GENLIST_ICON_1LINE_STYLE "1line"
 #define SETTING_GENLIST_2LINE_STYLE "2line.top"
 #define SETTING_GENLIST_MULTILINE_STYLE "multiline_sub"
 #define SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE "1icon"
+#endif
 
-#else
 #define SETTING_GENLIST_GROUP_INDEX_STYLE "group_index"
 #define SETTING_GENLIST_ICON_1LINE_STYLE "type1"
 #define SETTING_GENLIST_2LINE_STYLE "type1"
 #define SETTING_GENLIST_MULTILINE_STYLE "multiline"
 #define SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE "full"
-#endif
-
 
 
 #define SETTING_POSTINST_FILE "/var/lib/dpkg/info/org.tizen.setting.postinst"
index 07465768bf3e8345df5f96c4727bb91079d20f5d..ebb08be9a7fbfa2118ade0b32558f6640eeaddee 100644 (file)
@@ -43,7 +43,6 @@
 
 extern const Elm_Genlist_Item_Class itc_seperator;
 extern const Elm_Genlist_Item_Class itc_bottom_seperator;
-extern const Elm_Genlist_Item_Class itc_sep_line;
 
 extern const Elm_Genlist_Item_Class itc_1text;
 extern const Elm_Genlist_Item_Class itc_1text_1icon_2;
index 8bf51db9cf0b9aa30b4bb90d2329bf640fd0a123..a1668fe27d94fe0bd760e596e1270c6041854ea6 100644 (file)
 
 #define DEF_BUF_SIZE 32
 
-#ifdef OLD_GENLIST_STYLE
-static Evas_Object *_gl_Gendial_content_get(void *data, Evas_Object *obj, const char *part);
-#endif
-
 static char *_gl_Gendial_text_get(void *data, Evas_Object *obj, const char *part);
 
-static Evas_Object *_gl_Gendial_new_content_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);
 
 #if 0
@@ -61,15 +57,6 @@ const Elm_Genlist_Item_Class itc_bottom_seperator = {
        .func.del = NULL,
 };
 
-EXPORT_PUBLIC
-const Elm_Genlist_Item_Class itc_sep_line = {
-       .item_style = "dialogue/separator.transparent.2",
-       .func.text_get = _gl_Gendial_text_get,
-       .func.content_get = NULL,
-       .func.state_get = NULL,
-       .func.del = NULL,
-};
-
 EXPORT_PUBLIC
 const Elm_Genlist_Item_Class itc_bottom_line = {
        .item_style = "bottom_line",
@@ -79,25 +66,14 @@ const Elm_Genlist_Item_Class itc_bottom_line = {
        .func.del = NULL,
 };
 
-#ifdef OLD_GENLIST_STYLE
-#define DEFINE_ITC1(style, name) \
-       EXPORT_PUBLIC const Elm_Genlist_Item_Class name = {\
-                                                                                                          .item_style = style,\
-                                                                                                          .func.text_get = _gl_Gendial_text_get,\
-                                                                                                          .func.content_get = _gl_Gendial_content_get,\
-                                                                                                          .func.state_get = NULL,\
-                                                                                                          .func.del = _gl_Gendial_del,\
-                                                                                                         };
-#else
 #define DEFINE_ITC1(style, name) \
        EXPORT_PUBLIC const Elm_Genlist_Item_Class name = {\
                                                                                                           .item_style = style,\
                                                                                                           .func.text_get = _gl_Gendial_new_text_get,\
-                                                                                                          .func.content_get = _gl_Gendial_new_content_get,\
+                                                                                                          .func.content_get = _gl_Gendial_content_get,\
                                                                                                           .func.state_get = NULL,\
                                                                                                           .func.del = _gl_Gendial_del,\
                                                                                                          };
-#endif
 
 DEFINE_ITC1(SETTING_GENLIST_ICON_1LINE_STYLE, itc_1text);
 DEFINE_ITC1(SETTING_GENLIST_ICON_1LINE_STYLE, itc_1text_1icon_2);
@@ -1625,7 +1601,7 @@ static void __multiline_eraser_clicked(void *data, Evas_Object *obj, void *event
        elm_entry_entry_set(entry, "");
 }
 
-static Evas_Object *_gl_Gendial_new_content_get(void *data, Evas_Object *obj,
+static Evas_Object *_gl_Gendial_content_get(void *data, Evas_Object *obj,
                                                                                                const char *part)
 {
        retv_if(!data, NULL);
@@ -1698,73 +1674,6 @@ static Evas_Object *_gl_Gendial_new_content_get(void *data, Evas_Object *obj,
 }
 
 
-#ifdef OLD_GENLIST_STYLE
-static Evas_Object *_gl_Gendial_content_get(void *data, Evas_Object *obj,
-                                                                                       const char *part)
-{
-       retv_if(!data, NULL);
-       Setting_GenGroupItem_Data *item_data = data;
-       retv_if(!data, NULL);
-       __Content_Drawer *cd_list = NULL;
-       __drawer_fp fp = NULL;
-       /*SETTING_TRACE("content get [%s]",part); */
-
-
-       if (!safeStrCmp(part, "elm.icon.1")) { /* LEFT AREA */
-               if (item_data->swallow_type == SWALLOW_Type_LAYOUT_EDITFIELD
-                       && item_data->isPasswordFlag == TRUE)
-                       return NULL;
-               fp = __add_left_default; /*hold default drawer */
-               cd_list = __cd_left;
-       } else if (!safeStrCmp(part, "elm.icon.2")) { /* RIGHT AREA */
-               if (item_data->swallow_type == SWALLOW_Type_LAYOUT_EDITFIELD
-                       && item_data->isPasswordFlag == TRUE)
-                       return NULL;
-               fp = __add_right_default; /*hold default drawer */
-               cd_list = __cd_right;
-       } else if (!safeStrCmp(part, "elm.icon")) { /* CENTER WHOLE */
-               fp = __add_left_default; /*hold default drawer */
-               cd_list = __cd_left;
-       } else if (!safeStrCmp(part, "elm.swallow.end")) {
-               /*the default value of fp is NULL here */
-               cd_list = __cd_end;
-       }
-       /* To do : add code for editfield */
-       else if (!safeStrCmp(part, "elm.icon.entry")) {
-               if (item_data->swallow_type == SWALLOW_Type_LAYOUT_DATEFIELD) {
-                       /*fp = __add_datefield; */
-                       fp = __add_datefield_new;
-               } else {
-                       /*fp = __add_entry_without_layout; */
-                       fp = __add_entry_padding;
-               }
-       } else if (!safeStrCmp(part, "elm.icon.eraser")) {
-               /*fp = __add_button_eraser; */
-               Evas_Object *btn = elm_button_add(obj);
-               elm_object_style_set(btn, "editfield_clear"); /*Make "X" marked button by changing style. */
-               evas_object_smart_callback_add(btn, "clicked", __multiline_eraser_clicked, item_data);
-               return btn;
-       } else if (!safeStrCmp(part, "elm.icon.edit")) {
-               Evas_Object *btn = elm_button_add(obj);
-               elm_object_style_set(btn, "minus");
-               evas_object_propagate_events_set(btn, EINA_FALSE);
-               return btn;
-       }
-       /* End. */
-
-       if (cd_list) {
-               int idx = 0;
-               for (; idx < SWALLOW_Type_MAX; idx++) {
-                       if (item_data->swallow_type == cd_list[idx].type) { /*match using swallow type */
-                               fp = cd_list[idx].draw;
-                               break;
-                       }
-               }
-       }
-       return fp ? fp(item_data, obj) : NULL;
-}
-#endif /* OLD_GENLIST_STYLE */
-
 static void _gl_Gendial_del(void *data, Evas_Object *obj)
 {
        /* SETTING_TRACE_BEGIN; */
@@ -1806,21 +1715,12 @@ EXPORT_PUBLIC
 bool setting_create_Gendial_itc(const char *item_style,
                                                                Elm_Genlist_Item_Class *itc)
 {
-#ifdef OLD_GENLIST_STYLE
-       itc->item_style = item_style;
-       itc->func.text_get = _gl_Gendial_text_get;
-       itc->func.content_get = _gl_Gendial_content_get;
-       itc->func.state_get = NULL;
-       itc->func.del = _gl_Gendial_del;        /* _gl_Gendial_del; */
-       return TRUE;
-#else
        itc->item_style = item_style;
        itc->func.text_get = _gl_Gendial_new_text_get;
-       itc->func.content_get = _gl_Gendial_new_content_get;
+       itc->func.content_get = _gl_Gendial_content_get;
        itc->func.state_get = NULL;
        itc->func.del = _gl_Gendial_del;        /* _gl_Gendial_del; */
        return TRUE;
-#endif
 }
 
 /**
index f781ae6c6edf78f82ddae774c2ea5cd48216f216..d5a78dd0f62c18bbf5c004f4389bb9add8f81fcf 100644 (file)
@@ -28,6 +28,7 @@
 
 #if 1
 #include <EWebKit.h>
+#include <ewk_chromium.h>
 #else
 #include <ewk_auth_challenge.h>
 #include <ewk_certificate.h>
index c1dddcd1281c06df75f9371d80c5bdf8c2a0be70..17f4535415cd38fd842edd9afa6817c5c58e8301 100644 (file)
@@ -765,11 +765,6 @@ static int setting_network_main_create(void *cb)
                SETTING_TRACE_ERROR("ad->data_mobile_data is NULL");
        }
 
-#ifdef OLD_GENLIST_STYLE
-       /* [UI] "Mobile Data" descrition */
-       const char *title = Data_packet_Sub_desc;
-       ADD_GL_HELP(scroller, title);
-#endif
 
        /* [UI] Data Roaming - TITLE : "Data Roaming" */
        int value_data_roaming;
@@ -792,9 +787,6 @@ static int setting_network_main_create(void *cb)
        }
 
 
-#ifdef OLD_GENLIST_STYLE
-       ADD_GL_HELP(scroller, SETTING_NETWORK_DATA_ROMING_DESC);
-#endif
        /* [UI] Network Mode */
        ad->data_net_mode =
                setting_create_Gendial_field_def(scroller,
index ea9e3938fbf56be559a21b9622b94566022dcef4..7add259833cd4ee2d0071d94ad11ecb6d985e956 100644 (file)
@@ -131,7 +131,7 @@ char *setting_media_basename(char *path)
 /* | elm.swallow.icon |----------------------------------------------------| elm.swallow.end | */
 /* |                  |         elm.text.sub          | elm.text.sub.end   |                 | */
 /* ------------------------------------------------------------------------------------------- */
-static Evas_Object *__sound_slider_new_icon_get(void *data, Evas_Object *obj, const char *part)
+static Evas_Object *__sound_slider_icon_get(void *data, Evas_Object *obj, const char *part)
 {
        SETTING_TRACE_BEGIN;
        /*appcore_measure_start(); */
@@ -952,19 +952,11 @@ Evas_Object *setting_sound_init(void *data)
 
        setting_create_Gendial_itc(SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE, &(ad->itc_layout));
 
-#ifdef OLD_GENLIST_STYLE
        ad->itc_layout.func.content_get = __sound_slider_icon_get;
-#else
-       ad->itc_layout.func.content_get = __sound_slider_new_icon_get;
-#endif
 
        setting_create_Gendial_itc(SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE, &(ad->itc_layout_1icon));
 
-#ifdef OLD_GENLIST_STYLE
        ad->itc_layout_1icon.func.content_get = __sound_slider_icon_get;
-#else
-       ad->itc_layout_1icon.func.content_get = __sound_slider_new_icon_get;
-#endif
 
        /* register view node table */
        setting_view_node_table_intialize();
index 1423799a08d3b6dbc21751087aa8da52ffdb7cb6..51400cdeac043b999a84a6c94c43387456cc554d 100644 (file)
@@ -258,11 +258,9 @@ void storageug_genlist_text_update(Setting_GenGroupItem_Data *item_data,
 
        G_FREE(item_data->sub_desc);
        item_data->sub_desc = (char *)g_strdup(desc);
-#if OLD_GENLIST_STYLE
-       elm_genlist_item_fields_update(item_data->item, "elm.text.sub.left.bottom", ELM_GENLIST_ITEM_FIELD_TEXT);
-#else
+
        elm_genlist_item_fields_update(item_data->item, "elm.text.sub", ELM_GENLIST_ITEM_FIELD_TEXT);
-#endif
+
 }
 
 void storageUg_get_internal_detail_cb(int fn_result, SettingStorageUG *ad)