From: jihun park <jihun87.park@samsung.com>
Date: Wed, 31 May 2017 08:23:06 +0000 (+0900)
Subject: [TBT][Wearable][Remove d2d TCs]
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=878a5404608dd94593d7070b27873779f1707e0c;p=test%2Ftct%2Fnative%2Fbehavior.git

[TBT][Wearable][Remove d2d TCs]

Change-Id: Ib69c7fe2eaa450e82306735e9d9a8fc8b967b4fc
Signed-off-by: jihun park <jihun87.park@samsung.com>
---

diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk
old mode 100755
new mode 100644
index 29077e0..29a7c08
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ
diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk
old mode 100755
new mode 100644
index 3dce726..90526d6
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk differ
diff --git a/tbtcoreapp/.cproject b/tbtcoreapp/.cproject
index d05eaf6..4bd189d 100644
--- a/tbtcoreapp/.cproject
+++ b/tbtcoreapp/.cproject
@@ -26,11 +26,12 @@
 								<option id="gnu.cpp.compiler.option.optimization.level.982184323" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
 								<option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.920074349" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option id="sbi.gnu.cpp.compiler.option.1345120386" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.2048404299" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-watch&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
@@ -98,7 +99,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
@@ -131,11 +131,12 @@
 								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.378903474" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
 								<option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.673392831" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
 								<option id="sbi.gnu.c.compiler.option.763950783" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core.public.20170520_1_llvm37.i386.core.app"/>
+									<listOptionValue builtIn="false" value="wearable-4.0-emulator.core_llvm37.i386.core.app"/>
 								</option>
 								<option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1078644306" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-watch&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
@@ -203,7 +204,6 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
@@ -568,10 +568,10 @@
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Release">
+		<configuration configurationName="Debug">
 			<resource resourceType="PROJECT" workspacePath="/tbtcoreapp"/>
 		</configuration>
-		<configuration configurationName="Debug">
+		<configuration configurationName="Release">
 			<resource resourceType="PROJECT" workspacePath="/tbtcoreapp"/>
 		</configuration>
 	</storageModule>
diff --git a/tbtcoreapp/.sign/.manifest.tmp b/tbtcoreapp/.sign/.manifest.tmp
index 6d63610..26c07ad 100644
--- a/tbtcoreapp/.sign/.manifest.tmp
+++ b/tbtcoreapp/.sign/.manifest.tmp
@@ -1,4 +1,4 @@
-bin/tbtcoreapp__DEL__4iGKbmwftu+p9Fx4DovY+cGBtwjFEJOcrqCddSrKZh8=
+bin/tbtcoreapp__DEL__NN3XrH0Fx5QfozWkkstzAqYdhNq1FAgWP5coAEwY70w=
 res/edje/2.3.1/mobile/animation_viewer.edc__DEL__EpFQ5wDRiTAOO6u5koQgukk5OwzajEwPfskqvoeSv1w=
 res/edje/2.3.1/mobile/animation_viewer.edj__DEL__86W/O9tybVA4sM1aisKgVRYxS6YzgWFQRu+rhi4cecY=
 res/edje/2.3.1/mobile/bluetooth_le_viewer.edc__DEL__eQeYLjsRRoC9IE99RNlJSYIylIQNaIBGRd92EHIqFak=
@@ -1170,4 +1170,4 @@ shared/res/video/sampleH264.mp4__DEL__/ANEStYoGJyiETrYIUuNYJg9k6irr0iR4yWtu1zDsP
 shared/res/video/sampleMPEG4.mp4__DEL__6X8RcJ69rWmrhbKtOmxi06RQ2H6VDBhv1wh8XSJH8Ds=
 shared/res/zebra_1024_680.bmp__DEL__u4GpeYBVMfIgd8mMhre2dPJaK0Yopx6LC2ygrg5xcJ8=
 tizen-manifest.xml__DEL__ammU6+LuHVJVzI+Xvz9f/eWwAKSkMe2gym5qIMkiW5c=
