1 files changed, 10 insertions, 7 deletions

diff --git a/noncore/apps/dagger/mainwindow.cpp b/noncore/apps/dagger/mainwindow.cpp
index ace8f36..b2e00e8 100644
--- a/noncore/apps/dagger/mainwindow.cpp
+++ b/noncore/apps/dagger/mainwindow.cpp
@@ -75,2 +75,5 @@ MainWindow::~MainWindow()
 {
+    // Re-enable screen blanking if it was disabled
+    QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
+
     // Save Sword options
@@ -171,3 +174,3 @@ void MainWindow::initUI()
     m_navToolbar->navBtnsEnable( false );
-    connect( m_navToolbar, SIGNAL(prevChapter()), this, SLOT(slotNavPrevChapter()) );
+    connect( m_navToolbar, SIGNAL(prevPage()), this, SLOT(slotNavPrevPage()) );
     connect( m_navToolbar, SIGNAL(prevVerse()), this, SLOT(slotNavPrevVerse()) );
@@ -175,3 +178,3 @@ void MainWindow::initUI()
     connect( m_navToolbar, SIGNAL(nextVerse()), this, SLOT(slotNavNextVerse()) );
-    connect( m_navToolbar, SIGNAL(nextChapter()), this, SLOT(slotNavNextChapter()) );
+    connect( m_navToolbar, SIGNAL(nextPage()), this, SLOT(slotNavNextPage()) );
     connect( m_navToolbar, SIGNAL(autoScroll(bool)), this, SLOT(slotNavAutoScroll(bool)) );
@@ -334,3 +337,3 @@ void MainWindow::enableScreenBlanking( bool enable )
     enable ? QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable
-           : QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Disable;
+           : QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend;
 }
@@ -599,3 +602,3 @@ void MainWindow::slotViewSearchToolbar( bool enabled )
 
-void MainWindow::slotNavPrevChapter()
+void MainWindow::slotNavPrevPage()
 {
@@ -604,3 +607,3 @@ void MainWindow::slotNavPrevChapter()
     {
-        text->prevChapter();
+        text->prevPage();
         setCaption( QString( "%1 - Dagger" ).arg( text->getFullKey() ) );
@@ -645,3 +648,3 @@ void MainWindow::slotNavNextVerse()
 
-void MainWindow::slotNavNextChapter()
+void MainWindow::slotNavNextPage()
 {
@@ -650,3 +653,3 @@ void MainWindow::slotNavNextChapter()
     {
-        text->nextChapter();
+        text->nextPage();
         setCaption( QString( "%1 - Dagger" ).arg( text->getFullKey() ) );