From: munkyu.im <munkyu.im@samsung.com>
Date: Mon, 4 Nov 2013 06:29:35 +0000 (+0900)
Subject: proxy: replace gconftool-2 with gsettings
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~668
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F36%2F11736%2F1;p=sdk%2Femulator%2Fqemu.git

proxy: replace gconftool-2 with gsettings

Gnome do not support gconftool-2 anymore.
They migrate Gconf to GSettings.
They support it until version 3.2.6

Change-Id: Ib26c3ca82dcb0e6b4b05e738c24c01f4e6781c6b
Signed-off-by: munkyu.im <munkyu.im@samsung.com>
---

diff --git a/package/changelog b/package/changelog
index 74ca64d350..5f715fa700 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 1.6.1
+- use gsettings instead of gconftool-2
+== Munkyu Im <munkyu.im@samsung.com> 2013-11-04
 * 1.6.0
 - keep the touch point grabbing while finger rearranging
 == GiWoong Kim <giwoong.kim@samsung.com> 2013-10-29
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 8831afdf80..37c8ef2590 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version: 1.6.0
+Version: 1.6.1
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 Source: emulator
 
diff --git a/tizen/src/osutil-linux.c b/tizen/src/osutil-linux.c
index 91ca6c7edc..6d5068b253 100644
--- a/tizen/src/osutil-linux.c
+++ b/tizen/src/osutil-linux.c
@@ -59,7 +59,7 @@ MULTI_DEBUG_CHANNEL(emulator, osutil);
 extern char tizen_target_img_path[];
 int g_shmid;
 char *g_shared_memory;
-int gproxytool = GCONFTOOL;
+int gproxytool = GSETTINGS;
 
 /* Getting proxy commands */
 static const char* gproxycmds[][2] = {