-author-signature.xml__DEL__dXheNdwsGO/TIiMmV7wP0u2MWZhz2jsMxWQL9gjv5YM=
+author-signature.xml__DEL__L+6vYclQKVrIm5mQdAxJlHzALJbpC3fTbY9dQxYCABA=
diff --git a/tbtcoreapp/.sign/author-signature.xml b/tbtcoreapp/.sign/author-signature.xml
index 9707103..9ca2def 100644
--- a/tbtcoreapp/.sign/author-signature.xml
+++ b/tbtcoreapp/.sign/author-signature.xml
@@ -4,7 +4,7 @@
 <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"></SignatureMethod>
 <Reference URI="bin%2Ftbtcoreapp">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>4iGKbmwftu+p9Fx4DovY+cGBtwjFEJOcrqCddSrKZh8=</DigestValue>
+<DigestValue>NN3XrH0Fx5QfozWkkstzAqYdhNq1FAgWP5coAEwY70w=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2F2.3.1%2Fmobile%2Fanimation_viewer.edc">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -4699,9 +4699,9 @@
 </Reference>
 </SignedInfo>
 <SignatureValue>
-lrvAyCT9Q4XEdf4WfSr6RX262xUtjz5ssLhkPLKIyjbSAUJdFvHRRDkh9d7Z9/c4HF8OdydaVmnf
-AI8B/vfkTYMCV3DsMQZykVAxQlARlCw/E3kzymNaRzB90NTrUccHp39TzKcmD1JvhWbd4/spCEUA
-5sP3h+yza18rpi9H1r0=
+YH5htangI6DhI7cbEn/r5babzYMU+1DqNMSriXTSZmSbKFd+oRmJSKTlmhcOGfBU5tXmIJFNFDJG
+LVUOy0KoNV8WyMo/bngPr8iwyBuMt5ePH65x2qKXuXJciNHyCsD2LofakkyHyEb9JMA4rq72VkAv
+OVALanDQJQSzYL1mDZM=
 </SignatureValue>
 <KeyInfo>
 <X509Data>
diff --git a/tbtcoreapp/.sign/signature1.xml b/tbtcoreapp/.sign/signature1.xml
index daa0b18..b2d6ebc 100644
--- a/tbtcoreapp/.sign/signature1.xml
+++ b/tbtcoreapp/.sign/signature1.xml
@@ -4,11 +4,11 @@
 <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"></SignatureMethod>
 <Reference URI="author-signature.xml">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>dXheNdwsGO/TIiMmV7wP0u2MWZhz2jsMxWQL9gjv5YM=</DigestValue>
+<DigestValue>L+6vYclQKVrIm5mQdAxJlHzALJbpC3fTbY9dQxYCABA=</DigestValue>
 </Reference>
 <Reference URI="bin%2Ftbtcoreapp">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>4iGKbmwftu+p9Fx4DovY+cGBtwjFEJOcrqCddSrKZh8=</DigestValue>
+<DigestValue>NN3XrH0Fx5QfozWkkstzAqYdhNq1FAgWP5coAEwY70w=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2F2.3.1%2Fmobile%2Fanimation_viewer.edc">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -4703,9 +4703,9 @@
 </Reference>
 </SignedInfo>
 <SignatureValue>
-sv60uNKRrPH1a8mnx8JARxsAvk/+Mzamdx4luWsMRpy6dEqaW8yM9Gx9vx/X6SzxRMthzJHAiphM
-TSlEFlpJXcS8E2ZR6RwJRtwhyMC1+0Uq6+9FSXyYwrhEyrGB7JcvLQD3sB5z6k9jCxTxF0dkemkb
-CMcWEI07uXNXRHwiZHk=
+G982sk+4aVMYJuvIlqNNrtwRx5vOYOKyJ8vDBUZaALqfIjCBnP5PquRGcds83ElVbnaXr8F4m0KT
+V+UjXNycml8U49+x6iFDfUyVzRNKiX6HPhat7KPzZsiCQcKpHJEyjrNZ7e+RRBqJ7gYfFlWpBqZP
+mlHynIT8hm6j2YcVt3c=
 </SignatureValue>
 <KeyInfo>
 <X509Data>
