From d72e94d9cb5ce9a642f233b2126ed42889cdae43 Mon Sep 17 00:00:00 2001
From: Jimmy Huang <jimmy.huang@intel.com>
Date: Tue, 15 Oct 2013 10:45:27 -0700
Subject: [PATCH] Remove duplicating disconnect button from WiFi details panel

Change-Id: Ie7f78921ca5202212d6ca9eea23e87a74f441f3e
Signed-off-by: Jimmy Huang <jimmy.huang@intel.com>
---
 js/panel-wifi.js           | 36 ------------------------------------
 packaging/Settings.changes |  3 +++
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/js/panel-wifi.js b/js/panel-wifi.js
index cfea3ad..ba2bf5b 100644
--- a/js/panel-wifi.js
+++ b/js/panel-wifi.js
@@ -378,7 +378,6 @@ function wifiConstructNetworkElement(parent, network) {
                     network.connected = false;
                     wifiUpdateNetwork(network);
                 })
-                $('#button_wifi_disconnect').remove();
             }, function(e) {
                 /* error */
                 hideSpinner();
@@ -452,41 +451,6 @@ function wifiConstructDetailPanel(network) {
     }
     html += '</ul>';
     $('#page_wifi_detail_content').append(html).trigger('create');
-
-    if (network.connected) {
-        html = '<div data-role="button" id="button_wifi_disconnect">Disconnect</div>';
-        $('#page_wifi_detail_content').append(html).trigger('create');
-
-        $('#button_wifi_disconnect').on('click', function(e) {
-            console.log('WiFi disconnect from network: ' + network.ssid);
-            /* retrieve the network object from element */
-            var adapter = settings.wifi.getDefaultAdapter();
-            if (adapter === null) return;
-
-            createPopupDialog(false, false, 'Disconnect from network', network.ssid, 'Disconnect', 'Cancel', function() {
-                showSpinner(false, 'Disconnecting...');
-                adapter.disconnectNetwork(network.id, function() {
-                    /* success */
-                    hideSpinner();
-                    network.connected = false;
-                    $('#button_wifi_disconnect').remove();
-
-                    /* changing from connected to disconnected */
-                    wifiUpdateNetwork(network);
-                    setTimeout(function() {
-                        $.mobile.changePage('#page_wifi');
-                    }, 1000);
-                }, function(e) {
-                    /* error */
-                    hideSpinner();
-                    showMsg('Error', 'Network disconnect failed: ' + e);
-
-                    /* Something is wrong, remove from connected list */
-                    wifiRemoveFromKnownList(network.id);
-                });
-            });
-        });
-    }
     $('#listview_wifi_detail').listview('refresh');
 }
 
diff --git a/packaging/Settings.changes b/packaging/Settings.changes
index 3357880..5dcb789 100644
--- a/packaging/Settings.changes
+++ b/packaging/Settings.changes
@@ -1,3 +1,6 @@
+* Tue Oct 15 2013 Jimmy Huang <jimmy.huang@intel.com> accepted/tizen/20131007.221312@ff849bb
+- Remove duplicating disconnect button from WiFi details panel
+
 * Fri Oct 04 2013 Jimmy Huang <jimmy.huang@intel.com> submit/tizen/20131003.210102@6d2592a
 - Fixes TIVI-1943
 
-- 
2.7.4