--- a/email/pop3andsmtpmtm/clientmtms/group/IMCM.mmp	Thu Sep 02 20:23:03 2010 +0300
+++ b/email/pop3andsmtpmtm/clientmtms/group/IMCM.mmp	Fri Sep 17 08:28:39 2010 +0300
@@ -48,7 +48,7 @@
 LIBRARY			centralrepository.lib tzclient.lib numberconversion.lib
 
 SOURCEPATH              .
-START RESOURCE  imcm.rss
+START RESOURCE  IMCM.rss
 LANG	SC
 HEADER
 TARGETPATH      resource/messaging

--- a/email/pop3andsmtpmtm/popservermtm/src/POPSMTM.CPP	Thu Sep 02 20:23:03 2010 +0300
+++ b/email/pop3andsmtpmtm/popservermtm/src/POPSMTM.CPP	Fri Sep 17 08:28:39 2010 +0300
@@ -40,7 +40,7 @@
 #include "POPSMTM.H"
 #include "POPS.H"
 #include "POPSOFFL.H"
-#include "iapprefs.h"
+#include "IAPPrefs.h"
 #include "PopsDele.h"
 #include "POPSRFSH.h"
 #include "PopsCpMv.h"

--- a/inc/convergedmessage.h	Thu Sep 02 20:23:03 2010 +0300
+++ b/inc/convergedmessage.h	Fri Sep 17 08:28:39 2010 +0300
@@ -102,7 +102,9 @@
     enum MessageProperty
         {
         Unread = 0x0001,
-        Attachment = 0x0002
+        Attachment = 0x0002,
+        /** TP-RP (Reply Path) Found in first octet of Submit and Deliver. */
+        ReplyPath = 0x0004
         };
 
     /**
@@ -411,6 +413,33 @@
      * @param stream data stream from which data is deserialized. 
      */
     void deserialize(QDataStream &stream);
+    
+    /**
+     * Sets the message property, if reply-path is present
+     * @param replypath, TP-RP (Reply Path) Found in first octet of
+     * Submit and Deliver PDU
+     */
+    void setReplyPath(bool replypath = true);
+    
+    /**
+     * Tells if the reply-path is set for this message
+     * @return bool, if the reply-path exists
+     */
+    bool replyPath();
+    
+    /**
+     * Set originating service center address. This is used for reply
+     * purposes, if the reply-via-same-smsc flag is ON
+     * @param scaddress, service center address
+     */
+    void setOriginatingSC(const QString& scaddress);
+    
+    /**
+     * Get originating service center address,
+     * if preserved for reply-via-same-smsc
+     * @return originating service center address
+     */
+    const QString& originatingSC() const;
 
 private:
     /**

--- a/inc/msgcontacthandler.h	Thu Sep 02 20:23:03 2010 +0300
+++ b/inc/msgcontacthandler.h	Fri Sep 17 08:28:39 2010 +0300
@@ -28,6 +28,7 @@
 #include <qversitcontactimporter.h>
 #include <qversitdocument.h>
 #include <qversitreader.h>
+#include <qcontactid.h>
 
 QTM_BEGIN_NAMESPACE
 class QContactManager;
@@ -37,14 +38,14 @@
 
 class MsgContactHandler
 {
-    
+
 public:
 
     /**
      * This shall resolve contact number with display name
      * @param contactNumber number to resolve
      * @param displayName resolved name
-     * @param countPhoneNumber specifies number of contacts inside 
+     * @param countPhoneNumber specifies number of contacts inside
      * the resolved contact ex mobile, home, office etc
      * @return contacts unique localId
      */
@@ -148,12 +149,12 @@
             QContactPhoneNumber::FieldNumber);
         phoneFilter.setValue(phoneNumber);
         phoneFilter.setMatchFlags(QContactFilter::MatchEndsWith);
-        
+
         QList<QContact> matchingContacts = phonebookManager.contacts(phoneFilter);
 
         return matchingContacts;
     }
-    
+
     /**
      * Get display-name of a contact from VCard.
      * @param filePath, VCard file-path
@@ -202,6 +203,46 @@
         file.close();
         return displayName;
     }
+
+    /**
+     * Get list of self-addresses
+     * @return QStringList, list of self-addresses
+     */
+    static QStringList selfAddresses()
+    {
+        QStringList selfAddrs;
+        QContactManager* contactManager =
+                                        new QContactManager("symbian");
+        QContactLocalId selfId = contactManager->selfContactId();
+        if( (selfId == 0) ||
+            (contactManager->error() == QContactManager::DoesNotExistError) )
+        {
+            // if no self-address exists
+            return selfAddrs;
+        }
+
+        QContact selfContact = contactManager->contact(selfId);
+        
+        // append numbers to the list of self-addresses
+        QList<QContactPhoneNumber> selfPhoneNumbers = 
+                        selfContact.details<QContactPhoneNumber>();
+        int selfNumCount = selfPhoneNumbers.count();
+        for(int i=0; i< selfNumCount; i++)
+        {
+            selfAddrs << selfPhoneNumbers.at(i).number();
+        }
+
+        // append email-addresses to the list
+        QList<QContactEmailAddress> selfEmailAddrs = 
+                        selfContact.details<QContactEmailAddress>();
+        int selfEmailAddrCount = selfEmailAddrs.count();
+        for(int i=0; i< selfEmailAddrCount; i++)
+        {
+            selfAddrs << selfEmailAddrs.at(i).emailAddress();
+        }
+        return selfAddrs;
+    }
+
 };
 
 #endif /* MSGCONTACTHANDLER_H_ */

Binary file messagingapp/conf/CI_messaging.confml has changed

--- a/messagingapp/conf/messaging_conf.pro	Thu Sep 02 20:23:03 2010 +0300
+++ b/messagingapp/conf/messaging_conf.pro	Fri Sep 17 08:28:39 2010 +0300
@@ -23,8 +23,7 @@
 symbian{
 		BLD_INF_RULES.prj_exports += \
     "$${LITERAL_HASH}include <platform_paths.hrh>" \
-    "messaging.confml APP_LAYER_CONFML(messaging.confml)" \
-    "CI_messaging.confml APP_LAYER_CONFML(CI_messaging.confml)" \
+    "messaging.confml APP_LAYER_CONFML(messaging.confml)" \    
 		"messaging_101F87EB.crml APP_LAYER_CRML(messaging_101F87EB.crml)" \
 		"messaging_101F87EC.crml APP_LAYER_CRML(messaging_101F87EC.crml)" \
 		"messaging_101F87ED.crml APP_LAYER_CRML(messaging_101F87ED.crml)" \

--- a/messagingapp/msgappfw/client/src/rcssession.cpp	Thu Sep 02 20:23:03 2010 +0300
+++ b/messagingapp/msgappfw/client/src/rcssession.cpp	Fri Sep 17 08:28:39 2010 +0300
@@ -23,6 +23,8 @@
 // USER INCLUDES
 #include "ccsdebug.h"
 
+const TInt KCsServerRetryTimeout  = 100000;
+const TInt KCsServerRetryCount    = 5;
 // ----------------------------------------------------------------------------
 // StartServer
 // Starts the server. Used only when the server is implemented as a transient.
@@ -54,15 +56,10 @@
 
     User::WaitForRequest(status);
 
-    if (status != KErrNone)
-    {
-        server.Close();
-        return status.Int();
-    }
-
+    err = (server.ExitType() == EExitPanic ) ? KErrGeneral : status.Int();
+    server.Close();
     PRINT ( _L("End RCsSession->StartServer") );
-
-    return KErrNone;
+    return err;
 }
 // ============================== MEMBER FUNCTIONS ============================
 
@@ -84,27 +81,31 @@
 // ----------------------------------------------------------------------------
 TInt RCsSession::Connect()
 {
-    TInt err = CreateSession(KCsServerName, Version());
-
-    if (err != KErrNone)
+    TInt retry = KCsServerRetryCount;
+    FOREVER
     {
-        PRINT ( _L("conversation server not running. Trying to start") );
-
-        err = StartServer();
-
-        if (err != KErrNone)
-        {
-            PRINT ( _L("Conversation server startup failed") );
-            PRINT1 ( _L("End RCsSession::Connect. Error code = %d"), err );
-            return err;
-        }
-
-        PRINT ( _L("Conversation server startup successful") );
-
-        err = CreateSession(KCsServerName, Version());
+         TInt err = CreateSession(KCsServerName, Version());
+         if( err != KErrNotFound && err != KErrServerTerminated && err != KErrServerBusy )
+         {
+             return err;
+         }
+         if( --retry == 0 )
+         {
+             return err;
+         }
+         if( err == KErrServerBusy )
+         {
+             User::After(KCsServerRetryTimeout);
+         }
+         PRINT ( _L("conversation server not running. Trying to start") );
+         err = StartServer();
+         if( err != KErrNone && err != KErrAlreadyExists )
+         {
+             PRINT ( _L("Conversation server startup failed") );
+             return err;
+         }
+         PRINT ( _L("Conversation server startup successful") );
     }
-
-    return err;
 }
 
 // ----------------------------------------------------------------------------

--- a/messagingapp/msgappfw/plugins/previewplugin/group/cspreviewplugin.mmp	Thu Sep 02 20:23:03 2010 +0300
+++ b/messagingapp/msgappfw/plugins/previewplugin/group/cspreviewplugin.mmp	Fri Sep 17 08:28:39 2010 +0300
@@ -65,4 +65,5 @@
 LIBRARY         unidatamodel.lib
 LIBRARY         charconv.lib
 LIBRARY         centralrepository.lib
-LIBRARY         MsgMedia.lib
\ No newline at end of file
+LIBRARY         MsgMedia.lib
+LIBRARY         imageconversion.lib
\ No newline at end of file

