--- a/photosgallery/viewframework/views/viewbase/src/glxtoolbarcontroller.cpp	Thu Jul 15 18:39:01 2010 +0300
+++ b/photosgallery/viewframework/views/viewbase/src/glxtoolbarcontroller.cpp	Thu Aug 19 09:55:03 2010 +0300
@@ -192,10 +192,6 @@
         {
         EnableLatch(EGlxCmdStartMultipleMarking, ETrue);
         }
-    else if (aList->SelectionCount() == 0)
-        {
-        EnableLatch(EGlxCmdStartMultipleMarking, EFalse);
-        }
     }
 
 //----------------------------------------------------------------------------
@@ -229,7 +225,10 @@
     TRAPD(err, CheckShareonlineVersionL());
     GLX_LOG_INFO2("CGlxToolbarController::SetStatusOnViewActivationL(%d),"
             " err(%d)", aList->Count(), err);
-
+    if (iToolbar->IsDimmed())
+    	{
+        iToolbar->SetDimmed(EFalse);
+    	}
     CGlxNavigationalState* navigationalState =
             CGlxNavigationalState::InstanceL();
     CleanupClosePushL(*navigationalState);
@@ -348,11 +347,9 @@
     CAknButton* toolbarButton =
             static_cast<CAknButton*> (iToolbar->ControlOrNull(aCommandId));
 
-    if (toolbarButton && !toolbarButton->IsDimmed())
+    if( toolbarButton )
         {
         toolbarButton->SetCurrentState(aLatched, ETrue);
-        // Force to update the frame IDs 
-        toolbarButton->SetDimmed(EFalse);
         }
     }