From bf9ca3c302e7302f172fee1c9869b342d1c98576 Mon Sep 17 00:00:00 2001
From: Niklas Goby
Date: Thu, 10 Mar 2011 12:43:29 +0100
Subject: small changes in the test method getAllInfo() in sysinfo class

---
 src/fbgui.conf  | 2 +-
 src/sysInfo.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/fbgui.conf b/src/fbgui.conf
index 1718021..99d7d0e 100644
--- a/src/fbgui.conf
+++ b/src/fbgui.conf
@@ -1,3 +1,3 @@
 [default]
-url=http://132.230.4.3/mockup/index.html
+url=http://132.230.4.3/mockup/openslx.php
 downloadDirectory=/downloads
diff --git a/src/sysInfo.cpp b/src/sysInfo.cpp
index a3151b9..b4c1dd0 100644
--- a/src/sysInfo.cpp
+++ b/src/sysInfo.cpp
@@ -51,6 +51,7 @@ QString sysInfo::getIPAddress(){
 }
 // ------------------------------------------------------------------------------------------------
 QString sysInfo::getAllInfos(){
+	QString tmp = "[{\"mac\":\"" + getMACAddress() +"\", \"ip\":\"" + getIPAddress() +"\"]}]";
 
-	return "test";
+	return tmp;
 }
-- 
cgit v1.2.3-55-g7522