diff --git a/tbtcoreapp/inc/model/tbt-info.h b/tbtcoreapp/inc/model/tbt-info.h
index 46dc418..4562cb1 100644
--- a/tbtcoreapp/inc/model/tbt-info.h
+++ b/tbtcoreapp/inc/model/tbt-info.h
@@ -241,21 +241,13 @@ typedef enum {
 	TBT_APP_SYSTEM_SETTINGS_MOTION,
 	TBT_APP_SYSTEM_SETTINGS_FILGHTMODE,
 	TBT_APP_SYSTEM_SETTINGS_LOCKSTATE,
-
     TBT_APP_CONTACTS,
-
-    TBT_APP_D2D_CLIENT,
-
-    TBT_APP_D2D_SERVER,
-
+    //TBT_APP_D2D_CLIENT,
+    //TBT_APP_D2D_SERVER,
     TBT_APP_TTS,
-
 	TBT_APP_STT,
-
 	TBT_APP_STT_ERROR,
-
 	TBT_APP_SMARTCARD
-
 } tbt_app_type_e;
 
 
@@ -352,7 +344,7 @@ typedef enum
 	FEATURE_CAMERA_FRONT_FLASH,
 	FEATURE_CONSUMER_IR,
 	FEATURE_CONTACT,
-	FEATURE_CONVERGENCE_D2D,
+	//FEATURE_CONVERGENCE_D2D,
 	FEATURE_DATABASE_ENCRYPTION,
 	FEATURE_DATACONTROL,
 	FEATURE_DATASYNC,
@@ -563,7 +555,7 @@ static char* feature_list[1024]=
 	[FEATURE_CAMERA_FRONT_FLASH] = "tizen.org/feature/camera.front.flash",
 	[FEATURE_CONSUMER_IR] = "tizen.org/feature/consumer_ir",
 	[FEATURE_CONTACT] = "tizen.org/feature/contact",
-	[FEATURE_CONVERGENCE_D2D] = "tizen.org/feature/convergence.d2d",
+	//[FEATURE_CONVERGENCE_D2D] = "tizen.org/feature/convergence.d2d",
 	[FEATURE_DATABASE_ENCRYPTION] = "tizen.org/feature/database.encryption",
 	[FEATURE_DATACONTROL] = "tizen.org/feature/datacontrol",
 	[FEATURE_DATASYNC] = "tizen.org/feature/datasync",
diff --git a/tbtcoreapp/inc/utils/app_module_config.h b/tbtcoreapp/inc/utils/app_module_config.h
index 9e9b868..e2d26de 100644
--- a/tbtcoreapp/inc/utils/app_module_config.h
+++ b/tbtcoreapp/inc/utils/app_module_config.h
@@ -238,9 +238,9 @@
 #define TBT_MODULE_CONTACTS
 #define TBT_MODULE_APP_CONTACTS
 
-#define TBT_MODULE_D2D
-#define TBT_MODULE_APP_D2D_CLIENT
-#define TBT_MODULE_APP_D2D_SERVER
+//#define TBT_MODULE_D2D
+//#define TBT_MODULE_APP_D2D_CLIENT
+//#define TBT_MODULE_APP_D2D_SERVER
 
 #define TBT_MODULE_TTS
 #define TBT_MODULE_APP_TTS
diff --git a/tbtcoreapp/inc/view/tbt-d2d-view.h b/tbtcoreapp/inc/view/tbt-d2d-view.h
deleted file mode 100644
index e4d0fa0..0000000
--- a/tbtcoreapp/inc/view/tbt-d2d-view.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- *  Licensed under the Apache License, Version 2.0 (the License);
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *******************************************************************************/
-/**
- * @file	tbt-d2d-view.h
- * @brief	covers device to device convergence communication
- * @since_tizen 3.0
- * @author	golam kayes(g.kayes@samsung.com)
- * @date	June, 2016
- * @bug
- * @credit	Tizen SDK Version 3.0 Test app
- *
- */
-
-
-#ifndef __TBT_D2D_VIEW_H__
-#define __TBT_D2D_VIEW_H__
-
-#include "utils/app_module_config.h"
-#ifdef TBT_MODULE_D2D
-
-#include "model/tbt-list.h"
-
-
-/**
- * @typedef d2d_viewer_view
- * @since_tizen 2.3
- * @brief A d2d viewer view handle.
- */
-typedef struct _d2d_view d2d_view;
-
-/**
- * @brief Create tbt d2d view
- * @since_tizen 2.3
- * @param[in] navi Parent naviframe
- * @param[in] custom structute to hold tbt application information
- * @param[in] item of the main tbt menu
- * @return Pointer of d2d on success, otherwise NULL
- */
-d2d_view *d2d_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item *item);
-
-#endif
-#endif // __TBT_D2D_VIEW_H__
diff --git a/tbtcoreapp/src/model/tbt-list.c b/tbtcoreapp/src/model/tbt-list.c
index bf27508..51056d4 100644
--- a/tbtcoreapp/src/model/tbt-list.c
+++ b/tbtcoreapp/src/model/tbt-list.c
@@ -2351,7 +2351,7 @@ static tbt_info tbtapps[] =
 	#endif
 #endif
 
