summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-12-16 03:02:51 +0100
committerAndrea Diamantini <adjam7@gmail.com>2009-12-16 03:02:51 +0100
commit170d0b123f2133c3a17ee4e53f5c3e1b9c905a7c (patch)
tree57ca9a51b753fc6c36dacd66774b91242c138fcd /src
parentclean up (diff)
downloadrekonq-170d0b123f2133c3a17ee4e53f5c3e1b9c905a7c.tar.xz
notfound.html --> rekonqinfo.html
cleanups
Diffstat (limited to 'src')
-rw-r--r--src/data/CMakeLists.txt2
-rw-r--r--src/data/rekonqinfo.html (renamed from src/data/notfound.html)0
-rw-r--r--src/protocolhandler.cpp6
-rw-r--r--src/webpage.cpp5
4 files changed, 6 insertions, 7 deletions
diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
index bf01a44d..0af92f5e 100644
--- a/src/data/CMakeLists.txt
+++ b/src/data/CMakeLists.txt
@@ -14,6 +14,6 @@ INSTALL(
)
INSTALL(
- FILES notfound.html home.html
+ FILES rekonqinfo.html home.html
DESTINATION ${DATA_INSTALL_DIR}/rekonq/htmls
)
diff --git a/src/data/notfound.html b/src/data/rekonqinfo.html
index e347f53a..e347f53a 100644
--- a/src/data/notfound.html
+++ b/src/data/rekonqinfo.html
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index a9b14b6f..c66af403 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -136,9 +136,9 @@ QString ProtocolHandler::dirHandling(const KUrl &url)
return errStr;
}
- // display "not found" page
- QString notfoundFilePath = KStandardDirs::locate("data", "rekonq/htmls/notfound.html");
- QFile file(notfoundFilePath);
+ // display "rekonq info" page
+ QString infoFilePath = KStandardDirs::locate("data", "rekonq/htmls/rekonqinfo.html");
+ QFile file(infoFilePath);
bool isOpened = file.open(QIODevice::ReadOnly);
if (!isOpened)
diff --git a/src/webpage.cpp b/src/webpage.cpp
index 1890e74c..1bc8c1c1 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -213,14 +213,13 @@ void WebPage::manageNetworkErrors(QNetworkReply* reply)
QString WebPage::errorPage(QNetworkReply *reply)
{
// display "not found" page
- QString notfoundFilePath = KStandardDirs::locate("data", "rekonq/htmls/notfound.html");
+ QString notfoundFilePath = KStandardDirs::locate("data", "rekonq/htmls/rekonqinfo.html");
QFile file(notfoundFilePath);
bool isOpened = file.open(QIODevice::ReadOnly);
if (!isOpened)
{
- kWarning() << "Couldn't open the notfound.html file";
- return QString("");
+ return QString("Couldn't open the rekonqinfo.html file");
}
QString title = i18n("Error loading: %1", reply->url().path());