--- a/messagingapp/msgappfw/plugins/previewplugin/src/ccspreviewpluginhandler.cpp	Thu Sep 02 20:23:03 2010 +0300
+++ b/messagingapp/msgappfw/plugins/previewplugin/src/ccspreviewpluginhandler.cpp	Fri Sep 17 08:28:39 2010 +0300
@@ -35,6 +35,7 @@
 #include <MsgMediaResolver.h>
 #include <fileprotectionresolver.h>
 #include <MmsEngineInternalCRKeys.h>
+#include <imageconversion.h>
 //CONSTANTS
 //DB-file
 _LIT(KDbFileName, "c:[2002A542]conversations.db");
@@ -61,8 +62,8 @@
 
 const TInt KDefaultMaxSize = 300 * 1024;
 //Preview thumbnail size
-const TInt KWidth = 9.5 * 6.7;
-const TInt KHeight = 9.5 * 6.7;
+const TInt KWidth = 24 * 6.7;
+const TInt KHeight = 24 * 6.7;
 
 // NOTE:- DRAFTS ENTRIES ARE NOT HANDLED IN THE PLUGIN
 
@@ -336,15 +337,18 @@
         // skip processing this event for the given message
         return;
         }
-
+    
     // start processing message, set flag
     setMsgProcessingState(msgId, EPreviewMsgProcessing);
 
+
+    TRAPD( err,
+            {        
     // update db with message preview data
     RSqlStatement sqlInsertStmt;
     CleanupClosePushL(sqlInsertStmt);
     sqlInsertStmt.PrepareL(iSqlDb, KSqlInsertStmt);
-
+    
     // parse message
     iMmsMtm->SwitchCurrentEntryL(msgId);
     iMmsMtm->LoadMessageL();
@@ -352,7 +356,7 @@
     CUniDataModel* iUniDataModel = CUniDataModel::NewL(ifsSession, *iMmsMtm);
     CleanupStack::PushL(iUniDataModel);
     iUniDataModel->RestoreL(*this, ETrue);
-
+    
     //msg property
     TInt msgProperty = 0;
     if (iUniDataModel->AttachmentList().Count() > 0)
@@ -499,6 +503,12 @@
 
     //cleanup
     CleanupStack::PopAndDestroy(2, &sqlInsertStmt);
+            }); //TRAP
+    
+    if( err != KErrNone )
+        {
+        setMsgProcessingState(msgId, EPreviewMsgNotProcessed);
+        }
 
     PRINT ( _L("Enter CCsPreviewPluginHandler::HandleMMSEntry end.") );
     }
@@ -897,15 +907,6 @@
 void CCsPreviewPluginHandler::GetThumbNailL(TMsvAttachmentId attachmentId,
     TDesC8& mimeType, TMsvId msgId)
 {
-    //Scale the image
-    iThumbnailManager->SetFlagsL(CThumbnailManager::ECropToAspectRatio);
-
-    //TODO replace with hb-param-graphic-size-image-portrait * value of un in pixcels
-    iThumbnailManager->SetThumbnailSizeL(TSize(KWidth, KHeight)); 
-    
-    //optimize for performace
-    iThumbnailManager->SetQualityPreferenceL(
-        CThumbnailManager::EOptimizeForPerformance);
 
     // Create Thumbnail object source representing a path to a file
     HBufC* mimeInfo = HBufC::NewLC(mimeType.Length());
@@ -919,6 +920,53 @@
     RFile file = attachMan.GetAttachmentFileL(attachmentId);
     CleanupClosePushL(file);
 
+    //Find if the image is portrait image (or) landscape image
+    CImageDecoder *decoder =  CImageDecoder::FileNewL(file,mimeType,ContentAccess::EUnknown);
+    CleanupStack::PushL(decoder);
+    TSize size(0,0);
+       
+    TFrameInfo info = decoder->FrameInfo();
+    
+    size = info.iOverallSizeInPixels;
+    
+    CleanupStack::PopAndDestroy(decoder);
+   
+    TReal32 newLength = 0;
+    
+    if(size.iWidth >= size.iHeight)
+    {
+        //TODO replace with hb-param-graphic-size-image-portrait * value of un in pixcels
+        if(size.iWidth < KWidth)
+        {
+            iThumbnailManager->SetThumbnailSizeL(size);    
+        }
+        else
+        {
+            newLength = (KWidth * size.iHeight) /size.iWidth;
+            iThumbnailManager->SetThumbnailSizeL(TSize(KWidth, newLength));
+        }
+    }
+    else
+    {        
+        //TODO replace with hb-param-graphic-size-image-portrait * value of un in pixcels
+        if(size.iHeight < KHeight)
+        {
+            iThumbnailManager->SetThumbnailSizeL(size);    
+        }
+        else
+        {
+            newLength = (KHeight * size.iWidth) / size.iHeight;
+            iThumbnailManager->SetThumbnailSizeL(TSize(newLength, KHeight));    
+        }
+    }
+
+    //Scale the image
+    iThumbnailManager->SetFlagsL(CThumbnailManager::ECropToAspectRatio);
+
+    //optimize for performace
+    iThumbnailManager->SetQualityPreferenceL(
+        CThumbnailManager::EOptimizeForQuality);
+
     CThumbnailObjectSource* source = CThumbnailObjectSource::NewLC(
         (RFile64&) file, mimeInfo->Des());
 

--- a/messagingapp/msgappfw/server/inc/ccsconversation.h	Thu Sep 02 20:23:03 2010 +0300
+++ b/messagingapp/msgappfw/server/inc/ccsconversation.h	Fri Sep 17 08:28:39 2010 +0300
@@ -160,8 +160,11 @@
      * Add contact Number for the conversation
      * 
      * @param aContactNumber Contact number
+     * @param aContactId Contact id
      */
-    void AddContactDetailsL(TDesC& aContactNumber);
+    void AddContactDetailsL(
+            TDesC& aContactNumber,
+            TInt32 aContactID);
 
     /**
      * UpdateEntryL

--- a/messagingapp/msgappfw/server/src/ccsconversation.cpp	Thu Sep 02 20:23:03 2010 +0300
+++ b/messagingapp/msgappfw/server/src/ccsconversation.cpp	Fri Sep 17 08:28:39 2010 +0300
@@ -295,9 +295,11 @@
 // ----------------------------------------------------------------------------
 void
 CCsConversation::AddContactDetailsL(
-        TDesC& aContactNumber)
+        TDesC& aContactNumber,
+        TInt32 aContactID)
     {
     iContact->AddPhoneNumberL(aContactNumber);
+    iContact->SetContactId(aContactID);
     }
 
 // ----------------------------------------------------------------------------

--- a/messagingapp/msgappfw/server/src/ccsconversationcachehelper.cpp	Thu Sep 02 20:23:03 2010 +0300
+++ b/messagingapp/msgappfw/server/src/ccsconversationcachehelper.cpp	Fri Sep 17 08:28:39 2010 +0300
@@ -574,13 +574,15 @@
 
     // fill firstname and lastname and contact Id
     if(aDisplayName)
+    {
    		conversation->AddContactDetailsL(aContactId,
                                      aDisplayName);
+    }
 
-    // fill the phone number
+    // fill the phone number and contact Id
     if (aConversationEntry->Contact())
     {
-        conversation->AddContactDetailsL(* (aConversationEntry->Contact()));
+        conversation->AddContactDetailsL(* (aConversationEntry->Contact()), aContactId);
     }
 
     // add into the list

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/bwins/msgerrorwatcheru.def	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,15 @@
+EXPORTS
+	?trUtf8@MsgErrorWatcher@@SA?AVQString@@PBD0H@Z @ 1 NONAME ; class QString MsgErrorWatcher::trUtf8(char const *, char const *, int)
+	?trUtf8@MsgErrorWatcher@@SA?AVQString@@PBD0@Z @ 2 NONAME ; class QString MsgErrorWatcher::trUtf8(char const *, char const *)
+	?qt_metacall@MsgErrorWatcher@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 3 NONAME ; int MsgErrorWatcher::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?ShowNote@MsgErrorWatcher@@QAEXW4TMsgErrorNoteIds@@@Z @ 4 NONAME ; void MsgErrorWatcher::ShowNote(enum TMsgErrorNoteIds)
+	?staticMetaObject@MsgErrorWatcher@@2UQMetaObject@@B @ 5 NONAME ; struct QMetaObject const MsgErrorWatcher::staticMetaObject
+	?metaObject@MsgErrorWatcher@@UBEPBUQMetaObject@@XZ @ 6 NONAME ; struct QMetaObject const * MsgErrorWatcher::metaObject(void) const
+	?tr@MsgErrorWatcher@@SA?AVQString@@PBD0@Z @ 7 NONAME ; class QString MsgErrorWatcher::tr(char const *, char const *)
+	??1MsgErrorWatcher@@UAE@XZ @ 8 NONAME ; MsgErrorWatcher::~MsgErrorWatcher(void)
+	?getStaticMetaObject@MsgErrorWatcher@@SAABUQMetaObject@@XZ @ 9 NONAME ; struct QMetaObject const & MsgErrorWatcher::getStaticMetaObject(void)
+	??_EMsgErrorWatcher@@UAE@I@Z @ 10 NONAME ; MsgErrorWatcher::~MsgErrorWatcher(unsigned int)
+	??0MsgErrorWatcher@@QAE@PAVQObject@@@Z @ 11 NONAME ; MsgErrorWatcher::MsgErrorWatcher(class QObject *)
+	?tr@MsgErrorWatcher@@SA?AVQString@@PBD0H@Z @ 12 NONAME ; class QString MsgErrorWatcher::tr(char const *, char const *, int)
+	?qt_metacast@MsgErrorWatcher@@UAEPAXPBD@Z @ 13 NONAME ; void * MsgErrorWatcher::qt_metacast(char const *)
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/eabi/msgerrorwatcheru.def	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,15 @@
+EXPORTS
+	_ZN15MsgErrorWatcher11qt_metacallEN11QMetaObject4CallEiPPv @ 1 NONAME
+	_ZN15MsgErrorWatcher11qt_metacastEPKc @ 2 NONAME
+	_ZN15MsgErrorWatcher16staticMetaObjectE @ 3 NONAME DATA 16
+	_ZN15MsgErrorWatcher19getStaticMetaObjectEv @ 4 NONAME
+	_ZN15MsgErrorWatcher8ShowNoteE16TMsgErrorNoteIds @ 5 NONAME
+	_ZN15MsgErrorWatcherC1EP7QObject @ 6 NONAME
+	_ZN15MsgErrorWatcherC2EP7QObject @ 7 NONAME
+	_ZN15MsgErrorWatcherD0Ev @ 8 NONAME
+	_ZN15MsgErrorWatcherD1Ev @ 9 NONAME
+	_ZN15MsgErrorWatcherD2Ev @ 10 NONAME
+	_ZNK15MsgErrorWatcher10metaObjectEv @ 11 NONAME
+	_ZTI15MsgErrorWatcher @ 12 NONAME
+	_ZTV15MsgErrorWatcher @ 13 NONAME
+

--- a/messagingapp/msgnotifications/flashmsgnotifier/flashmsgnotifier.pro	Thu Sep 02 20:23:03 2010 +0300
+++ b/messagingapp/msgnotifications/flashmsgnotifier/flashmsgnotifier.pro	Fri Sep 17 08:28:39 2010 +0300
@@ -37,7 +37,9 @@
 	    -lgsmu \
 	    -lxqutils \
 	    -lcsserverclientapi \
-	    -lxqsystemtoneservice
+	    -lxqsystemtoneservice \
+	    -lxqsettingsmanager \
+	    -lhwrmvibraclient
 
 SERVICE.FILE = service_conf.xml
 SERVICE.OPTIONS = embeddable

--- a/messagingapp/msgnotifications/flashmsgnotifier/inc/flashmsgnotifier.h	Thu Sep 02 20:23:03 2010 +0300
+++ b/messagingapp/msgnotifications/flashmsgnotifier/inc/flashmsgnotifier.h	Fri Sep 17 08:28:39 2010 +0300
@@ -25,6 +25,8 @@
 
 class FlashMsgNotifierPrivate;
 class XQSystemToneService;
+class XQSettingsManager;
+class CHWRMVibra;
 
 /**
  * @class FlashMsgNotifier
@@ -84,6 +86,17 @@
      * Address string
      */
     QString mAddress;
+      
+    /**
+     * Settings manager 
+     * Owned.
+     */
+    XQSettingsManager* mSettingsManager;
+    
+    /**
+     * Vibra alert on receiving a new message
+     */
+    CHWRMVibra *mVibra; // Owned.
 };
 
 #endif // MSGERRORNOTIFIER_H

