URL validity check removed, will be done in the error handling of the request...

3 files changed, 14 insertions, 22 deletions

diff --git a/fbbrowser/fbbrowser b/fbbrowser/fbbrowser
index 03a4448..63efad8 100755
--- a/fbbrowser/fbbrowser
+++ b/fbbrowser/fbbrowser
diff --git a/fbbrowser/fbbrowser.cpp b/fbbrowser/fbbrowser.cpp
index b53134c..3844f66 100644
--- a/fbbrowser/fbbrowser.cpp
+++ b/fbbrowser/fbbrowser.cpp
@@ -22,20 +22,20 @@ fbbrowser::fbbrowser(const QUrl & url)
 	//connect(reply, SIGNAL(error()), this, SLOT());
 	//connect(reply, SIGNAL(finished()), this, SLOT());
 
-	// Check if the reply is an error message (?)
+	// Check if the reply is an error message.
 	qDebug() << reply->error();
 
 	//TODO: error differentiation
-	if(reply->error()!=0)
-	{
-		qDebug() << "show errorPage";
-		view->load(QUrl("qrc:/html/errorPage.html"));
-	}
-	else
+	if(reply->error() == QNetworkReply::NoError)
 	{
 		qDebug() << "show Page";
 		view->load(url);
 	}
+	else 
+	{
+		qDebug() << "show errorPage";
+		view->load(QUrl("qrc:/html/errorPage.html"));
+	}
 
 	//remove the window decoration
 	this->setWindowFlags(Qt::SplashScreen);
diff --git a/fbbrowser/main.cpp b/fbbrowser/main.cpp
index b6c6dac..086f2c5 100644
--- a/fbbrowser/main.cpp
+++ b/fbbrowser/main.cpp
@@ -16,21 +16,13 @@ int main(int argc, char *argv[])
                 url = QUrl(argv[1]);
             else //Default URL to load
                 url = QUrl("http://132.230.4.3/webkitTest.html");
-    // Check if the URL is valid.
-    // TODO(joe): also check for correct host
-    //            handle the case of a non-valid URL properly.
-    if (!url.isValid())
-    	qDebug() << "Invalid URL.";
-    else
-    {
-	qDebug() << "Valid URL.";
-        // Create a new Framebuffer-Browser object for displaying the given URL.
-        fbbrowser *fbb = new fbbrowser(url);
-        // Listen to the signalQuitAll() Signal to kill the app from within the browser.
-        QObject::connect(fbb, SIGNAL(signalQuitAll()), &a, SLOT(quit()));
-        // Display the browser.
-        fbb->show();
-    }
+    // Create a new Framebuffer-Browser object for displaying the given URL.
+    fbbrowser *fbb = new fbbrowser(url);
+    // Listen to the signalQuitAll() Signal to kill the app from within the browser.
+    QObject::connect(fbb, SIGNAL(signalQuitAll()), &a, SLOT(quit()));
+    // Display the browser.
+    fbb->show();
+
     // Exit the application.
     return a.exec();
 }