Fixed bug #744 where non mapped buttons in buttonsettings were not saved by introducing the "

ignore" statement.
Also removed unsed debug code

2 files changed, 12 insertions, 6 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 9e97c56..d5e3c5c 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -275,17 +275,16 @@ void ODevice::init ( )
                 ODeviceButton b;
                 
                         if (( ib-> model & Model_iPAQ_H36xx ) == Model_iPAQ_H36xx ) {   
                         b. setKeycode ( ib-> code );
                         b. setUserText ( qApp-> translate ( "Button", ib-> utext ));
                         b. setPixmap ( Resource::loadPixmap ( ib-> pix ));
                         b. setFactoryPresetPressedAction ( OQCopMessage ( makeChannel ( ib-> fpressedservice ), ib-> fpressedaction ));
                         b. setFactoryPresetHeldAction ( OQCopMessage ( makeChannel ( ib-> fheldservice ), ib-> fheldaction ));
-                                        
                         d-> m_buttons. append ( b );
                 }
         }
         reloadButtonMapping ( );
 }
 
 ODevice::~ODevice ( )
 {
@@ -511,47 +510,53 @@ void ODevice::reloadButtonMapping ( )
                         pch = cfg. readEntry ( "PressedActionChannel" ). latin1 ( );
                         pm  = cfg. readEntry ( "PressedActionMessage" ). latin1 ( );
                         // pdata = decodeBase64 ( buttonFile. readEntry ( "PressedActionArgs" ));
 
                         hch = cfg. readEntry ( "HeldActionChannel" ). latin1 ( );
                         hm  = cfg. readEntry ( "HeldActionMessage" ). latin1 ( );
                         // hdata = decodeBase64 ( buttonFile. readEntry ( "HeldActionArgs" ));
                 }
-                
+                                
                 b. setPressedAction ( OQCopMessage ( pch, pm, pdata ));
+                
                 b. setHeldAction ( OQCopMessage ( hch, hm, hdata ));
         }
 }
 
 void ODevice::remapPressedAction ( int button, const OQCopMessage &action )
 {
+        QString mb_chan;
+        
         if ( button >= (int) d-> m_buttons. count ( ))
                 return;
+        
                 
         ODeviceButton &b = d-> m_buttons [button];
-    b. setPressedAction ( action );
+        b. setPressedAction ( action );
+
+        mb_chan=b. pressedAction ( ). channel ( );
 
         Config buttonFile ( "ButtonSettings" );
         buttonFile. setGroup ( "Button" + QString::number ( button ));
-        buttonFile. writeEntry ( "PressedActionChannel", (const char*) b. pressedAction ( ). channel ( ));
+        buttonFile. writeEntry ( "PressedActionChannel", (const char*) mb_chan);
         buttonFile. writeEntry ( "PressedActionMessage", (const char*) b. pressedAction ( ). message ( ));
 
         //buttonFile. writeEntry ( "PressedActionArgs", encodeBase64 ( b. pressedAction ( ). data ( )));
 
         QCopEnvelope ( "QPE/System", "deviceButtonMappingChanged()" );
 }
 
 void ODevice::remapHeldAction ( int button, const OQCopMessage &action )
 {
         if ( button >= (int) d-> m_buttons. count ( ))
                 return;
                 
         ODeviceButton &b = d-> m_buttons [button];
-    b. setHeldAction ( action );
+            b. setHeldAction ( action );
 
         Config buttonFile ( "ButtonSettings" );
         buttonFile. setGroup ( "Button" + QString::number ( button ));
         buttonFile. writeEntry ( "HeldActionChannel", (const char *) b. heldAction ( ). channel ( ));
         buttonFile. writeEntry ( "HeldActionMessage", (const char *) b. heldAction ( ). message ( ));
 
         //buttonFile. writeEntry ( "HeldActionArgs", decodeBase64 ( b. heldAction ( ). data ( )));
 
diff --git a/libopie/odevicebutton.cpp b/libopie/odevicebutton.cpp
index 2270343..4b22358 100644
--- a/libopie/odevicebutton.cpp
+++ b/libopie/odevicebutton.cpp
@@ -65,17 +65,17 @@ void OQCopMessage::init ( const QCString &ch, const QCString &m, const QByteArra
                 d = new OQCopMessageData ( );
         d-> m_channel = ch;
         d-> m_message = m;
         d-> m_data = arg;
 }
 
 bool OQCopMessage::send ( )
 {
-        if ( d-> m_channel. isEmpty ( ) || d-> m_message. isEmpty ( ))
+        if ( d-> m_channel. isEmpty ( ) || d-> m_message. isEmpty ( ) )
                 return false;
 
         QCopEnvelope e ( d-> m_channel, d-> m_message );
         
         if ( d-> m_data. size ( ))
                 e. writeRawBytes ( d-> m_data. data ( ), d-> m_data. size ( ));
 
         return true;
@@ -213,16 +213,17 @@ void ODeviceButton::setPixmap(const QPixmap& picture)
     m_Pixmap = picture;
 }
 
 void ODeviceButton::setFactoryPresetPressedAction(const OQCopMessage& action)
 {
     m_FactoryPresetPressedAction = action;
 }
 
+
 void ODeviceButton::setPressedAction(const OQCopMessage& action)
 {
     m_PressedAction = action;
 }
 
 void ODeviceButton::setFactoryPresetHeldAction(const OQCopMessage& action)
 {
     m_FactoryPresetHeldAction = action;