diff -r 62ef28f7b435 -r 56e9a0aaad89 commonuis/CommonUi/src/FindItemMenu.cpp --- a/commonuis/CommonUi/src/FindItemMenu.cpp Thu May 27 13:07:04 2010 +0300 +++ b/commonuis/CommonUi/src/FindItemMenu.cpp Fri Jun 11 13:54:51 2010 +0300 @@ -34,11 +34,6 @@ #include // Phonenumber parser #include // Mtm uids -#include // KFavouritesMaxUrl -#include // for CBookmarkItem - -#include - #include // RApaLsSession for WMLBrowser launch #include @@ -62,7 +57,6 @@ #include #include -#include // Callback query #include @@ -225,7 +219,6 @@ delete iCallbackNumber; - delete iSchemeHandler; delete iDialData; @@ -958,12 +951,12 @@ case EFindItemCmdGoToUrl: { - LaunchGenericUriL(); + break; } case EFindItemCmdGoToRstp: { - LaunchGenericUriL(); + break; } @@ -1015,7 +1008,6 @@ case EFindItemCmdUse: { - LaunchGenericUriL(); break; } @@ -1174,10 +1166,6 @@ void CFindItemMenu::AddToBookmarkL() { - // Create an item - CFavouritesItem* item = CFavouritesItem::NewLC(); - item->SetParentFolder( KFavouritesRootUid ); - item->SetType( CFavouritesItem::EItem ); // Read default name from resources RConeResourceLoader ldr( *iCoeEnv ); @@ -1199,31 +1187,15 @@ if ( !dlg->ExecuteLD( R_FINDITEM_BOOKMARK_QUERY_DIALOG ) ) { // User press cancel - do not add bookmark - CleanupStack::PopAndDestroy( 3 ); // item, defaultName, resourceLoader + CleanupStack::PopAndDestroy( 2 ); // defaultName, resourceLoader return; } - item->SetNameL( retName ); - item->SetUrlL( iAutomaticFind->CurrentItemExt().iItemDescriptor->Des() ); - - RFavouritesSession sess; - RFavouritesDb db; - - User::LeaveIfError( sess.Connect() ); - CleanupClosePushL( sess ); - User::LeaveIfError( db.Open( sess, KBrowserBookmarks ) ); - CleanupClosePushL( db ); - - // add item - db.Add( *item, ETrue ); - // Close the database. - db.Close(); - HBufC* msgBuffer = iCoeEnv->AllocReadResourceLC( R_FINDITEM_BOOKMARK_SAVED ); CAknConfirmationNote* note = new (ELeave)CAknConfirmationNote( ETrue ); note->ExecuteLD( *msgBuffer ); - CleanupStack::PopAndDestroy( 6 ); // item, db, sess, resourceLoader, + CleanupStack::PopAndDestroy( 3 ); // resourceLoader, // defaultName, msgBuffer } @@ -1533,20 +1505,7 @@ void CFindItemMenu::LaunchGenericUriL() { - if ( iSchemeHandler ) - { - delete iSchemeHandler; - iSchemeHandler = 0; - } - iSchemeHandler = CSchemeHandler::NewL( iAutomaticFind->CurrentItemExt().iItemDescriptor->Des() ); - if ( iAutomaticFind->CurrentItemExt().iItemDescriptor->FindF( KRtspUrlAddress ) != KErrNotFound ) - { - iSchemeHandler->HandleUrlEmbeddedL(); - } - else - { - iSchemeHandler->HandleUrlStandaloneL(); - } + } EXPORT_C void CFindItemMenu::SetCallbackNumber( const TDesC& aPhoneNumber )