X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=plugins%2Fbluetooth.c;fp=plugins%2Fbluetooth.c;h=a8383e75cd91ae00f48dc0a5fedd1ff68d7fe2be;hb=bf0e619ef451bde3568c1af509ccb12cbda2ff93;hp=5336103451fc40908b0aac9b3f1dda2143abe831;hpb=f89b473dfd8e916314b534b3397442f8c869c783;p=platform%2Fupstream%2Fconnman.git

diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
old mode 100644
new mode 100755
index 5336103..a8383e7
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -192,8 +192,14 @@ static bool pan_connect(struct bluetooth_pan *pan,
 		return false;
 	}
 
+#if defined TIZEN_EXT
+	if (pan->network) {
+#endif
 	connman_network_set_index(pan->network, index);
 	connman_network_set_connected(pan->network, true);
+#if defined TIZEN_EXT
+	}
+#endif
 
 	return true;
 }
@@ -262,6 +268,9 @@ static int bluetooth_pan_connect(struct connman_network *network)
 			g_strdup(path), g_free))
 		return -EIO;
 
+#if defined TIZEN_EXT
+	if (pan->network)
+#endif
 	connman_network_set_associating(pan->network, true);
 
 	return -EINPROGRESS;
@@ -286,6 +295,9 @@ static void pan_disconnect_cb(DBusMessage *message, void *user_data)
 
 	DBG("network %p", pan->network);
 
+#if defined TIZEN_EXT
+	if (pan->network)
+#endif
 	connman_network_set_connected(pan->network, false);
 }
 
@@ -299,6 +311,11 @@ static int bluetooth_pan_disconnect(struct connman_network *network)
 	if (!pan)
 		return -EINVAL;
 
+#if defined TIZEN_EXT
+	if (connman_network_get_associating(network) == TRUE)
+		connman_network_clear_associating(network);
+#endif
+
 	path = g_dbus_proxy_get_path(pan->btnetwork_proxy);
 
 	if (!g_dbus_proxy_method_call(pan->btnetwork_proxy, "Disconnect",
@@ -524,7 +541,9 @@ static void device_enable_cb(const DBusError *error, void *user_data)
 		goto out;
 	}
 
+#if !defined TIZEN_EXT
 	enable_device(device, path);
+#endif
 out:
 	g_free(path);
 }
@@ -591,7 +610,9 @@ static void device_disable_cb(const DBusError *error, void *user_data)
 		goto out;
 	}
 
+#if !defined TIZEN_EXT
 	disable_device(device, path);
+#endif
 
 out:
 	g_free(path);