--- a/messagingapp/msgnotifications/flashmsgnotifier/src/flashmsgnotifier.cpp	Thu Sep 02 20:23:03 2010 +0300
+++ b/messagingapp/msgnotifications/flashmsgnotifier/src/flashmsgnotifier.cpp	Fri Sep 17 08:28:39 2010 +0300
@@ -27,12 +27,17 @@
 #include <xqapplicationmanager.h>
 #include <xqaiwrequest.h>
 #include <xqsystemtoneservice.h>
+#include <XQSettingsManager>
+#include <ProfileEngineInternalCRKeys.h>
+#include <hwrmvibra.h>
 #include "flashmsgnotifier_p.h"
 
 #define LOC_NOTIFICATION_MSG_TITLE  hbTrId("txt_messaging_title_notification_message")
 #define LOC_BUTTON_SAVE       hbTrId("txt_common_menu_save")
 #define LOC_BUTTON_DELETE       hbTrId("txt_common_menu_delete")
 
+const XQCentralRepositorySettingsKey silenceModeKey(KCRUidProfileEngine.iUid, KProEngSilenceMode);
+
 //-------------------------------------------------------
 // FlashMsgNotifier::FlashMsgNotifier()
 // Constructor
@@ -44,6 +49,8 @@
     publishAll();
     mSts = new XQSystemToneService;
     d_ptr = q_check_ptr(new FlashMsgNotifierPrivate(this));
+    QT_TRYCATCH_LEAVING(mSettingsManager = new XQSettingsManager());
+    mVibra = CHWRMVibra::NewL();
 }
 
 //-------------------------------------------------------
@@ -54,6 +61,16 @@
 {
     delete d_ptr;
     delete mSts;
+    if(mSettingsManager)
+        {
+        delete mSettingsManager;
+        mSettingsManager = NULL;
+        }
+    if(mVibra)
+        {
+        delete mVibra;
+        mVibra = NULL;
+        }
 }
 
 //-------------------------------------------------------
@@ -120,7 +137,19 @@
     notificationDialog.setAction(actionQuit, HbDeviceMessageBox::RejectButtonRole);
 
     //Play audio alert when flash msg is shown
-    mSts->playTone(XQSystemToneService::SmsAlertTone);
+    QVariant silenceMode = mSettingsManager->readItemValue(silenceModeKey, XQSettingsManager::TypeInt);
+    int silent = silenceMode.toInt();
+    if(silent < 1)
+        {
+        //Play new message alert tone.
+        mSts->playTone(XQSystemToneService::SmsAlertTone);
+        }
+    // Execute the vibra effect.
+    if (mVibra) 
+        {
+        TInt err = KErrNone;
+        TRAP(err,mVibra->StartVibraL(1000));
+        }
 
     const QAction* result = notificationDialog.exec();
     // if accepted launch view else quit

--- a/messagingapp/msgnotifications/msgerrornotifier/inc/msgerrornotifiersvc.h	Thu Sep 02 20:23:03 2010 +0300
+++ b/messagingapp/msgnotifications/msgerrornotifier/inc/msgerrornotifiersvc.h	Fri Sep 17 08:28:39 2010 +0300
@@ -21,9 +21,6 @@
 #include <xqserviceprovider.h>
 #include <qvariant.h>
 
-//Forward Declaration
-class XQSystemToneService;
-
 class MsgErrorNotifierSvc: public XQServiceProvider
 {
 
@@ -49,12 +46,6 @@
      */
     void displayErrorNote(QVariantList displayParams);
 
-private:
-    
-    /**
-     * Object to handle audio alerts
-     */
-    XQSystemToneService* mSts;
 };
 
 #endif /* MSGERRORNOTIFIERSVC_H_ */

--- a/messagingapp/msgnotifications/msgerrornotifier/msgerrornotifier.pro	Thu Sep 02 20:23:03 2010 +0300
+++ b/messagingapp/msgnotifications/msgerrornotifier/msgerrornotifier.pro	Fri Sep 17 08:28:39 2010 +0300
@@ -25,8 +25,7 @@
            src/msgerrornotifiersvc.cpp
            
 LIBS += -lxqservice \
-	    -lxqserviceutil \
-	    -lxqsystemtoneservice
+	    -lxqserviceutil
 
 SERVICE.FILE = service_conf.xml
 SERVICE.OPTIONS = embeddable

--- a/messagingapp/msgnotifications/msgerrornotifier/src/msgerrornotifiersvc.cpp	Thu Sep 02 20:23:03 2010 +0300
+++ b/messagingapp/msgnotifications/msgerrornotifier/src/msgerrornotifiersvc.cpp	Fri Sep 17 08:28:39 2010 +0300
@@ -26,7 +26,6 @@
 #include <xqappmgr.h>
 #include <ccsdefs.h>
 #include <qaction.h>
-#include <xqsystemtoneservice.h>
 
 #define LOC_VIEW hbTrId("txt_messaging_button_view")
 #define LOC_CANCEL hbTrId("txt_common_button_cancel")
@@ -38,7 +37,6 @@
 MsgErrorNotifierSvc::MsgErrorNotifierSvc(QObject* parent) :
     XQServiceProvider(QLatin1String("messaging.com.nokia.symbian.MsgErrorNotifier"), parent)
 {
-    mSts = new XQSystemToneService();
     publishAll();
 
 }
@@ -47,11 +45,6 @@
 //---------------------------------------------------------
 MsgErrorNotifierSvc::~MsgErrorNotifierSvc()
 {
-    if(mSts)
-        {
-        delete mSts;
-        mSts = NULL;
-        }
 }
 
 //---------------------------------------------------------
@@ -93,10 +86,7 @@
     messageBox.setAction(actionQuit,HbDeviceMessageBox::RejectButtonRole);
 
     setCurrentRequestAsync();
