From: Jihoon Kim Date: Fri, 13 Jan 2017 10:52:04 +0000 (+0900) Subject: Replace uuid with appid X-Git-Tag: submit/tizen_3.0/20170120.050854~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f78b43c34a3d203f924f5431f8d74324b25f4b35;p=platform%2Fcore%2Fuifw%2Flibscl-core.git Replace uuid with appid Change-Id: I1c7052b854eda3843d36967825e933d5e6206e0b Signed-off-by: Jihoon Kim --- diff --git a/src/sclcoreui-efl.cpp b/src/sclcoreui-efl.cpp index 9d6a2bb..be6a4db 100644 --- a/src/sclcoreui-efl.cpp +++ b/src/sclcoreui-efl.cpp @@ -77,7 +77,7 @@ CSCLCoreUIEFL::CSCLCoreUIEFL() m_rotation_degree = 0; m_main_window = SCLWINDOW_INVALID; - m_uuid = NULL; + m_appid = NULL; m_display = NULL; } @@ -419,7 +419,7 @@ int CSCLCoreUIEFL::create(void *data) elm_config_accel_preference_set("3d"); elm_policy_set(ELM_POLICY_THROTTLE, ELM_POLICY_THROTTLE_NEVER); - Evas_Object *main_window = elm_win_add(NULL, m_uuid, ELM_WIN_UTILITY); + Evas_Object *main_window = elm_win_add(NULL, m_appid, ELM_WIN_UTILITY); if (!main_window) { LOGE("Failed to create main window\n"); return -1; @@ -438,7 +438,7 @@ int CSCLCoreUIEFL::create(void *data) elm_win_borderless_set(main_window, EINA_TRUE); elm_win_keyboard_win_set(main_window, EINA_TRUE); elm_win_autodel_set(main_window, EINA_TRUE); - elm_win_title_set(main_window, m_uuid); + elm_win_title_set(main_window, m_appid); elm_win_prop_focus_skip_set(main_window, EINA_TRUE); int rots[] = { 0, 90, 180, 270 }; elm_win_wm_rotation_available_rotations_set(main_window, rots, (sizeof(rots) / sizeof(int))); @@ -523,7 +523,7 @@ void CSCLCoreUIEFL::run(const sclchar *display) { char **argv = new char*[4]; int argc = 3; - const sclchar *uuid = NULL; + const sclchar *appid = NULL; ops.create = app_create_cb; ops.terminate = app_terminate_cb; @@ -534,23 +534,23 @@ void CSCLCoreUIEFL::run(const sclchar *display) CSCLCoreImpl *impl = CSCLCoreImpl::get_instance(); if (impl) { - uuid = impl->get_uuid(); + appid = impl->get_uuid(); } - if (!uuid) - uuid = ""; + if (!appid) + appid = ""; - m_uuid = uuid; + m_appid = appid; m_display = display; - argv[0] = const_cast (uuid); + argv[0] = const_cast (appid); argv[1] = (char *)"--display"; argv[2] = const_cast (display); argv[3] = 0; - LOGD("name : %s\n", uuid); + LOGD("name : %s\n", appid); - appcore_efl_main(uuid, &argc, (char ***)&argv, &ops); + appcore_efl_main(appid, &argc, (char ***)&argv, &ops); delete [] argv; } diff --git a/src/sclcoreui-efl.h b/src/sclcoreui-efl.h index 3cd50c6..d12477b 100644 --- a/src/sclcoreui-efl.h +++ b/src/sclcoreui-efl.h @@ -64,7 +64,7 @@ private: sclint m_rotation_degree; sclwindow m_main_window; - const sclchar *m_uuid; + const sclchar *m_appid; const sclchar *m_display; OptionWindowInfo m_option_window_info[OPTION_WINDOW_TYPE_MAX];