Merge "Remove OLD_GENLIST_STYLE macro" into tizen

diff --cc include/setting-debug.h
Simple merge

diff --cc setting-common/include/setting-common-data-type.h
index 3181a55457d516a448f903eb47488f9e6fe2fe0d,839bd2c6af755bff0a1df1135b54eff20cf548eb..11f3fb4b4444b4c6690081826aa0ff96eb02e5a1
--- 1/setting-common/include/setting-common-data-type.h
--- 2/setting-common/include/setting-common-data-type.h
+++ b/setting-common/include/setting-common-data-type.h
@@@ -41,10 -41,10 +41,10 @@@
  #ifndef bool
  #define bool Eina_Bool
  #endif
 -#define PWD_FILE      _TZ_SYS_DATA"/setting/set_info"
 +#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"

diff --cc setting-common/include/setting-common-draw-widget.h
Simple merge

diff --cc setting-common/src/setting-common-draw-genlist.c
index 92fd3111d5e4e9b2c8c9b59418248fa024be434e,a1668fe27d94fe0bd760e596e1270c6041854ea6..3e5ff59270b27b402f00578531f0315213e1e23c
--- 1/setting-common/src/setting-common-draw-genlist.c
--- 2/setting-common/src/setting-common-draw-genlist.c
+++ b/setting-common/src/setting-common-draw-genlist.c
@@@ -61,27 -57,8 +57,18 @@@ const Elm_Genlist_Item_Class itc_bottom
        .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", */
 +      .item_style = "full",
 +      .func.text_get = NULL,
 +      .func.content_get = _gl_Gendial_new_content_get,
 +      .func.state_get = NULL,
 +      .func.del = _gl_Gendial_del,
 +};
 +
 +EXPORT_PUBLIC
 +const Elm_Genlist_Item_Class itc_bottom_line1 = {
        .item_style = "bottom_line",
        .func.text_get = NULL,
        .func.content_get = NULL,

diff --cc setting-network/src/setting-network-main.c
Simple merge

diff --cc setting-profile/src/setting-profile-common.c
index d82e36f4fcd537e26ee45c5f0c77a90f0a54cacb,7add259833cd4ee2d0071d94ad11ecb6d985e956..edd7c39a5da3cd20ff58150d4e3ff40c52f19303
--- 1/setting-profile/src/setting-profile-common.c
--- 2/setting-profile/src/setting-profile-common.c
+++ b/setting-profile/src/setting-profile-common.c
@@@ -127,11 -127,11 +127,11 @@@ char *setting_media_basename(char *path
  }
  
  /* ------------------------------------------------------------------------------------------- */
 -/* |                  | elm.swallow.icon.0 | elm.text | elm.swallow.icon.1 |                 | */
 +/* |                            | elm.swallow.icon.0 | elm.text | elm.swallow.icon.1 |                                 | */
  /* | elm.swallow.icon |----------------------------------------------------| elm.swallow.end | */
 -/* |                  |         elm.text.sub          | elm.text.sub.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(); */