-
-    //Play audio alert when error notification is shown
-    mSts->playTone(XQSystemToneService::MessageSendFailureTone);
-    
+  
     // launch Messagebox
     const QAction* result = messageBox.exec();
   

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/msgerrorwatcher/inc/msgcenrepobserver.h	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,104 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*     CMsgCenRepObserver declaration file
+*
+*/
+
+
+
+#ifndef CMSGCENREPOBSERVER_H
+#define CMSGCENREPOBSERVER_H
+
+//  INCLUDES
+#include    <e32base.h>
+
+// FORWARD DECLARATIONS
+class CMsgErrorWatcherPrivate;
+class CRepository;
+
+// CLASS DECLARATION
+/**
+* Class for observing CenRep if MMS Access Point in use changes
+*/
+class CMsgCenRepObserver : public CActive
+    {
+    public:  // Constructors and destructor
+
+        /**
+        * Two-phased constructor.
+        * @param aRConnection opened RConnection
+        */
+        static CMsgCenRepObserver* NewL(CMsgErrorWatcherPrivate& aWatcher);
+
+        /**
+        * Destructor.
+        */
+        virtual ~CMsgCenRepObserver();
+
+    public: // New functions
+
+        /**
+        * Subscribe to a notification from CenRep
+        */
+        void SubscribeNotification();
+
+    protected:  // Functions from base classes
+
+        /**
+        * Active object cancellation
+        */
+        void DoCancel();
+        
+        /**
+        * If RunL leaves
+        */
+        TInt RunError( TInt aError );
+
+    private:
+
+        /**
+        * C++ default constructor.
+        */
+        CMsgCenRepObserver( CMsgErrorWatcherPrivate& aWatcher );
+
+        /**
+        * By default Symbian OS constructor is private.
+        * @param aRConnection opened RConnection
+        */
+        void ConstructL();
+
+        /**
+        * Completion
+        */
+        void RunL();
+
+        // By default, prohibit copy constructor
+        CMsgCenRepObserver( const CMsgCenRepObserver& );
+
+        // Prohibit assignment operator
+        CMsgCenRepObserver& operator= ( const CMsgCenRepObserver& );
+
+    private:    // Data
+
+        CMsgErrorWatcherPrivate&          iWatcher;
+        CRepository*               iRepository;
+        TUid                       iRepositoryUid;
+        TInt32                     iKey;
+
+    };
+
+#endif      // CMSGCENREPOBSERVER_H
+
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/msgerrorwatcher/inc/msgerrorcommdbobserver.h	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,104 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*     CMsgErrorCommDbObserver declaration file
+*
+*/
+
+
+
+#ifndef MSGERRORCOMMDBOBSERVER_H
+#define MSGERRORCOMMDBOBSERVER_H
+
+#include    <e32base.h>
+
+// FORWARD DECLARATIONS
+class CMsgErrorWatcherPrivate;
+class CCommsDatabase;
+
+// CLASS DECLARATION
+
+/**
+* CMsgErrorCommDbObserver
+*/
+class CMsgErrorCommDbObserver : public CActive
+    {
+    public:  // Constructors and destructor
+        
+        /**
+        * Two-phased constructor.
+        *
+        * @param aWatcher A pointer to CMsgErrorWatcherPrivate
+        */
+        static CMsgErrorCommDbObserver* NewL( CMsgErrorWatcherPrivate& aWatcher );
+        
+        /**
+        * Destructor.
+        */
+        virtual ~CMsgErrorCommDbObserver();
+
+        /**
+        * For external reactivating the active object.
+        */
+        void Restart();
+
+    private:
+
+        /**
+        * By default Symbian OS constructor is private.
+        */
+        void ConstructL();
+
+        /**
+        * Private C++ constructor.
+        *
+        * @param aWatcher A pointer to CMsgErrorWatcherPrivate
+        */
+        CMsgErrorCommDbObserver( CMsgErrorWatcherPrivate&  aWatcher );
+
+    private: // from CActive
+
+        /**
+        * For starting the active object.
+        */
+        void Start();
+
+        /**
+        * From CActive
+        */
+        void DoCancel();
+
+        /**
+        * From CActive
+        */
+        void RunL();
+
+    private:    // Data
+
+        /*
+         * Pointer to commdb
+         * Own
+         */
+        CCommsDatabase*     iDb;
+        
+        /**
+         * Reference to watcher to give call back
+         * Doesn't own
+         */
+        CMsgErrorWatcherPrivate&   iWatcher;
+    };
+
+#endif      // MSGERRORCOMMDBOBSERVER_H
+            
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/msgerrorwatcher/inc/msgerrordiskspaceobserver.h	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,99 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*     CMsgErrorDiskSpaceObserver declaration file
+*
+*/
+
+
+
+#ifndef MSGERRORDISKSPACEOBSERVER_H
+#define MSGERRORDISKSPACEOBSERVER_H
+
+//  INCLUDES
+#include <e32base.h>
+#include <f32file.h>
+
+// FORWARD DECLARATIONS
+class CMsgErrorWatcherPrivate;
+class CMsvSession;
+
+// CLASS DECLARATION
+
+/**
+* CMsgErrorDiskSpaceObserver
+*/
+class CMsgErrorDiskSpaceObserver : public CActive
+    {
+    public:  // Constructors and destructor
+        
+        /**
+        * Two-phased constructor.
+        *
+        * @param aWatcher A pointer to CMsgErrorWatcherPrivate
+        * @param aSession A reference to message server session
+        * @param aFs A reference to file session
+        */
+        static CMsgErrorDiskSpaceObserver* NewL( CMsgErrorWatcherPrivate& aWatcher, CMsvSession& aSession, RFs& aFs );
+        
+        /**
+        * Destructor.
+        */
+        virtual ~CMsgErrorDiskSpaceObserver();
+
+    public: // New functions
+
+        /**
+        * Updates the trigger limit to aLimit, if it
+        * is smaller than current limit. (Re)activates
+        * the active object.
+        *
+        * @param aLimit The trigger limit in bytes
+        */
+        void SetLimitAndActivateL( TInt32 aLimit );
+
+    private:
+
+        /**
+        * Private C++ constructor.
+        *
+        * @param aWatcher A pointer to CMsgErrorWatcherPrivate
+        * @param aSession A reference to message server session
+        * @param aFs A reference to file session
+        */
+        CMsgErrorDiskSpaceObserver( CMsgErrorWatcherPrivate& aWatcher, CMsvSession& aSession, RFs& aFs );
+
+    private:
+
+        /**
+        * From CActive
+        */
+        void RunL();
+
+        /**
+        * From CActive
+        */
+        void DoCancel();
+
+    private:    // Data
+
+        CMsgErrorWatcherPrivate&   iWatcher;
+        CMsvSession&        iSession;
+        RFs&                iFs;
+        TInt32              iLimit;
+    };
+
+#endif      // MSGERRORDISKSPACEOBSERVER_H
+            
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/msgerrorwatcher/inc/msgerrorextsmsdiskspaceobserver.h	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,98 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*     CMsgErrorSmsDiskSpaceObserver declaration file
+*
+*
+*/
+
+
+#ifndef __MSGERROREXTSMSDISKSPACEOBSERVER_H
+#define __MSGERROREXTSMSDISKSPACEOBSERVER_H
+
+//  INCLUDES
+#include <e32base.h>
+#include <e32property.h>
+
+// FORWARD DECLARATIONS
+class CMsgErrorWatcherPrivate;
+
+// CLASS DECLARATION
+
+/**
+* CMsgErrorSmsDiskSpaceObserver
+*
+* @lib msgerrorwatcher.dll
+* @since 5.0
+*/
+class CMsgErrorExtSmsDiskSpaceObserver : public CActive
+    {
+    public:  // Constructors and destructor
+        
+        /**
+        * Two-phased constructor.
+        *
+        * @param aWatcher A pointer to CMsgErrorWatcherPrivate
+        */
+        static CMsgErrorExtSmsDiskSpaceObserver* NewL( CMsgErrorWatcherPrivate& aWatcher);
+        
+        /**
+        * Destructor.
+        */
+        virtual ~CMsgErrorExtSmsDiskSpaceObserver();
+
+    private:
+
+        /**
+        * By default Symbian OS constructor is private.
+        */
+        void ConstructL();
+
+        /**
+        * Private C++ constructor.
+        *
+        * @param aWatcher A pointer to CMsgErrorWatcherPrivate
+        */
+        CMsgErrorExtSmsDiskSpaceObserver( CMsgErrorWatcherPrivate& aWatcher);
+
+    private:
+
+        /**
+        * From CActive
+        */
+        void DoCancel();
+
+        /**
+        * From CActive
+        */
+        void RunL();
+
+    private:    // Data
+
+        /*
+         * Reference to watcher
+         * Doesn't own
+         */
+        CMsgErrorWatcherPrivate&   iWatcher;
+        
+        /*
+         * Diskspace property
+         */
+        RProperty iSmsDiskSpaceProperty; 
+
+    };
+
+#endif      // __MSGERROREXTSMSDISKSPACEOBSERVER_H
+            
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/msgerrorwatcher/inc/msgerrorroamingobserver.h	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,106 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*     CMsgErrorRoamingObserver declaration file
+*
+*/
+
+
+
+#ifndef MSGERRORROAMINGOBSERVER_H
+#define MSGERRORROAMINGOBSERVER_H
+
+//  INCLUDES
+#include <e32base.h>
+#include <etel.h>                   //RTelServer
+#include <etelmm.h>
+
+
+
+// FORWARD DECLARATIONS
+class CMsgErrorWatcherPrivate;
+
+// CLASS DECLARATION
+
+/**
+* CMsgErrorRoamingObserver
+*/
+class CMsgErrorRoamingObserver : public CActive
+    {
+    public:  // Constructors and destructor
+        
+        /**
+        * Two-phased constructor.
+        *
+        * @param aWatcher A pointer to CMsgErrorWatcherPrivate
+        */
+        static CMsgErrorRoamingObserver* NewL( CMsgErrorWatcherPrivate& aWatcher );
+        
+        /**
+        * Destructor.
+        */
+        virtual ~CMsgErrorRoamingObserver();
+
+    private:
+
+        /**
+        * Checks whether roaming status has changed
+        * from home network to roaming or vice versa.
+        * If so, calls CMsgErrorWatcherPrivate::HandleRoamingEventL
+        */
+        void UpdateRoamingStatusL();
+
+        /**
+        * By default Symbian OS constructor is private.
+        */
+        void ConstructL();
+
+        /**
+        * Private C++ constructor.
+        *
+        * @param aWatcher A pointer to CMsgErrorWatcherPrivate
+        */
+        CMsgErrorRoamingObserver( CMsgErrorWatcherPrivate& aWatcher );
+
+    private:
+
+        /**
+        * For starting the active object.
+        */
+        void Start();
+
+        /**
+        * From CActive
+        */
+        void DoCancel();
+
+        /**
+        * From CActive
+        */
+        void RunL();
+
+    private:    // Data
+
+        CMsgErrorWatcherPrivate&   iWatcher;
+        TBool               iRoaming;
+        RMobilePhone        iMobilePhone;
+        RTelServer          iETelServer;
+        RMobilePhone::TMobilePhoneRegistrationStatus iRegStatus;
+        TInt                iRequestId;
+
+    };
+
+#endif      // MSGERRORROAMINGOBSERVER_H
+            
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/msgerrorwatcher/inc/msgerrorsmsdiskspaceobserver.h	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,87 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*     CMsgErrorSmsDiskSpaceObserver declaration file
+*
+*/
+
+
+
+#ifndef __MSGERRORSMSDISKSPACEOBSERVER_H
+#define __MSGERRORSMSDISKSPACEOBSERVER_H
+
+//  INCLUDES
+#include <e32base.h>
+#include <e32property.h>
+
+// FORWARD DECLARATIONS
+class CMsgErrorWatcherPrivate;
+
+// CLASS DECLARATION
+
+/**
+* CMsgErrorSmsDiskSpaceObserver
+*/
+class CMsgErrorSmsDiskSpaceObserver : public CActive
+    {
+    public:  // Constructors and destructor
+        
+        /**
+        * Two-phased constructor.
+        *
+        * @param aWatcher A pointer to CMsgErrorWatcherPrivate
+        */
+        static CMsgErrorSmsDiskSpaceObserver* NewL( CMsgErrorWatcherPrivate& aWatcher);
+        
+        /**
+        * Destructor.
+        */
+        virtual ~CMsgErrorSmsDiskSpaceObserver();
+
+    private:
+
+        /**
+        * By default Symbian OS constructor is private.
+        */
+        void ConstructL();
+
+        /**
+        * Private C++ constructor.
+        *
+        * @param aWatcher A pointer to CMsgErrorWatcherPrivate
+        */
+        CMsgErrorSmsDiskSpaceObserver( CMsgErrorWatcherPrivate& aWatcher);
+
+    private:
+
+        /**
+        * From CActive
+        */
+        void DoCancel();
+
+        /**
+        * From CActive
+        */
+        void RunL();
+
+    private:    // Data
+
+        CMsgErrorWatcherPrivate&   iWatcher;
+        RProperty iSmsDiskSpaceProperty;
+
+    };
+
+#endif      // __MSGERRORSMSDISKSPACEOBSERVER_H
+            
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/msgerrorwatcher/inc/msgerrorstartupobserver.h	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,87 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*     CMsgErrorStartupObserver declaration file
+*
+*/
+
+
+
+#ifndef __MSGERRORSTARTUPOBSERVER_H
+#define __MSGERRORSTARTUPOBSERVER_H
+
+//  INCLUDES
+#include <e32base.h>
+#include <e32property.h>
+
+// FORWARD DECLARATIONS
+class CMsgErrorWatcherPrivate;
+
+// CLASS DECLARATION
+
+/**
+* CMsgErrorStartupObserver
+*/
+class CMsgErrorStartupObserver : public CActive
+    {
+    public:  // Constructors and destructor
+        
+        /**
+        * Two-phased constructor.
+        *
+        * @param aWatcher A pointer to CMsgErrorWatcherPrivate
+        */
+        static CMsgErrorStartupObserver* NewL( CMsgErrorWatcherPrivate& aWatcher );
+        
+        /**
+        * Destructor.
+        */
+        virtual ~CMsgErrorStartupObserver();
+
+    private:
+
+        /**
+        * By default Symbian OS constructor is private.
+        */
+        void ConstructL();
+
+        /**
+        * Private C++ constructor.
+        *
+        * @param aWatcher A pointer to CMsgErrorWatcherPrivate
+        */
+        CMsgErrorStartupObserver( CMsgErrorWatcherPrivate& aWatcher );
+
+    private:
+
+        /**
+        * From CActive
+        */
+        void DoCancel();
+
+        /**
+        * From CActive
+        */
+        void RunL();
+
+    private:    // Data
+
+        CMsgErrorWatcherPrivate&   iWatcher;
+        RProperty iStartupProperty;
+
+    };
+
+#endif      // __MSGERRORSTARTUPOBSERVER_H
+            
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/msgerrorwatcher/inc/msgerrorwatcher.h	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:  
+ *     CMsgErrorWatcher declaration file
+ *
+ */
+#ifndef MSGERRORWATCHER_H
+#define MSGERRORWATCHER_H
+
+#ifdef  MSGERRORWATCHER_DLL
+#define MSGERRORWATCHER_EXPORT Q_DECL_EXPORT
+#else
+#define MSGERRORWATCHER_EXPORT Q_DECL_IMPORT
+#endif
+
+// INCLUDES
+#include "msgerrorwatcher.hrh"
+// SYSTEM INCLUDES
+#include <QObject>
+// CLASS DECLARATION
+class CMsgErrorWatcherPrivate;
+
+/**
+ * Handles showing notes handled by the errowatcher
+ */
+class MSGERRORWATCHER_EXPORT MsgErrorWatcher: public QObject
+{
+Q_OBJECT
+
+public:
+    /**
+     * Constructor
+     */
+    MsgErrorWatcher(QObject* parent = 0);
+
+    /**
+     * Destructor
+     */
+    ~MsgErrorWatcher();
+
+public:
+    
+    /**
+     *  Displays notifiction dialog
+     *  @param errornoteid error id
+     */
+    void ShowNote(TMsgErrorNoteIds errornoteid);
+    
+private:
+
+    /**
+     * Object of private implementation.
+     * Owned.
+     */
+    CMsgErrorWatcherPrivate* d_ptr;
+
+};
+
+#endif // MSGERRORWATCHER_H
+//EOF

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/msgerrorwatcher/inc/msgerrorwatcher.hrh	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,42 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*     This file contains declarations for resources of MsgErrorWatcher
+*     The file can be included in C++ or resource file.
+*
+*/
+
+
+
+#ifndef MSGERRORWATCHER_HRH
+#define MSGERRORWATCHER_HRH
+
+/**
+ * ErrorNote Ids
+ */
+enum TMsgErrorNoteIds
+    {
+    ENoAccesPointsNote=1,
+    EInvalidAccessPointNote,
+    EConnectionInUseNote,
+    EDiskLowNote1,
+    EDiskLowNoteN,
+    EMemoryLowNote,
+    ERoamingNote,
+    ESendFailureNote,
+    ESendingMessageNote,
+    ESMSIncomingLowDiskSpace
+    };
+
+#endif      //  MSGERRORWATCHER_HRH

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/msgerrorwatcher/inc/msgerrorwatcher_p.h	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,441 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*     CMsgErrorWatcher declaration file
+*
+*/
+
+
+
+#ifndef MSGERRORWATCHERPRIVATE_H
+#define MSGERRORWATCHERPRIVATE_H
+
+// INCLUDES
+#include <f32file.h>
+#include <msvstd.h>
+#include <msvapi.h>
+#include <systemwarninglevels.hrh>    // Critical level
+#include <mmsconst.h>          // KMmsDiskSafetyMargin
+
+#include "MsgErrorWatcher.hrh"
+
+const TUint KCriticalDiskLevel = KDRIVECCRITICALTHRESHOLD;
+const TUint KCriticalLevel = KCriticalDiskLevel + KMmsDiskSafetyMargin;
+const TUint32 KDefaultTriggerLevel = 300 * 1024; // 100 kilobytes
+const TUint KTriggerMargin = 20 * 1024; // 20 kilobytes
+
+// FUNCTION PROTOTYPES
+GLREF_C void Panic( TInt aPanic ); 
+
+// FORWARD DECLARATIONS
+class CWatcherLog;
+class CMmsClientMtm;
+class CClientMtmRegistry;
+class MsgErrorWatcher;
+class CMsgErrorCommDbObserver;
+class CMsgErrorDiskSpaceObserver;
+class CMsgErrorSmsDiskSpaceObserver;
+class CMsgErrorExtSmsDiskSpaceObserver;
+class CMsgErrorRoamingObserver;
+class CMsgErrorStartupObserver;
+class CMsgErrorDisconnectDlg;
+class CMsgCenRepObserver;
+
+
+// CLASS DECLARATION
+
+/**
+* CMsgErrorWatcherPrivate
+*/
+class CMsgErrorWatcherPrivate :public CActive, public MMsvSessionObserver
+    {
+    public:  // Constructors and destructor        
+      /**
+        * Default constructor.
+        */
+    CMsgErrorWatcherPrivate(MsgErrorWatcher* msgErrorWatcher);
+
+       /**
+        * Destructor
+        */
+       virtual ~CMsgErrorWatcherPrivate();
+
+    public: // New functions
+
+        /**
+        * Callback function for roaming observer.
+        *
+        * @param aRoaming ETrue if roaming, EFalse otherwise
+        */
+        void HandleRoamingEventL( TBool aRoaming );
+
+        /**
+        * Callback function for CommDB observer.
+        */
+        void HandleCommDbEventL();
+
+        /**
+        * Callback function for connection observer.
+        */
+       // void HandleConnectionEvent();
+
+        /**
+        * Callback function for disk space observer.
+        */
+        void HandleDiskSpaceEventL();
+        void HandleDiskSpaceEvent2L();
+        
+        /**
+        * Callback function for startup state observer (currently
+        * sent items observer).
+        */
+       void HandleStartupReadyL();
+        
+        /**
+        * HandleCenRepNotificationL
+        * Handles events from central repository observer
+        */
+        void HandleCenRepNotificationL();
+                
+        
+    public: // Functions from base classes
+
+        /**
+        * From MMsvSessionObserver
+        */
+        void HandleSessionEventL(
+            TMsvSessionEvent aEvent,
+            TAny* aArg1,
+            TAny* aArg2,
+            TAny* aArg3 );
+
+    protected: // Functions from base classes
+
+        /**
+        * From CActive
+        */
+        void RunL();
+
+        /**
+        * From CActive
+        */
+        void DoCancel();
+
+    private:
+
+        
+        /**
+         * Initializes the MsgStoreHandler class.     
+         */
+        void InitL();
+
+        /**
+        * Start watcher.
+        */
+        void StartWatcherL();
+
+        /**
+        * Stop watcher.
+        */
+        void StopWatcher();
+
+        /**
+        * Start restart timer. Timer is used when trying to reconnect
+        * to message server after watcher has been stopped due
+        * to certain message server events.
+        */
+        void StartRestartTimer();
+
+        /**
+        * Kills all observers and resets counters.
+        */
+        void ResetWatcher();
+
+        /**
+        * Checks whether MMS Service is already found. If not
+        * gets a pointer to MMS service from MsgStore and if
+        * found updates the context of MmsClientMtm.
+        *
+        * @return ETrue if MMS service was found, EFalse otherwise
+        */
+        TBool GetMmsServiceL();
+
+        /**
+        * Initiates MMS fetch by sending a request to MMS engine.
+        */
+        void StartMmsFetchL();
+
+        /**
+        * Initiates MMS send by sending a request to MMS engine.
+        */
+        void StartMmsSendL();
+
+        /**
+        * Checks whether MMS receiving mode is "Enabled in home network"
+        * and "On". If so, activates roaming observer.
+        */
+        void CheckMmsReceivingModeL();
+
+        /**
+        * A wrapper for CMmsClient::ValidateService().
+        *
+        * @return ETrue if service is valid, EFalse otherwise.
+        */
+        TBool ValidateMmsServiceL();
+
+        /**
+        * Called when MMS reception fails due to insufficient
+        * disk space.
+        *
+        * @param aEntry The failed entry
+        */
+        void HandleDiskSpaceErrorL( TMsvEntry& aEntry );
+
+        /**
+        * Called when MMS reception fails due to insufficient
+        * memory.
+        *
+        * @param aEntry The failed entry
+        */
+        void HandleMemoryErrorL( TMsvEntry& aEntry );
+
+        /**
+        * Called when MMS reception fails because there is
+        * another data connection open.
+        *
+        * @param aEntry The failed entry
+        * @param aReceive, ETrue for incoming messages, EFalse for outgoing
+        */
+        //void HandleConnectionErrorL( TMsvEntry& aEntry, TBool aReceive );
+
+        /**
+        * Called when MMS reception fails because there is no
+        * access point defined.
+        *
+        * @param aEntry The failed entry
+        */
+        void HandleNoAPErrorL( TMsvEntry& aEntry );
+
+        /**
+        * Called when MMS reception fails because the current
+        * access point is invalid.
+        *
+        * @param aEntry The failed entry
+        */
+        void HandleInvalidAPErrorL( TMsvEntry& aEntry, TBool aStartObserver );
+
+        /**
+        * Subfunction of HandleSessionEventL
+        * Handles root events from MsgServer observer
+        *
+        * @param aEvent     Message server event
+        * @param aEntries   Affected entries
+        */
+        void HandleRootEventL(
+            TMsvSessionEvent aEvent,
+            CMsvEntrySelection* aEntries );
+
+        /**
+        * Subfunction of HandleSessionEventL
+        * Handles local service events from MsgServer observer
+        *
+        * @param aEvent     Message server event
+        * @param aEntries   Affected entries
+        */
+        void HandleLocalServiceEventL(
+            TMsvSessionEvent aEvent,
+            CMsvEntrySelection* aEntries );
+
+        /**
+        * Subfunction of HandleSessionEventL
+        * Handles inbox events from MsgServer observer
+        *
+        * @param aEvent     Message server event
+        * @param aEntries   Affected entries
+        */
+        void HandleInboxEventL(
+            TMsvSessionEvent aEvent,
+            CMsvEntrySelection* aEntries );
+
+        /**
+        * Subfunction of HandleSessionEventL
+        * Handles outbox events from MsgServer observer
+        *
+        * @param aEvent     Message server event
+        * @param aEntries   Affected entries
+        */
+        void HandleOutboxEventL(
+            TMsvSessionEvent aEvent,
+            CMsvEntrySelection* aEntries );
+
+        /**
+        * Subfunction of HandleSessionEventL
+        * Handles MMS service events from MsgServer observer
+        *
+        * @param aEvent     Message server event
+        * @param aEntries   Affected entries
+        */
+        void HandleMmsServiceEventL(
+            TMsvSessionEvent aEvent,
+            CMsvEntrySelection* aEntries );
+
+
+        /**
+        * Resets TMsvEntry::iError of an entry saved in iCurrentEntry
+        */
+        void ResetErrorFieldL( );
+        
+        /**
+        * Resets TMsvEntry::iError of an entry given as parameter
+        */
+        void ResetErrorFieldL( TMsvEntry& aEntry );
+         
+    private:    // Data
+
+        enum TMsgErrorWatcherFlags
+            {
+            EStartupReady               = 0x0001,
+            EWatcherRunning             = 0x0002,
+            ENoAPErrorPending           = 0x0004,
+            EShowRoamingNote            = 0x0008,
+            ERoamingNoteShown           = 0x0010,
+            EReceivingDisconnectDelay   = 0x0020
+            };
+
+        enum TMsgRequestTypes
+            {
+            EMsgRequestNone = 0,
+            EMsgRequestStartingUp,
+            EMsgRequestFetching,
+            EMsgRequestFetchingAll,
+            EMsgRequestSending,
+            EMsgRequestWaitingErrorNote,
+            EMsgRequestWaitingDisconnection
+            };
+
+        /**
+         * Pointer to MsgErrorWatcher
+         * Doesn't own
+         */
+        MsgErrorWatcher* q_ptr;
+
+        /**
+         * MMSservice id
+         */
+        TMsvId iMmsServiceId;
+        
+        /**
+         * Notification folder id
+         */
+        TMsvId iNotificationFolderId;
+        
+        /**
+         * Msv session
+         * Own
+         */
+        CMsvSession* iSession;
+        
+        /**
+         * Msv operation
+         * Own
+         */
+        CMsvOperation* iOperation;
+        
+        /**
+         * Mtmregitsry client
+         * Own
+         */
+        CClientMtmRegistry* iClientMtmRegistry;
+        
+        /**
+         * Mmsclient
+         * Own
+         */
+        CMmsClientMtm* iMmsClient;
+        
+        /**
+         * Pointer to mms receive error messages
+         * Own
+         */
+        CMsvEntrySelection* iMmsReceiveErrorMessages;
+        
+        /**
+         * Pointer to mms receive error messages
+         * Own
+         */
+        CMsvEntrySelection* iMmsSendErrorMessages;
+
+        /**
+         * Current entry id
+         */
+        TMsvId iCurrentEntryId;
+
+        /**
+         * Pointers to error observers
+         * CommDb observer
+         * Own
+         */
+        CMsgErrorCommDbObserver* iCommDbObserver;
+        
+        /**
+         * Pointer to diskspace observer
+         * Own
+         */
+        CMsgErrorDiskSpaceObserver* iDiskSpaceObserver;
+        /**
+         * Pointer to sms diskspace observer
+         * Own
+         */
+        CMsgErrorSmsDiskSpaceObserver* iSmsDiskSpaceObserver;
+        /**
+         * Pointer to extension sms diskspace observer
+         * Own
+         */
+        CMsgErrorExtSmsDiskSpaceObserver* iSmsExtDiskSpaceObserver;
+        /**
+         * Pointer to roaming observer
+         * Own
+         */
+        CMsgErrorRoamingObserver* iRoamingObserver;
+        /**
+         * Pointer to startup observer
+         * Own
+         */
+        CMsgErrorStartupObserver* iStartupObserver;
+        /**
+         * Pointer to cenerep observer
+         * Own
+         */
+        CMsgCenRepObserver* iCenRepObserver;
+       
+        /**
+         * File session
+         */
+        RFs iFs;
+        
+        /**
+         * Timer
+         */
+        RTimer iTimer;
+
+        TMsgRequestTypes iRequestType;
+        TUint iWatcherFlags;
+        TUint32 iMaxReceiveSize;
+        TUint iDiskSpaceErrors;
+        TUint iTimerRetries;
+    };
+
+#endif      // MSGERRORWATCHERPRIVATE_H
+            
+// End of File

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/msgerrorwatcher/msgerrorwatcher.pro	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,110 @@
+#
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+TEMPLATE = lib
+TARGET = msgerrorwatcher
+
+CONFIG += hb
+
+DEFINES += MSGERRORWATCHER_DLL
+
+DEPENDPATH +=  ./inc ./src
+INCLUDEPATH +=  ./inc 
+INCLUDEPATH += ../../../inc 
+INCLUDEPATH += ../../msgsettings/settingsview/inc 
+INCLUDEPATH += ../../msgui/inc
+INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
+
+# Input
+HEADERS += ./inc/msgerrorwatcher.h \
+           ./inc/msgerrorwatcher_p.h \
+			./inc/msgerrorroamingobserver.h \
+			./inc/msgerrorstartupobserver.h  \
+			./inc/msgerrorsmsdiskspaceobserver.h \
+			./inc/msgerrorextsmsdiskspaceobserver.h \
+			./inc/msgcenrepobserver.h \
+			./inc/msgerrorcommdbobserver.h\
+			./inc/msgerrordiskspaceobserver.h 
+
+SOURCES +=  ./src/msgerrorwatcher.cpp \
+            ./src/msgerrorwatcher_p.cpp \
+           ./src/msgerrorroamingobserver.cpp \
+			./src/msgerrorstartupobserver.cpp \
+			./src/msgerrorsmsdiskspaceobserver.cpp \
+			./src/msgerrorextsmsdiskspaceobserver.cpp \
+			./src/msgcenrepobserver.cpp \
+			./src/msgerrorcommdbobserver.cpp \
+			./src/msgerrordiskspaceobserver.cpp 
+
+defBlock = \      
+	  "$${LITERAL_HASH}if defined(EABI)" \
+	  "DEFFILE  ../eabi/msgerrorwatcher.def" \
+             "$${LITERAL_HASH}else" \
+             "DEFFILE  ../bwins/msgerrorwatcher.def" \
+             "$${LITERAL_HASH}endif"
+	
+MMP_RULES += defBlock			
+LIBS +=   -lecom \
+          -leuser \
+          -lcommonengine \
+          -lefsrv\
+          -letel \
+          -letelmm \   
+          -lmsgs \
+          -lcentralrepository \
+          -lcenrepnotifhandler \   
+          -llogcli \
+          -llogwrap \
+          -lcommdb \
+          -lconnmon \
+          -lHbCore \
+          -lHbWidgets \
+          -lHbUtils \
+          -lQtCore \
+          -lxqutils \
+          -lflogger \
+          -lcone \
+          -leikcdlg \
+          -leikctl \
+          -leikcoctl \
+          -leikcore \
+          -lgdi \
+          -lbafl \
+          -lplatformenv \
+          -lccon \
+          -lestor \
+          -lCdlEngine \
+          -laknskins \
+	        -laknicon \
+	        -legul \
+	        -lxqservice 
+           
+
+TARGET.UID3 = 0x2001FE78 #MSGERRORWATCHER_DLL_UID 
+TARGET.CAPABILITY =  All -TCB
+TARGET.EPOCALLOWDLLDATA = 1  
+
+# Platforms
+SYMBIAN_PLATFORMS = WINSCW \
+    ARMV5
+
+# Build.inf rules
+BLD_INF_RULES.prj_exports += \
+     "$${LITERAL_HASH}include <platform_paths.hrh>" \
+     "rom/msgerrorwatcher.iby  CORE_APP_LAYER_IBY_EXPORT_PATH(msgerrorwatcher.iby)"
+
+# End of file	--Don't remove this.
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/msgerrorwatcher/rom/msgerrorwatcher.iby	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,25 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  MsgErrorWatcher.iby*
+*/
+
+
+#ifndef __MSGERRORWATCHER_IBY__
+#define __MSGERRORWATCHER_IBY__
+
+
+REM DLL
+file=ABI_DIR\UREL\msgerrorwatcher.dll                   SHARED_LIB_DIR\msgerrorwatcher.dll
+
+#endif
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/msgerrorwatcher/src/msgcenrepobserver.cpp	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,147 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*          CMsgCenRepObserver implementation file
+*
+*/
+
+
+
+// INCLUDE FILES
+//#include    <es_sock.h>
+#include <centralrepository.h>
+
+#include "msgerrorwatcher_p.h"
+#include "msgcenrepobserver.h"
+ 
+#include "MmsEngineInternalCRKeys.h"
+#include "debugtraces.h"
+
+// ================= MEMBER FUNCTIONS =======================
+
+// ---------------------------------------------------------
+// C++ constructor
+// ---------------------------------------------------------
+//
+CMsgCenRepObserver::CMsgCenRepObserver(CMsgErrorWatcherPrivate& aWatcher)
+    :CActive ( EPriorityStandard),
+    iWatcher(aWatcher),
+    iRepositoryUid( KCRUidMmsEngine ),
+    iKey( KMmsAccesspointArrayBase/*KMmsEngineAccessPointCount*/ )
+    {
+    QDEBUG_WRITE("CMsgCenRepObserver:CMsgCenRepObserver : Enter");
+    QDEBUG_WRITE("CMsgCenRepObserver:CMsgCenRepObserver : Exit");
+    }
+
+// ---------------------------------------------------------
+// ConstructL
+// ---------------------------------------------------------
+//
+void CMsgCenRepObserver::ConstructL()
+    {
+    QDEBUG_WRITE("CMsgCenRepObserver:ConstructL : Enter");
+    CActiveScheduler::Add( this );
+
+    // Connect CenRep
+    TRAPD( err, iRepository = CRepository::NewL( iRepositoryUid ) );
+    if( err != KErrNone )
+        {
+
+        QDEBUG_WRITE( "Error in connecting to CenRep!" );
+
+        return;
+        }
+    QDEBUG_WRITE("CMsgCenRepObserver:ConstructL : Exit");  
+    }
+
+// ---------------------------------------------------------
+// Symbian two-phased constructor
+// ---------------------------------------------------------
+//
+CMsgCenRepObserver* CMsgCenRepObserver::NewL( CMsgErrorWatcherPrivate& aWatcher )
+    {
+    QDEBUG_WRITE("CMsgCenRepObserver:NewL : Enter");
+    CMsgCenRepObserver* self = new ( ELeave ) CMsgCenRepObserver( aWatcher );
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+    QDEBUG_WRITE("CMsgCenRepObserver:NewL : Exit");
+    return self;
+    }
+    
+// ---------------------------------------------------------
+// Destructor
+// ---------------------------------------------------------
+//
+CMsgCenRepObserver::~CMsgCenRepObserver()
+    {
+    QDEBUG_WRITE("CMsgCenRepObserver:~CMsgCenRepObserver : Enter");
+    Cancel();
+    if( iRepository )
+        {
+        delete iRepository;
+        }
+    QDEBUG_WRITE("CMsgCenRepObserver:~CMsgCenRepObserver : Exit");
+    }
+
+// ---------------------------------------------------------
+// SubscribeNotification
+// ---------------------------------------------------------
+//
+void CMsgCenRepObserver::SubscribeNotification( )
+    {
+    QDEBUG_WRITE("CMsgCenRepObserver:SubscribeNotification : Enter");
+    // Subscribe
+    iRepository->NotifyRequest( iKey, iStatus );
+    SetActive();
+    QDEBUG_WRITE("CMsgCenRepObserver:SubscribeNotification : Exit");
+    }
+
+// ---------------------------------------------------------
+// RunL
+// ---------------------------------------------------------
+//
+void CMsgCenRepObserver::RunL()
+    {
+    QDEBUG_WRITE("CMsgCenRepObserver:RunL : Enter");
+    iWatcher.HandleCenRepNotificationL();    
+    QDEBUG_WRITE("CMsgCenRepObserver:RunL : Exit");
+    }
+
+// ---------------------------------------------------------
+// RunError
+// ---------------------------------------------------------
+//
+TInt CMsgCenRepObserver::RunError( TInt /*aError*/ )
+    {
+    QDEBUG_WRITE("CMsgCenRepObserver:RunError : Enter");
+    QDEBUG_WRITE("CMsgCenRepObserver:RunError : Exit");
+	return KErrNone;	
+    }
+
+// ---------------------------------------------------------
+// DoCancel
+// ---------------------------------------------------------
+//
+void CMsgCenRepObserver::DoCancel()
+    {
+    QDEBUG_WRITE("CMsgCenRepObserver:DoCancel : Enter");
+    iRepository->NotifyCancel( iKey );
+    QDEBUG_WRITE("CMsgCenRepObserver:DoCancel : Exit");
+    }
+
+// ================= OTHER EXPORTED FUNCTIONS ==============
+
+//  End of File  
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/msgerrorwatcher/src/msgerrorcommdbobserver.cpp	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,163 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*       CMsgErrorCommDbObserver implementation file
+*
+*/
+
+
+
+// INCLUDE FILES
+#include    <e32base.h>
+#include    <commdb.h>
+
+#include    "msgerrorwatcher_p.h"
+#include    "msgerrorcommdbobserver.h"
+#include    "debugtraces.h"
+
+// ================= MEMBER FUNCTIONS =======================
+
+// ---------------------------------------------------------
+// CMsgErrorCommDbObserver::CMsgErrorCommDbObserver
+//
+// C++ constructor can NOT contain any code, that
+// might leave.
+// ---------------------------------------------------------
+//
+CMsgErrorCommDbObserver::CMsgErrorCommDbObserver( CMsgErrorWatcherPrivate& aWatcher )
+    : CActive( CActive::EPriorityStandard ),
+    iWatcher( aWatcher )
+    {
+    QDEBUG_WRITE("CMsgErrorCommDbObserver:CMsgErrorCommDbObserver : Enter");
+    QDEBUG_WRITE("CMsgErrorCommDbObserver:CMsgErrorCommDbObserver : Exit");
+    }
+
+// ---------------------------------------------------------
+// CMsgErrorCommDbObserver::ConstructL
+//
+// Symbian OS default constructor can leave.
+// ---------------------------------------------------------
+//
+void CMsgErrorCommDbObserver::ConstructL()
+    {
+    QDEBUG_WRITE("CMsgErrorCommDbObserver:ConstructL : Enter");
+    iDb = CCommsDatabase::NewL( EDatabaseTypeIAP );
+    CActiveScheduler::Add( this );
+    Start();
+    QDEBUG_WRITE("CMsgErrorCommDbObserver:ConstructL : Exit");
+    }
+
+// ---------------------------------------------------------
+// CMsgErrorCommDbObserver::NewL
+//
+// Two-phased constructor.
+// ---------------------------------------------------------
+//
+CMsgErrorCommDbObserver* CMsgErrorCommDbObserver::NewL( CMsgErrorWatcherPrivate& aWatcher )
+    {
+    QDEBUG_WRITE("CMsgErrorCommDbObserver:NewL : Enter");
+    CMsgErrorCommDbObserver* self = new ( ELeave )
+        CMsgErrorCommDbObserver( aWatcher );
+    
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    CleanupStack::Pop( self );
+    QDEBUG_WRITE("CMsgErrorCommDbObserver:NewL : Exit");
+    return self;
+    }
+
+    
+// ---------------------------------------------------------
+// CMsgErrorCommDbObserver::~CMsgErrorCommDbObserver
+//
+// Destructor
+// ---------------------------------------------------------
+//
+CMsgErrorCommDbObserver::~CMsgErrorCommDbObserver()
+    {
+    QDEBUG_WRITE("CMsgErrorCommDbObserver:~CMsgErrorCommDbObserver : Enter");
+    Cancel();
+    delete iDb;
+    QDEBUG_WRITE("CMsgErrorCommDbObserver:~CMsgErrorCommDbObserver : Exit");
+    }
+
+// ---------------------------------------------------------
+// CMsgErrorCommDbObserver::Restart
+//
+// (Re)starts the active object (public)
+// ---------------------------------------------------------
+//
+void CMsgErrorCommDbObserver::Restart()
+    {
+    QDEBUG_WRITE("CMsgErrorCommDbObserver:Restart : Enter");
+    Start();
+    QDEBUG_WRITE("CMsgErrorCommDbObserver:Restart : Exit");
+    }
+
+// ---------------------------------------------------------
+// CMsgErrorCommDbObserver::Start
+//
+// Starts the active object
+// ---------------------------------------------------------
+//
+void CMsgErrorCommDbObserver::Start()
+    {
+    QDEBUG_WRITE("CMsgErrorCommDbObserver:Start : Enter");
+    if ( !IsActive() ) 
+        {
+        iDb->RequestNotification( iStatus );
+        SetActive();       
+        }
+    QDEBUG_WRITE("CMsgErrorCommDbObserver:Start : Exit");
+    }
+
+// ---------------------------------------------------------
+// CMsgErrorCommDbObserver::DoCancel
+//
+// From active object framework
+// ---------------------------------------------------------
+//
+void CMsgErrorCommDbObserver::DoCancel()
+    {
+    QDEBUG_WRITE("CMsgErrorCommDbObserver:DoCancel : Enter");
+    if ( iDb )
+        {
+        iDb->CancelRequestNotification();
+        }
+    QDEBUG_WRITE("CMsgErrorCommDbObserver:DoCancel : Exit");
+    }
+
+// ---------------------------------------------------------
+// CMsgErrorCommDbObserver::RunL
+//
+// From active object framework
+// ---------------------------------------------------------
+//
+void CMsgErrorCommDbObserver::RunL()
+    {
+    QDEBUG_WRITE("CMsgErrorCommDbObserver:RunL : Enter");
+    if ( iStatus == RDbNotifier::ECommit )
+        {
+        TRAP_IGNORE( iWatcher.HandleCommDbEventL() );
+        }
+    else
+        {
+        Start();
+        }
+    QDEBUG_WRITE("CMsgErrorCommDbObserver:RunL : Exit");
+    }
+
+// ================= OTHER EXPORTED FUNCTIONS ==============
+
+//  End of File  

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingapp/msgnotifications/msgerrorwatcher/src/msgerrordiskspaceobserver.cpp	Fri Sep 17 08:28:39 2010 +0300
@@ -0,0 +1,173 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*     CMsgErrorDiskSpaceObserver implementation file
+*
+*/
+
+
+
+// INCLUDE FILES
+#include    <e32base.h>
+
+#include    "msgerrorwatcher_p.h"
+#include    "msgerrordiskspaceobserver.h"
+#include    "debugtraces.h"
+
+// ================= MEMBER FUNCTIONS =======================
+
+// ---------------------------------------------------------
+// CMsgErrorDiskSpaceObserver::CMsgErrorDiskSpaceObserver
+//
+// C++ constructor can NOT contain any code, that
+// might leave.
+// ---------------------------------------------------------
+//
+CMsgErrorDiskSpaceObserver::CMsgErrorDiskSpaceObserver( 
+    CMsgErrorWatcherPrivate& aWatcher, 
+        CMsvSession& aSession, 
+        RFs& aFs )
+    : CActive( CActive::EPriorityStandard ),
+    iWatcher( aWatcher ),
+    iSession( aSession ),
+    iFs( aFs ),
+    iLimit( 0 )
+    {
+    QDEBUG_WRITE("CMsgErrorDiskSpaceObserver:CMsgErrorDiskSpaceObserver : Enter");
+    CActiveScheduler::Add( this );
+    QDEBUG_WRITE("CMsgErrorDiskSpaceObserver:CMsgErrorDiskSpaceObserver : Exit");
+    }
+
+// ---------------------------------------------------------
+// CMsgErrorDiskSpaceObserver::NewL
+//
+// Two-phased constructor.
+// ---------------------------------------------------------
+//
+CMsgErrorDiskSpaceObserver* CMsgErrorDiskSpaceObserver::NewL( 
+    CMsgErrorWatcherPrivate& aWatcher, 
+        CMsvSession& aSession, 
+        RFs& aFs )
+    {
+    QDEBUG_WRITE("CMsgErrorDiskSpaceObserver:NewL : Enter");
+    CMsgErrorDiskSpaceObserver* self = new ( ELeave )
+        CMsgErrorDiskSpaceObserver( aWatcher, aSession, aFs );
+    QDEBUG_WRITE("CMsgErrorDiskSpaceObserver:NewL : Exit");
+    return self;
+    }
+
+    
+// ---------------------------------------------------------
+// CMsgErrorDiskSpaceObserver::~CMsgErrorDiskSpaceObserver
+//
+// Destructor
+// ---------------------------------------------------------
+//
+CMsgErrorDiskSpaceObserver::~CMsgErrorDiskSpaceObserver()
+    {
+    QDEBUG_WRITE("CMsgErrorDiskSpaceObserver:~CMsgErrorDiskSpaceObserver : Enter");
+    Cancel();
+    QDEBUG_WRITE("CMsgErrorDiskSpaceObserver:~CMsgErrorDiskSpaceObserver : Exit");
+    }
+
+
+// ---------------------------------------------------------
+// CMsgErrorDiskSpaceObserver::DoCancel
+//
+// From active object framework
+// ---------------------------------------------------------
+//
+void CMsgErrorDiskSpaceObserver::DoCancel()
+    {
+    QDEBUG_WRITE("CMsgErrorDiskSpaceObserver:DoCancel : Enter");
+    iFs.NotifyDiskSpaceCancel( iStatus );
+    QDEBUG_WRITE("CMsgErrorDiskSpaceObserver:DoCancel : Exit");
+    }
+
+// ---------------------------------------------------------
+// CMsgErrorDiskSpaceObserver::RunL
+//
+// From active object framework
+// ---------------------------------------------------------
+//
+void CMsgErrorDiskSpaceObserver::RunL()
+    {
+    QDEBUG_WRITE("CMsgErrorDiskSpaceObserver:RunL : Enter");
+    QDEBUG_WRITE_FORMAT("DiskSpace: RunL, iStatus: ", iStatus.Int() );
+    TInt status = iStatus.Int();
+    if ( status < 0 )
+        {
+        //Reset the observer.
+        TRAP_IGNORE ( SetLimitAndActivateL( iLimit ) );
+        return;
+        }
+    
+    //We shouldn't have to check whether we're above the limit,
+    //because we were below when we activated and the event comes
+    //when we cross the limit
+
+    TRAP_IGNORE( iWatcher.HandleDiskSpaceEventL() );
+    QDEBUG_WRITE("CMsgErrorDiskSpaceObserver:RunL : Exit");
+    }
+
+// ---------------------------------------------------------
+// CMsgErrorDiskSpaceObserver::SetLimitAndActivateL
+//
+// Sets the disk space trigger level for active object
+// and activates it.
+// ---------------------------------------------------------
+//
+void CMsgErrorDiskSpaceObserver::SetLimitAndActivateL( TInt32 aLimit )
+    {
+    QDEBUG_WRITE("CMsgErrorDiskSpaceObserver:SetLimitAndActivateL : Enter");
+    QDEBUG_WRITE_FORMAT("DiskSpace: aLimit ", aLimit );
+    __ASSERT_DEBUG( aLimit >= 0, User::Leave( KErrArgument ) );
+    if ( aLimit < 0 )
+        {
+        return;
+        }
+    if ( iLimit == 0 || iLimit > aLimit )
+        {
+        Cancel();
+        iLimit = aLimit;
+
+        TInt currentDrive = TInt( iSession.CurrentDriveL() );
+        TVolumeInfo volInfo;
+        User::LeaveIfError( iFs.Volume( volInfo, currentDrive ) );
+        QDEBUG_WRITE_FORMAT("DiskSpace: free/hi : ", I64HIGH( volInfo.iFree ) );
+        QDEBUG_WRITE_FORMAT("DiskSpace: free/lo : ", I64LOW( volInfo.iFree ) );
+        //check if we're already above the limit
+        if ( I64HIGH( volInfo.iFree ) != 0 ||
+            I64LOW( volInfo.iFree ) > (TUint)iLimit ) //iLimit is always positive.
+            {
+            iWatcher.HandleDiskSpaceEventL();
+            return;
+            }
+        else
+            {
+            QDEBUG_WRITE( "notify activated" );
+            TInt64 treshold = iLimit;
+            iFs.NotifyDiskSpace( treshold, currentDrive, iStatus );
+            // No need to check IsActive since object is cancelled 
+            // anyway above
+            SetActive();
+            }
+        }
+    QDEBUG_WRITE("CMsgErrorDiskSpaceObserver:SetLimitAndActivateL : Exit");
+    }
+
+// ================= OTHER EXPORTED FUNCTIONS ==============
+
+//  End of File  
+