From 35ebb4bb09fada1c509b5f28d6dc968f7421022e Mon Sep 17 00:00:00 2001
From: Andrew Bibb <ajbibb@myfairpoint.net>
Date: Sun, 2 Oct 2016 09:08:33 -0400
Subject: [PATCH] changelog, resource.h for oct release

---
 apps/cmstapp/code/control_box/controlbox.cpp | 10 ++--------
 apps/resource.h                              |  4 ++--
 text/changelog.txt                           |  4 ++--
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/apps/cmstapp/code/control_box/controlbox.cpp b/apps/cmstapp/code/control_box/controlbox.cpp
index bb8668f5..f708f7fa 100755
--- a/apps/cmstapp/code/control_box/controlbox.cpp
+++ b/apps/cmstapp/code/control_box/controlbox.cpp
@@ -945,14 +945,8 @@ void ControlBox::dbsServicesChanged(QList<QVariant> vlist, QList<QDBusObjectPath
 
   // clear the counters (if selected) and update the widgets
   clearCounters();
-  // Next line a bit of a hack, but I can find no evidence that service provider properties are changed via signals once a connection is
-  // made. This includes both the manager.servicesChanged() and services.propertyChanged() signals. Connecting a VPN seems to be a
-  // black hole of signals (well except for vpn connection interface - but we're not using that).
-  // This will force a service rescan which picks up some of these properties.
-  if (services_list.count() > 0) {
-    if (services_list.at(0).objmap.value("Type") == "vpn") managerRescan(CMST::Manager_Services);
-  }
   
+  // update the widgets  
   updateDisplayWidgets();
 
   return;
@@ -966,7 +960,7 @@ void ControlBox::dbsPeersChanged(QList<QVariant> vlist, QList<QDBusObjectPath> r
   // Set the update flag
   bool b_needupdate = false;
 
-  // Process changed peers. Demarshall the raw QDBusMessage instead of vlist as it is easier.
+  // Process changed peers. Demarshal the raw QDBusMessage instead of vlist as it is easier.
   if (! vlist.isEmpty() ) {
     QList<arrayElement> revised_list;
     if (! getArray(revised_list, msg)) return;
diff --git a/apps/resource.h b/apps/resource.h
index 689d3132..ff798c16 100755
--- a/apps/resource.h
+++ b/apps/resource.h
@@ -35,9 +35,9 @@ DEALINGS IN THE SOFTWARE.
 ///////////////////////////////// Program Values ///////////////////////
 //
 // Program Info (may be visible, but don't mark for tranalation) 
-#define VERSION "2016.09.18-1"
+#define VERSION "2016.10.02-1"
 
-#define RELEASE_DATE "3 April 2016"
+#define RELEASE_DATE "2 October 2016"
 #define COPYRIGHT_DATE "2013-2016"
 
 // Program Values:
diff --git a/text/changelog.txt b/text/changelog.txt
index 5faa561f..f5dd88ba 100644
--- a/text/changelog.txt
+++ b/text/changelog.txt
@@ -1,8 +1,8 @@
 <b><center>Connman System Tray (CMST)</center></b>
 <b><center>Change Log</center></b>
-<b> In Progress</b>
+<b> 2016.10.02</b>
 <ul>
-<li>New commandline option to disable VPN support (issue #144).</li>
+<li>New commandline option -n (--disable-vpn) to disable VPN support (issue #144).</li>
 <li>Fixed showing error dialog when connect is selected from the tray icon (issue #143).</li>
 <li>Provisioning editor and properties editor nameserver and timeserver fields will now accept domain names in addition to IPv4 and IPv6 addresses (issue #146).</li>
 <li>Added wifi rescan button to Wifi tab (issue #151).</li>