2 files changed, 17 insertions, 14 deletions

diff --git a/library/backend/rohfeedback.cpp b/library/backend/rohfeedback.cpp
index ff76a36..21aad34 100644
--- a/library/backend/rohfeedback.cpp
+++ b/library/backend/rohfeedback.cpp
@@ -1,5 +1,5 @@
-#include <rohfeedback.h>
-
+#ifdef OPIE_WITHROHFEEDBACK
 
+#include <rohfeedback.h>
 #include <stdio.h>
 #include <qpeapplication.h>
@@ -36,10 +36,9 @@ RoHFeedback::RoHFeedback() :
 
       for( int i = 0; i < NOOFICONS ; i ++ ) {
-        Imgs[i] =  new QPixmap( Resource::loadPixmap("RoH/star/"+
-                                                     QString::number(i+1) +
-                                                     ".png" ));
+        Imgs[i] =  new QPixmap( Resource::loadPixmap(
+              "RoH/star/"+ QString::number(i+1) + ".png" ));
         Masks[i] = new QBitmap();
-        (*Masks[i]) = Resource::loadPixmap("RoH/star/"+QString::number(i+1) +
-                                        ".png" );
+        (*Masks[i]) = Resource::loadPixmap(
+              "RoH/star/"+QString::number(i+1) + "-mask.png" );
       }
     }
@@ -67,14 +66,12 @@ void RoHFeedback::init( const QPoint & P, QWidget* wid ) {
 
     Receiver =  wid;
-    IconNr = -1;
+    IconNr = FeedbackTimerStart;
     move( P.x()-IconWidth/2, P.y() - IconHeight/2 );
     // to initialize
-    Timer.start( DELAY - SPEED/NOOFICONS );
+    Timer.start( DELAY );
 }
 
 void RoHFeedback::stop( void ) {
-    IconNr = -2; // stop
-    hide();
-    Timer.stop();
+    IconNr = FeedbackStopped; // stop
 }
 
@@ -101,5 +98,5 @@ void RoHFeedback::iconShow( void ) {
     switch( IconNr ) {
       case FeedbackTimerStart:
-        IconNr = 0;
+        IconNr = FeedbackShow;
         Timer.start( SPEED/NOOFICONS );
         break;
@@ -108,4 +105,5 @@ void RoHFeedback::iconShow( void ) {
         IconNr = FeedbackTimerStart;
         hide();
+        Timer.stop();
         break;
       case FeedbackShow: // first
@@ -123,3 +121,5 @@ void RoHFeedback::iconShow( void ) {
 
 }
-}
\ No newline at end of file
+}
+
+#endif
diff --git a/library/backend/rohfeedback.h b/library/backend/rohfeedback.h
index f38a095..9ffd35a 100644
--- a/library/backend/rohfeedback.h
+++ b/library/backend/rohfeedback.h
@@ -2,4 +2,6 @@
 #define ROHFEEDBACK_H
 
+#ifdef OPIE_WITHROHFEEDBACK
+
 /*
 
@@ -61,2 +63,3 @@ protected :
 
 #endif
+#endif