diff -r ce1c7ad1f18b -r bcb43dc84c44 photosgallery/viewframework/uiutilities/src/glxprogressindicator.cpp --- a/photosgallery/viewframework/uiutilities/src/glxprogressindicator.cpp Mon Mar 15 12:40:30 2010 +0200 +++ b/photosgallery/viewframework/uiutilities/src/glxprogressindicator.cpp Wed Mar 31 21:31:03 2010 +0300 @@ -33,6 +33,7 @@ EXPORT_C CGlxProgressIndicator* CGlxProgressIndicator::NewL (MDialogDismisedObserver& aGlxGridViewNotifyObserver) { + TRACER("CGlxProgressIndicator::NewL()"); CGlxProgressIndicator* self = CGlxProgressIndicator::NewLC (aGlxGridViewNotifyObserver); CleanupStack::Pop(self); @@ -46,7 +47,7 @@ CGlxProgressIndicator* CGlxProgressIndicator::NewLC (MDialogDismisedObserver& aGlxGridViewNotifyObserver) { - + TRACER("CGlxProgressIndicator::NewLC()"); CGlxProgressIndicator* self = new(ELeave) CGlxProgressIndicator(aGlxGridViewNotifyObserver); CleanupStack::PushL(self); @@ -70,6 +71,7 @@ // CGlxProgressIndicator::~CGlxProgressIndicator() { + TRACER("CGlxProgressIndicator::~CGlxProgressIndicator()"); if (iProgressbarTicker && iProgressbarTicker->IsActive()) { iProgressbarTicker->Cancel(); @@ -96,6 +98,7 @@ // void CGlxProgressIndicator::ConstructL() { + TRACER("CGlxProgressIndicator::ConstructL()"); CGlxUiUtility* uiUtility = CGlxUiUtility::UtilityL(); CleanupClosePushL(*uiUtility); TRAPD(err,uiUtility->StartTNMDaemonL()); @@ -200,6 +203,7 @@ else { iProgressDialog->ProcessFinishedL(); + iGlxGridViewNotifyObserver.HandleDialogDismissedL(); if(iProgressDialog) { iProgressDialog = NULL; @@ -243,15 +247,9 @@ if(iProgressbarTicker) { iProgressbarTicker->Cancel(); - delete iProgressbarTicker; iProgressbarTicker = NULL; } - if (aButtonId == EAknSoftkeyCancel) - { - // cancel any process in here - iGlxGridViewNotifyObserver.HandleDialogDismissedL(); - } if(iProgressDialog) { iProgressDialog = NULL;