diff -r 92f864ef0288 -r ae54820ef82c iaupdate/IAD/backgroundchecker/src/iaupdatebgsoftnotification.cpp --- a/iaupdate/IAD/backgroundchecker/src/iaupdatebgsoftnotification.cpp Wed Jun 23 18:20:02 2010 +0300 +++ b/iaupdate/IAD/backgroundchecker/src/iaupdatebgsoftnotification.cpp Tue Jul 06 14:23:31 2010 +0300 @@ -103,28 +103,19 @@ delete iTitle; delete iText; - - delete iImagePath; delete iNotificationDialog; } // ----------------------------------------------------------------------------- -// CIAUpdateBGSoftNotification::ShowSoftNotificationL +// CIAUpdateBGSoftNotification::ShowNotificationL // Displays notification // ----------------------------------------------------------------------------- // void CIAUpdateBGSoftNotification::ShowNotificationL() { - /* - _LIT( KIcon, "C:\\qgn_note_swupdate_notification.svg" ); - _LIT( KFirstTimeText, "Check for updates ?" ); - _LIT( KNormalText, "Check for updates ?" ); - _LIT( KTextRow2, "Tap to view" ); - */ - FLOG("[bgchecker] ShowNotificationL"); // crete dialog, id does not exist already @@ -133,11 +124,6 @@ iNotificationDialog = CHbDeviceNotificationDialogSymbian::NewL( this ); } - //CleanupStack::PushL( notificationDialog ); // --> memberiin - delete closessa/activaatiossa/destructorissa - // + leave kiinni + tuhoaminen - // save number of updates - //SetNrOfUpdates ( aNrOfUpdates ); - // enable indicator showing SetIndicatorEnabled( ETrue ); @@ -170,7 +156,7 @@ CHbSymbianVariant::EInt ); CleanupStack::PushL( varValue ); // Temporary removal - // ind->Activate( KIndicatorTypeBgc, varValue ); + ind->Activate( KIndicatorTypeBgc, varValue ); CleanupStack::PopAndDestroy( varValue ); CleanupStack::PopAndDestroy( ind ); @@ -191,7 +177,7 @@ CHbIndicatorSymbian *ind = CHbIndicatorSymbian::NewL(); CleanupStack::PushL( ind ); // Temporary removal - // ind->Deactivate( KIndicatorTypeBgc ); + ind->Deactivate( KIndicatorTypeBgc ); CleanupStack::PopAndDestroy(ind); return; @@ -216,19 +202,6 @@ } // ----------------------------------------------------------------------------- -// CIAUpdateBGSoftNotification::SetImagePathL -// Sets an image path for a soft notification -// ----------------------------------------------------------------------------- -// -void CIAUpdateBGSoftNotification::SetImagePathL( const TDesC& aImage ) - { - HBufC* txt = aImage.AllocL(); - delete iImagePath; - iImagePath = txt; - return; - } - -// ----------------------------------------------------------------------------- // CIAUpdateBGSoftNotification::SetNrOfUpdates // Sets an image path for a soft notification // ----------------------------------------------------------------------------- @@ -280,11 +253,6 @@ iNotificationDialog->SetTextL(iText->Des()); } - if ( iImagePath ) - { - iNotificationDialog->SetIconNameL(iImagePath->Des()); - } - // set wrapping, timeout and touch iNotificationDialog->SetTitleTextWrapping( CHbDeviceNotificationDialogSymbian::TextWordWrap); @@ -311,16 +279,6 @@ return iActivateIndicator; } -// ---------------------------------------------------------- -// CIAUpdateBGSoftNotification::SetNrOfUpdates( TIAUpdateBGMode aNrOfUpdates ) -// ---------------------------------------------------------- -/* -void CIAUpdateBGSoftNotification::SetNrOfUpdates( const int aNrOfUpdates ) - { - - iNrOfUpdates = aNrOfUpdates; - - }*/ // ---------------------------------------------------------- // CIAUpdateBGSoftNotification::GetNrOfUpdates()