From be915d3cfcc639d6303bf8bc0e5ad825e0ef2f95 Mon Sep 17 00:00:00 2001
From: Niklas
Date: Wed, 5 Oct 2011 17:39:35 +0200
Subject: modified the check for carrier signal. on autoUp==true: if no
 interface is in running state, the app will check the state of the interface
 several times (can be specified by us with the _ifUpCountdown value)

---
 LogReceiver/ndgui.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'LogReceiver/ndgui.cpp')

diff --git a/LogReceiver/ndgui.cpp b/LogReceiver/ndgui.cpp
index eafc2f6..b77c2a1 100644
--- a/LogReceiver/ndgui.cpp
+++ b/LogReceiver/ndgui.cpp
@@ -62,7 +62,7 @@ void ndgui::startNetworkDiscovery(){
 	disconnect(_webView,SIGNAL(loadFinished(bool)), this, SLOT(startNetworkDiscovery()));
 	if(!_started) {
 		_started = true;
-		networkDiscovery.initAndRun("209.85.148.105", _userChoice,"/var/tmp/qt_c_socket_custom");
+		networkDiscovery.initAndRun("209.85.148.105", _userChoice, true, "/var/tmp/logfile","/var/tmp/qt_c_socket_custom");
 	}
 	else {
 		qDebug() << "NetworkDiscovery already started";
@@ -108,8 +108,9 @@ void ndgui::continueBoot(QString ifName, int userChoice) {
 	_webView->load(QUrl("qrc:html/continueBoot.html"));
 }
 
-void ndgui::showLog() {
+QString ndgui::readLogFile() {
 	qDebug() << "show log";
+	return networkDiscovery.readLogFile();
 }
 
 /*test html gui version*/
@@ -130,6 +131,7 @@ int ndgui::ip4_setManualConfiguration(QVariantMap jsonArr) {
 
 }
 
+
 /* slots */
 
 
-- 
cgit v1.2.3-55-g7522