Merge branch '2.0_beta' of ssh://tizendev.org:29418/apps/home/settings into 2.0_beta

Conflicts:
	src/setting-main.c

diff --combined src/setting-main.c
index 9e4235a,d1c732f..a05298d
--- 1/src/setting-main.c
--- 2/src/setting-main.c
+++ b/src/setting-main.c
@@@ -958,6 -958,7 +958,6 @@@ bool is_3rdapp_installed_setting_cfg(ch
        // /opt/apps/
        char path[512];
  
 -      SETTING_TRACE("1");
        if (snprintf(path, 512, "/opt/apps/%s/setting/setting.xml", pkgname) < 0)
                return false;
  
@@@ -981,9 -982,6 +981,9 @@@
  static void draw_3rdapp(void* data, char* name, char* pkgname)
  {
        SETTING_TRACE_BEGIN;
 +      SETTING_TRACE(" name : %s", name);
 +      SETTING_TRACE(" pkgname : %s", pkgname);
 +
        setting_main_appdata *ad = data;
  
        //3rd cfg
@@@ -1015,8 -1013,6 +1015,6 @@@
   */
  static ail_cb_ret_e __download_apps_cb(ail_appinfo_h ai, void* data)
  {
-       SETTING_TRACE_BEGIN;
- 
        DrawAppInfo* pinfo = (DrawAppInfo*)data;
      char *id;
  
@@@ -1053,20 -1049,20 +1051,20 @@@
                //SETTING_TRACE("installed_time = %d ", installed_time);
                if (installed_time != 0 && is_3rdapp_installed_setting_cfg(id) == true )
                {
 -                      SETTING_TRACE(" 3rd party - app name : ----> %s ", id);
 +                      SETTING_TRACE(" 3rd party - app name : ----> id : %s --- name : %s ", id, name);
 +                      SETTING_TRACE(" 3rd party - icon : ----> %s ", icon);
 +                      SETTING_TRACE(" 3rd party - nodisplay :  ----> %d ", nodisplay);
                        pinfo->ncount++;
  
                        // draw code here
                        if (pinfo->draw_app != NULL)
                        {
                                SETTING_TRACE(">>> pkg name --> %s ", id);
 -                              // draw !!!
 -                              pinfo->draw_app(pinfo->data, strdup(id)/* appname*/, strdup(id)/* pkg_name*/);
 +                              pinfo->draw_app(pinfo->data, strdup(name)/* appname*/, strdup(id)/* pkg_name*/);
                        }
 -
                }
        }
 -
 +      SETTING_TRACE_END;
      return AIL_CB_RET_CONTINUE;
  }