[Title]change emulator manager icon

[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Conflicts:

	package/pkginfo.manifest

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 54c8f9f..ffa5c85 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Package: emulator
-Version: 1.2.3
+Version: 1.2.5
 OS: linux
 Build-host-os: linux
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
@@ -8,7 +8,7 @@ Source: emulator
 Description: Tizen Emulator
 
 Package: emulator
-Version: 1.2.3
+Version: 1.2.5
 OS: windows
 Build-host-os: windows
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>

diff --git a/tizen/skins/icons/vtm.ico b/tizen/skins/icons/vtm.ico
index 3c34a50..70e6cf8 100644 (file)
Binary files a/tizen/skins/icons/vtm.ico and b/tizen/skins/icons/vtm.ico differ

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index dd96f02..d55b216 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -544,12 +544,12 @@ static void construct_main_window(void)
        GetVersionEx(&osvi);
 
        if ((osvi.dwMajorVersion >= 6) && (osvi.dwMinorVersion >= 1))
-               sprintf(emul_img_dir, "%s/icons/vtm.ico", skin);
+               sprintf(emul_img_dir, "%s/icons/Emulator.ico", skin);
        else
                sprintf(emul_img_dir, "%s/icons/Emulator_20x20.png", skin);
                
 #else /* _WIN32 */
-       sprintf(emul_img_dir, "%s/icons/vtm.ico", skin);
+       sprintf(emul_img_dir, "%s/icons/Emulator.ico", skin);
 #endif/* _WIN32 */
 
        if (g_file_test(emul_img_dir, G_FILE_TEST_EXISTS) == FALSE) {