-#ifdef TBT_MODULE_D2D
+/*#ifdef TBT_MODULE_D2D
 	#ifdef TBT_MODULE_APP_D2D_CLIENT
 
 		//NSD DNSSD
@@ -2385,7 +2385,7 @@ static tbt_info tbtapps[] =
 			.features_required = { FEATURE_NETWORK_WIFI }
 		},
 	#endif
-#endif
+#endif*/
 #ifdef TBT_MODULE_TTS
 	#ifdef TBT_MODULE_APP_TTS
 		{
diff --git a/tbtcoreapp/src/view/tbt-d2d-view.c b/tbtcoreapp/src/view/tbt-d2d-view.c
deleted file mode 100644
index ce8d361..0000000
--- a/tbtcoreapp/src/view/tbt-d2d-view.c
+++ /dev/null
@@ -1,405 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
- *
- *  Licensed under the Apache License, Version 2.0 (the License);
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *******************************************************************************/
-/**
- * @file	tbt-d2d-view.c
- * @brief	covers d2d convergence apis
- *
- * @author	A. B. M. Nazibullah(nazib.ullah@samsung.com)
- * @date	October, 2016
- * @credit
- *
- */
-
-#include "utils/app_module_config.h"
-#ifdef TBT_MODULE_D2D
-
-
-#include "utils/logger.h"
-#include "utils/config.h"
-#include "utils/ui-utils.h"
-#include "view/tbt-d2d-view.h"
-#include "view/tbt-common-view.h"
-#include <json-glib/json-glib.h>
-#include <d2d_conv_manager.h>
-
-struct _d2d_view
-{
-	common_view* view;
-	Evas_Object *server_list;
-	Evas_Object *client_msg_list;
-	conv_h gl_conv_h;
-	GList *devices_list;
-};
-
-typedef struct _device_data{
-	d2d_view *this;
-	conv_device_h selected_device;
-}device_data;
-
-typedef struct _service_data{
-	d2d_view *view;
-	conv_service_h service_handle;
-}service_data;
-
-static Evas_Object *found_device_list;
-static Evas_Object *service_list;
-static Evas_Object *app_comm_menu_list;
-
-
-static void _app_destroy_cb(void* this);
-static void discovery_cb(conv_device_h device, int result, void* user_data);
-static void device_selected_cb(void *data, Evas_Object *obj, void *event_info);
-static void message_listener(conv_service_h handle, conv_channel_h channel, int error, conv_payload_h result, void* user_data);
-static void start_discovery_cb(void *data, Evas_Object *obj, void *event_info);
-
-/**
- * @function		d2d_view_add
- * @since_tizen		2.3
- * @description		Gps View Add
- * @parameter		Evas_Object*: Evas Object Pointer, tbt_info*: Tbt Info Pointer, Elm_Object_Item*: Elm Object Item Pointer
- * @return		d2d_view*
- */
-d2d_view *d2d_view_add(Evas_Object *navi, tbt_info *tbt_info, Elm_Object_Item *item)
-{
-	RETVM_IF(NULL == navi, NULL, "navi is null");
-	RETVM_IF(NULL == tbt_info, NULL, "tbt_info is null");
-    RETVM_IF(NULL == item, NULL, "item is NULL");
-
-
-    d2d_view *this = NULL;
-    this = calloc(1, sizeof(d2d_view));
-    RETVM_IF(!this, NULL, "calloc failed");
-    this->view = calloc(1, sizeof(common_view));
-    RETVM_IF(!this->view, NULL, "calloc failed");
-
-    tbt_info->layout_group = "d2d_viewer";
-    tbt_info->layout_file = get_edje_path("d2d_viewer.edj");
-
-    common_view_add(navi, tbt_info, item, this->view, _app_destroy_cb, this);
-
-    if (tbt_info->apptype == TBT_APP_D2D_CLIENT)
-    {
-		this->server_list = elm_list_add(this->view->layout);
-		elm_list_mode_set(this->server_list, ELM_LIST_COMPRESS);
-		evas_object_smart_callback_add(this->server_list, "selected", NULL, NULL);
-		elm_list_item_append(this->server_list, "D2D discover", NULL, NULL, start_discovery_cb, this);
-
-		elm_list_go(this->server_list);
-
-		elm_object_part_content_set(this->view->layout, "list_container", this->server_list);
-
-    	found_device_list = elm_list_add(this->view->layout);
-    	elm_list_mode_set(found_device_list, ELM_LIST_COMPRESS);
-    	evas_object_smart_callback_add(found_device_list, "selected", NULL, NULL);
-
-    	service_list = elm_list_add(this->view->layout);
-    	elm_list_mode_set(service_list, ELM_LIST_COMPRESS);
-    	evas_object_smart_callback_add(service_list, "selected", NULL, NULL);
-    	elm_list_select_mode_set(service_list, ELM_OBJECT_SELECT_MODE_ALWAYS);
-
-    	app_comm_menu_list = elm_list_add(this->view->layout);
-    	elm_list_mode_set(app_comm_menu_list, ELM_LIST_COMPRESS);
-    	evas_object_smart_callback_add(app_comm_menu_list, "selected", NULL, NULL);
-
-    }
-    else  if (tbt_info->apptype == TBT_APP_D2D_SERVER)
-    {
-    	this->client_msg_list = elm_list_add(this->view->layout);
-    	elm_list_mode_set(this->client_msg_list, ELM_LIST_COMPRESS);
-    	elm_list_item_append(this->client_msg_list, "Ready", NULL, NULL, NULL, NULL);
-
-    	elm_list_go(this->client_msg_list);
-
-    	elm_object_part_content_set(this->view->layout, "list_container", this->client_msg_list);
-    }
-
-    return this;
-}
-
-
-/**
- * @function		get_d2d_error
- * @since_tizen		3.0
- * @description		get the name of the error for d2d
- * @parameter		int: error int
- * @return			char*: error string
- */
-static char* get_d2d_error(int e)
-{
-	switch (e) {
-	case CONV_ERROR_NONE:
-		return "CONV_ERROR_NONE";
-	case CONV_ERROR_INVALID_PARAMETER:
-		return "CONV_ERROR_INVALID_PARAMETER";
-	case CONV_ERROR_INVALID_OPERATION:
-		return "CONV_ERROR_INVALID_OPERATION";
-	case CONV_ERROR_OUT_OF_MEMORY:
-		return "CONV_ERROR_OUT_OF_MEMORY";
-	case CONV_ERROR_PERMISSION_DENIED:
-		return "CONV_ERROR_PERMISSION_DENIED";
-	case CONV_ERROR_NOT_SUPPORTED:
-		return "CONV_ERROR_NOT_SUPPORTED";
-	case CONV_ERROR_NO_DATA:
-		return "CONV_ERROR_NO_DATA";
-	default:
-		return "UNKNOWN_ERROR";
-	}
-
-	return "UNKNOWN_ERROR";
-}
-
-static void start_discovery_cb(void *data, Evas_Object *obj, void *event_info)
-{
-	d2d_view* this = (d2d_view*) data;
-	DBG("Inside start server discovery cb");
-
-	int ret = conv_create(&this->gl_conv_h);
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_create failed with error : %s", get_d2d_error(ret));
-
-    ret = conv_discovery_start(this->gl_conv_h, 90, discovery_cb, this);/*Timeout 90 seconds*/
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_discovery_start failed with error : %s", get_d2d_error(ret));
-}
-
-
-static int app_control_start(conv_service_h service_handle, void* data)
-{
-	DBG("app_control_start");
-	int ret;
-
-	service_data *s_data = (service_data*) data;
-	s_data->service_handle = service_handle;
-	ret = conv_service_set_listener_cb(service_handle, message_listener, (void*)s_data);
-	RETVM_IF(ret != CONV_ERROR_NONE,0,"conv_service_set_listener_cb failed with error : %s", get_d2d_error(ret));
-	ret = conv_service_read(service_handle, NULL, NULL);
-	RETVM_IF(ret != CONV_ERROR_NONE,0,"conv_service_read failed with error : %s", get_d2d_error(ret));
-	ret = conv_service_start(service_handle, NULL, NULL);
-	RETVM_IF(ret != CONV_ERROR_NONE,0, "conv_service_start failed with error : %s", get_d2d_error(ret));
-
-	return 0;
-}
-
-static void service_selected_cb(void *data, Evas_Object *obj, void *event_info)
-{
-	DBG("service_selected_cb");
-
-	service_data *s_data = (service_data*) data;
-
-	RETM_IF(NULL==s_data, "s_data is NULL");
-
-	conv_service_e e = CONV_SERVICE_NONE;
-
-	if(s_data->service_handle == NULL)
-	{
-		ERR("s_data->service_handle is NULL");
-	}
-
-	conv_service_h service_handle =s_data->service_handle;
-
-
-	int ret = conv_service_get_type(service_handle, &e);
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_service_get_type failed with error : %s", get_d2d_error(ret));
-
-	switch (e)
-	{
-	case CONV_SERVICE_APP_TO_APP_COMMUNICATION :
-		DBG("CONV_SERVICE_APP_TO_APP_COMMUNICATION");
-		break;
-
-	case CONV_SERVICE_REMOTE_APP_CONTROL :
-		DBG("CONV_SERVICE_REMOTE_APP_CONTROL");
-		ret = app_control_start(service_handle, s_data);
-		RETM_IF(ret != CONV_ERROR_NONE, "app_control_start failed with error : %s", get_d2d_error(ret));
-		break;
-	case CONV_SERVICE_REMOTE_INTERACTION:
-		DBG("CONV_SERVICE_REMOTE_INTERACTION");
-		break;
-
-	default :
-		DBG( "UNKNOWN_SERVICE");
-		break;
-	}
-
-}
-
-static void message_listener(conv_service_h handle, conv_channel_h channel, int error, conv_payload_h result, void* user_data)
-{
-	DBG("message_listener");
-
-	char* test;
-	service_data* s_data = (service_data*) user_data;
-	conv_payload_get_string(result, "result_type", &test);
-	int ret;
-
-	DBG("result_type : %s", test);
-
-	if (!strcmp(test, "onStart"))
-	{
-		conv_payload_h payload_handle;
-
-		ret = conv_payload_create(&payload_handle);
-		RETM_IF(ret != CONV_ERROR_NONE, "conv_payload_create failed with error : %s", get_d2d_error(ret));
-
-		app_control_h app_control = NULL;
-		app_control_create(&app_control);
-		app_control_set_app_id(app_control, "org.tizen.coretbt_uiapp");
-		app_control_set_operation(app_control, APP_CONTROL_OPERATION_MAIN);
-
-		ret = conv_payload_set_app_control(payload_handle, "app_control", app_control);
-		RETM_IF(ret != CONV_ERROR_NONE, "conv_payload_set_app_control failed with error : %s", get_d2d_error(ret));
-		ret = conv_payload_set_string(payload_handle, "reply", "0");
-		RETM_IF(ret != CONV_ERROR_NONE, "conv_payload_set_string failed with error : %s", get_d2d_error(ret));
-		ret = conv_service_publish(s_data->service_handle, NULL, payload_handle);
-		RETM_IF(ret != CONV_ERROR_NONE, "conv_service_publish failed with error : %s", get_d2d_error(ret));
-		sleep(3);
-
-		ret = conv_service_stop(s_data->service_handle, NULL, NULL);
-		RETM_IF(ret != CONV_ERROR_NONE, "conv_service_stop failed with error : %s", get_d2d_error(ret));
-
-		DBG("conv_payload_destroy called..");
-		ret = conv_payload_destroy(payload_handle);
-		RETM_IF(ret != CONV_ERROR_NONE, "conv_payload_destroy failed with error : %s", get_d2d_error(ret));
-
-		ret = conv_service_destroy(s_data->service_handle);
-		RETM_IF(ret != CONV_ERROR_NONE, "conv_service_destroy failed with error : %s", get_d2d_error(ret));
-
-	}
-
-}
-
-
-static void service_foreach_cb(conv_service_h service_handle, void *user_data)
-{
-	conv_service_e e;
-	d2d_view* this = (d2d_view*) user_data;
-
-	DBG( "service_foreach_cb");
-	service_data* s_data = (service_data*)malloc(sizeof(service_data));
-	s_data->view = this;
-
-
-	int ret = conv_service_get_type(service_handle, &e);
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_service_get_type failed with error : %s", get_d2d_error(ret));
-	DBG( "service_get_type = %d", (int)e);
-
-	char* value = NULL;
-	char* service_id = NULL;
-
-	ret = conv_service_get_property_string(service_handle, CONV_SERVICE_ID, &service_id);
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_service_get_property_string failed with error : %s", get_d2d_error(ret));
-	DBG( "service id = %s", service_id);
-
-	ret = conv_service_get_property_string(service_handle, CONV_SERVICE_VERSION, &value);
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_service_get_property_string failed with error : %s", get_d2d_error(ret));
-	DBG( "service version = %s", value);
-
-	conv_service_h clone_service_handle;
-
-	ret = conv_service_clone(service_handle, &clone_service_handle);
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_service_clone failed with error : %s", get_d2d_error(ret));
-
-	s_data->service_handle = clone_service_handle;
-
-	elm_list_item_append(service_list, service_id, NULL, NULL, service_selected_cb, s_data);
-
-	elm_list_go(service_list);
-	elm_object_part_content_set(this->view->layout, "list_container", service_list);
-
-}
-
-static void device_selected_cb(void *data, Evas_Object *obj, void *event_info)
-{
-	device_data* new_device_data = (device_data*) data;
-	d2d_view* this = new_device_data->this;
-	char* device_name;
-	conv_device_get_property_string(new_device_data->selected_device, CONV_DEVICE_NAME, &device_name);
-	DBG("%s is the device name inside device_selected_cb.", device_name );
-
-	elm_list_clear(this->server_list);
-	conv_device_h clone_device;
-	int ret = conv_device_clone(new_device_data->selected_device, &clone_device);
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_device_clone failed with error : %s", get_d2d_error(ret));
-
-	ret = conv_device_foreach_service(clone_device, service_foreach_cb, this);
-	RETM_IF(ret != CONV_ERROR_NONE, "conv_device_foreach_service failed with error : %s", get_d2d_error(ret));
-
-
-}
-
-static void discovery_cb(conv_device_h device, int result, void* user_data)
-{
-	char* value = NULL;
-	char* device_name = NULL;
-	d2d_view* this = (d2d_view*) user_data;
-	DBG("Inside server discovery cb.");
-	int ret = conv_device_get_property_string(device, CONV_DEVICE_ID, &value);
-	DBG("conv_device_get_property_string failed with error : %s", get_d2d_error(ret));
-	DBG("device id = %s", value);
-
-	ret = conv_device_get_property_string(device, CONV_DEVICE_NAME, &device_name);
-	DBG("conv_device_get_property_string failed with error : %s", get_d2d_error(ret));
-	DBG("device name = %s", device_name);
-
-    ret = conv_device_get_property_string(device, CONV_DEVICE_TYPE, &value);
-	DBG("conv_device_get_property_string failed with error : %s", get_d2d_error(ret));
-	DBG( "device TYPE = %s", value);
-
-//	this->selected_device = device;
-
-
-	if( device_name!=NULL)
-	{
-		//FIX_ME
-		device_data *new_device_data = (device_data*) malloc(sizeof(device_data));
-		new_device_data->this = this;
-		new_device_data->selected_device = device;
-		this->devices_list = g_list_append(this->devices_list, (gpointer) new_device_data);
-		elm_list_item_append(found_device_list, device_name, NULL, NULL, device_selected_cb, new_device_data);
-		elm_list_go(found_device_list);
-		elm_object_part_content_set(this->view->layout, "list_container", found_device_list);
-
-	}
-}
-
-
-/**
- * @function		_app_destroy_cb
- * @since_tizen		2.3
- * @description		 App Destroy Cb
- * @parameter		void*: Void Pointer
- * @return		static void
- */
-static void _app_destroy_cb(void* this)
-{
-	RETM_IF(NULL == this, "data is NULL");
-
-	d2d_view *view = NULL;
-	view = (d2d_view*)this;
-	RETM_IF(NULL == view, "view is NULL");
-
-	GList *l;
-	device_data *d;
-	for(l = view->devices_list; l != NULL; l = l->next)
-	{
-		d = (device_data*)l->data;
-		conv_device_destroy(d->selected_device);
-		SAFE_DELETE(d);
-	}
-
-	SAFE_DELETE(view->view);
-	SAFE_DELETE(view);
-}
-
-#endif