Fix defect(N_SE-36637) and License file updated

Change-Id: I4cfe5236440f6635d4eb4071b9103ea986ca7360

diff --git a/LICENSE.Flora b/LICENSE.Flora
index fd90a36..4a0af40 100644 (file)
--- a/LICENSE.Flora
+++ b/LICENSE.Flora
@@ -1,6 +1,6 @@
 Flora License
 
-Version 1.0, April, 2013
+Version 1.1, April, 2013
 
 http://floralicense.org/license/
 
@@ -119,17 +119,17 @@ Object form, provided that You meet the following conditions:
      Derivative Works; or, within a display generated by the Derivative Works,
      if and wherever such third-party notices normally appear.
      The contents of the NOTICE file are for informational purposes only
-     and do not modify the License.
-
-You may add Your own attribution notices within Derivative Works
-that You distribute, alongside or as an addendum to the NOTICE text
-from the Work, provided that such additional attribution notices
-cannot be construed as modifying the License. You may add Your own
-copyright statement to Your modifications and may provide additional or
-different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works
-as a whole, provided Your use, reproduction, and distribution of
-the Work otherwise complies with the conditions stated in this License.
+     and do not modify the License. You may add Your own attribution notices
+     within Derivative Works that You distribute, alongside or as an addendum
+     to the NOTICE text from the Work, provided that such additional attribution
+     notices cannot be construed as modifying the License. You may add Your own
+     copyright statement to Your modifications and may provide additional or
+     different license terms and conditions for use, reproduction, or
+     distribution of Your modifications, or for any such Derivative Works
+     as a whole, provided Your use, reproduction, and distribution of
+     the Work otherwise complies with the conditions stated in this License
+     and your own copyright statement or terms and conditions do not conflict
+     the conditions stated in the License including section 3.
 
 5. Submission of Contributions. Unless You explicitly state otherwise,
 any Contribution intentionally submitted for inclusion in the Work
@@ -192,7 +192,7 @@ identification within third-party archives.
 
    Copyright [yyyy] [name of copyright owner]
 
-   Licensed under the Flora License, Version 1.0 (the "License");
+   Licensed under the Flora License, Version 1.1 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 

diff --git a/NOTICE b/NOTICE
index 05911b5..000e9d1 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -2,5 +2,5 @@ Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
 Except as noted, this software is licensed under Apache License, Version 2.
 Please, see the LICENSE file for Apache License terms and conditions.
 
-p2p_supplicant file is licensed Flora License, Version 1. Please, see the LICENSE.Flora
-for Flora License terms and conditions.
+p2p_supplicant file is licensed Flora License, Version 1.1. Please, see the LICENSE.Flora
+for Flora License 1.1 terms and conditions.

diff --git a/debian/changelog b/debian/changelog
index fac85d6..3ba9a75 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+wfi-direct-manager (0.6.20) precise; urgency=low
+
+  * N_SE-36637(Incorrect popup displayed)
+  * Flora license file updated
+  * Git : framework/connectivity/wifi-direct-manager
+  * Tag : wifi-direct-manager_0.6.20
+
+ -- Gibyoung Kim <lastkgb.kim@samsung.com>  Mon, 29 Apr 2013 16:34:49 +0900
+
 wfi-direct-manager (0.6.19) precise; urgency=low
 
   * License file changed

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index c307d75..4d617f8 100755 (executable)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -1,6 +1,6 @@
 Name:       wifi-direct-manager
 Summary:    Wi-Fi Direct manger
-Version:    0.6.19
+Version:    0.6.20
 Release:    1
 Group:      TO_BE_FILLED
 License:    Apache License Version 2.0

diff --git a/src/wifi-direct-event-handler.c b/src/wifi-direct-event-handler.c
index a8abceb..14d24c0 100644 (file)
--- a/src/wifi-direct-event-handler.c
+++ b/src/wifi-direct-event-handler.c
@@ -942,6 +942,8 @@ void wfd_server_process_event(wfd_event_t event)
                                                        WIFI_DIRECT_WPS_TYPE_PBC;\r
                                                if (wfd_oem_disconnect() == false)\r
                                                        WDS_LOGF("Error!!! wfd_oem_disconnect() failed!!..\n");\r
+                                               else\r
+                                                       wfd_server_set_state(WIFI_DIRECT_STATE_DISCONNECTING);\r
                                        }\r
                                        noti.event = WIFI_DIRECT_CLI_EVENT_DISASSOCIATION_IND;\r
                                        __wfd_server_send_client_event(&noti);\r