merge with master

diff --git a/audio/telephony-tizen.c b/audio/telephony-tizen.c
index 7b6bc16..b2d14b5 100644 (file)
--- a/audio/telephony-tizen.c
+++ b/audio/telephony-tizen.c
@@ -1831,8 +1831,6 @@ static void telephony_operator_reply(DBusPendingCall *call, void *telephony_devi
 
        DBG("telephony_operator_reply\n");
 
-       dbus_error_init(&derr);
-
        if (dbus_set_error_from_message(&derr, reply)) {
                DBG("telephony_operator_reply error:%s", derr.message);
                goto failed;

diff --git a/packaging/bluez.spec b/packaging/bluez.spec
index 537b8ed..cf9006c 100644 (file)
--- a/packaging/bluez.spec
+++ b/packaging/bluez.spec
@@ -1,7 +1,7 @@
 Name:       bluez
 Summary:    Bluetooth utilities
-Version:    4.101_19
-Release:    19
+Version:    4.101_21
+Release:    21
 Group:      Applications/System
 License:    GPLv2+
 URL:        http://www.bluez.org/
@@ -104,8 +104,6 @@ install -D -m 0644 COPYING %{buildroot}%{_datadir}/license/bluez
 install -D -m 0644 COPYING %{buildroot}%{_datadir}/license/libbluetooth3
 install -D -m 0644 COPYING %{buildroot}%{_datadir}/license/libbluetooth-devel
 
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-ln -s ../bluetooth.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/bluetooth.service
 ln -s bluetooth.service %{buildroot}%{_libdir}/systemd/system/dbus-org.bluez.service
 
 %post -n libbluetooth3 -p /sbin/ldconfig
@@ -134,7 +132,6 @@ ln -s bluetooth.service %{buildroot}%{_libdir}/systemd/system/dbus-org.bluez.ser
 %dir %{_libdir}/bluetooth/plugins
 %{_libdir}/systemd/system/bluetooth.service
 %{_libdir}/systemd/system/dbus-org.bluez.service
-%{_libdir}/systemd/system/multi-user.target.wants/bluetooth.service
 %dir %{_localstatedir}/lib/bluetooth
 %{_datadir}/dbus-1/system-services/org.bluez.service
 %{_datadir}/license/bluez

diff --git a/plugins/hciops.c b/plugins/hciops.c
index addbe08..d74f2ea 100644 (file)
--- a/plugins/hciops.c
+++ b/plugins/hciops.c
@@ -3930,11 +3930,7 @@ static struct btd_adapter_ops hci_ops = {
 static int hciops_init(void)
 {
        DBG("");
-#ifdef __TIZEN_PATCH__
-       return btd_register_adapter_ops(&hci_ops, TRUE);
-#else
        return btd_register_adapter_ops(&hci_ops, FALSE);
-#endif
 }
 
 static void hciops_exit(void)

diff --git a/plugins/mgmtops.c b/plugins/mgmtops.c
index 3a99b56..ff6f2c8 100644 (file)
--- a/plugins/mgmtops.c
+++ b/plugins/mgmtops.c
@@ -2554,11 +2554,7 @@ static struct btd_adapter_ops mgmt_ops = {
 
 static int mgmt_init(void)
 {
-#ifdef __TIZEN_PATCH__
-       return btd_register_adapter_ops(&mgmt_ops, FALSE);
-#else
        return btd_register_adapter_ops(&mgmt_ops, TRUE);
-#endif
 }
 
 static void mgmt_exit(void)

diff --git a/serial/proxy.c b/serial/proxy.c
index dd38317..ecca085 100644 (file)
--- a/serial/proxy.c
+++ b/serial/proxy.c
@@ -117,6 +117,9 @@ static void disable_proxy(struct serial_proxy *prx)
        remove_record_from_server(prx->record_id);
        prx->record_id = 0;
 
+#ifdef __TIZEN_PATCH__
+       g_io_channel_shutdown(prx->io, TRUE, NULL);
+#endif
        g_io_channel_unref(prx->io);
        prx->io = NULL;
 }