--- a/messagingapp/smartmessaging/ringbc/src/ringbc_p.cpp	Tue Jul 06 14:12:40 2010 +0300
+++ b/messagingapp/smartmessaging/ringbc/src/ringbc_p.cpp	Wed Aug 18 09:45:25 2010 +0300
@@ -12,8 +12,7 @@
  * Contributors:
  *
  * Description:  
- *     A class which takes care of reading the possible new
- *     service centres from SIM and adds them to pda-side Sms Settings.
+ *     
  *
  */
 
@@ -40,9 +39,7 @@
 
     {
     QDEBUG_WRITE("RingBcPrivate::RingBcPrivate : Enter")
-
-    TRAP_IGNORE(initL());
-
+    initL();
     QDEBUG_WRITE("RingBcPrivate::RingBcPrivate : Exit")
 
     }
@@ -90,23 +87,23 @@
         
         if(error == KErrCorrupt)
             {
-            HbMessageBox::information("Ringing Tone Corrupted");
+            HbMessageBox::information("Ringing Tone Corrupted", 0, 0, HbMessageBox::Ok);
             QDEBUG_WRITE("RingBcPrivate::saveTone : Ringing tone corrupted")
             }
         else if(error == KErrNoMemory || error == KErrDiskFull)
             {
-            HbMessageBox::information("No memory to save");
+            HbMessageBox::information("No memory to save", 0, 0, HbMessageBox::Ok);
             QDEBUG_WRITE("RingBcPrivate::saveTone : Low memory")
             }
         else
             {
-            HbMessageBox::information("Error in Saving");
+            HbMessageBox::information("Error in Saving", 0, 0, HbMessageBox::Ok);
             QDEBUG_WRITE("RingBcPrivate::saveTone : Error in Saving")
             }
         }
     else
         {
-        HbMessageBox::information("Saved succesfully");
+        HbMessageBox::information("Saved succesfully", 0, 0, HbMessageBox::Ok);
         QDEBUG_WRITE("RingBcPrivate::saveTone : Ringing tone saved successfully")
         }
 
@@ -163,6 +160,10 @@
             }
         CleanupStack::PopAndDestroy(2); // title,fileMan        
         }
+    else
+    	{
+        User::Leave(KErrCorrupt);
+    	}
 
     CleanupStack::PopAndDestroy(); // dataBuf
     CleanupStack::PopAndDestroy(); //file
@@ -184,11 +185,13 @@
     QString extension = pathList.at(pathList.count() - 1);
 
     HBufC* fileName = XQConversions::qStringToS60Desc(path);
-    TRAP_IGNORE( title = titleL(*fileName));
-    
-    title.append(QChar('.'));
-    title.append(extension);
-    
+    TRAPD(err, title = titleL(*fileName));
+    if(err == KErrNone)
+        {
+        title.append(QChar('.'));
+        title.append(extension);                
+        }
+     
     QDEBUG_WRITE("RingBcPrivate::toneTitle : Exit")
     return title;
     }
@@ -227,7 +230,11 @@
                     {
                     HBufC* toneTitle = mConverter->TitleLC(data);
                     title = XQConversions::s60DescToQString(*toneTitle);
-                    CleanupStack::PopAndDestroy(); //title
+                    CleanupStack::PopAndDestroy(); //tonetitle
+                    }
+                else
+                    {
+                    User::Leave(KErrCorrupt);
                     }
                 CleanupStack::PopAndDestroy(); //dataBuf
                 }