From e856ca9bef2c8cca09cdb4328db66bed5e888092 Mon Sep 17 00:00:00 2001 From: sungmin ha Date: Wed, 20 May 2015 18:09:06 +0900 Subject: [PATCH] emulator: modified way to set/get skin path Change-Id: I360eda24bc536236752a8ff993ad8a3e2db3522c Signed-off-by: sungmin ha --- tizen/src/emul_state.c | 11 +++++------ tizen/src/emul_state.h | 5 ++--- tizen/src/emulator_legacy.c | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/tizen/src/emul_state.c b/tizen/src/emul_state.c index 94534b31ee..9803e7ecc3 100644 --- a/tizen/src/emul_state.c +++ b/tizen/src/emul_state.c @@ -551,15 +551,14 @@ bool get_sdb_connection(void) } /* emualtor skin path */ -void set_emul_skin_path(char *path) +const char* get_emul_skin_path(void) { - _emul_info.skin_path = path; + _emul_info.skin_path = get_variable("skin_path"); - LOG_INFO("skin path : %s\n", _emul_info.skin_path); -} + if (!_emul_info.skin_path) { + _emul_info.skin_path = ""; + } -char* get_emul_skin_path(void) -{ return _emul_info.skin_path; } diff --git a/tizen/src/emul_state.h b/tizen/src/emul_state.h index 5b0e7fd2ad..90668b4441 100644 --- a/tizen/src/emul_state.h +++ b/tizen/src/emul_state.h @@ -108,7 +108,7 @@ typedef struct EmulatorConfigInfo { int spice_port; char *vm_name; - char *skin_path; + const char *skin_path; bool gpu_accel_enable; const char *file_sharing_path; const char *vm_ram_size; @@ -155,7 +155,6 @@ void set_emul_ecs_port(int port); void set_emul_guest_ip(char *ip); void set_emul_host_ip(char *ip); void set_emul_vm_name(char *vm_name); -void set_emul_skin_path(char *path); void set_emul_gpu_accel(bool enable); void set_emul_file_sharing_path(const char *path); void set_emul_ram_size(const char *size); @@ -190,7 +189,7 @@ int get_emul_ecs_port(void); int get_emul_serial_port(void); char* get_emul_vm_name(void); int get_emul_spice_port(void); -char* get_emul_skin_path(void); +const char* get_emul_skin_path(void); bool get_emul_gpu_accel(void); bool get_emul_cpu_accel(void); const char* get_emul_file_sharing_path(void); diff --git a/tizen/src/emulator_legacy.c b/tizen/src/emulator_legacy.c index b8ad090429..b4da32b6dd 100644 --- a/tizen/src/emulator_legacy.c +++ b/tizen/src/emulator_legacy.c @@ -238,7 +238,7 @@ static void extract_skin_info(int skin_argc, char **skin_argv) } else if (strstr(skin_argv[i], SKIN_PATH_PREFIX) != NULL) { char *path = skin_argv[i] + strlen(SKIN_PATH_PREFIX); - set_emul_skin_path(path); + set_variable("skin_path", path, true); } if (w != 0 && h != 0) { -- 2.34.1