From: syeon.hwang <syeon.hwang@samsung.com>
Date: Fri, 7 Sep 2012 08:23:10 +0000 (+0900)
Subject: Merge branch 'release' into develop
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1465
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=01cdd8785c5de164a2d09eb5e8cbc6a6dc88e916;p=sdk%2Femulator%2Fqemu.git

Merge branch 'release' into develop

Conflicts:
	package/pkginfo.manifest
	tizen/src/Makefile
	tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java
	vl.c
---

01cdd8785c5de164a2d09eb5e8cbc6a6dc88e916
diff --cc tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java
index 628464c654,0ce1b0cf40..14820cd688
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java
@@@ -166,27 -166,25 +166,50 @@@ public class DetailInfoDialog extends S
  					return;
  				}
  
+ 				ProcessBuilder procBrowser = new ProcessBuilder();
+ 
+ 				if (SwtUtil.isLinuxPlatform()) {
+ 					procBrowser.command("nautilus", "--browser", openPath);
+ 				} else if (SwtUtil.isWindowsPlatform()) {
+ 					procBrowser.command("explorer", "\"" + openPath + "\"");
+ 				} else if (SwtUtil.isMacPlatform()) {
+ 					//TODO:
+ 					logger.warning( "not supported yet" );
+ 				}
+ 
+ 				if (procBrowser.command().isEmpty() == false) {
+ 					try {
+ 						procBrowser.start();
+ 					} catch (Exception e) {
+ 						logger.log( Level.SEVERE, e.getMessage(), e);
+ 					}
+ 				}
+ 
++				if (openPath.compareTo(VALUE_NONE) == 0 || openPath.compareTo("") == 0) {
++					return;
++				}
++
 +				Program.launch(openPath);
 +
 +				/*ProcessBuilder procBrowser = new ProcessBuilder();
 +
 +				if (SwtUtil.isLinuxPlatform()) {
 +					procBrowser.command("nautilus", "--browser", openPath);
 +				} else if (SwtUtil.isWindowsPlatform()) {
 +					procBrowser.command("explorer", "\"" + openPath + "\"");
 +				} else if (SwtUtil.isMacPlatform()) {
 +					//TODO:
 +					logger.warning( "not supported yet" );
 +				}
 +
 +				if (procBrowser.command().isEmpty() == false) {
 +					try {
 +						procBrowser.start();
 +					} catch (Exception e) {
 +						logger.log( Level.SEVERE, e.getMessage(), e);
 +					}
 +				}*/
 +
  			}
  		});