--- a/photosgallery/viewframework/views/viewbase/src/glxviewbase.cpp	Tue Sep 14 21:19:17 2010 +0300
+++ b/photosgallery/viewframework/views/viewbase/src/glxviewbase.cpp	Wed Sep 15 12:13:06 2010 +0300
@@ -551,10 +551,6 @@
     CAknToolbar* toolbar = GetToolBar();
     if(toolbar)
         {
-        CAknButton* slideshowButton =
-            static_cast<CAknButton*> (toolbar->ControlOrNull(EGlxCmdSlideshow));
-        TBool slideshowdimmed = EFalse;
-
         //Here after the toolbar cmd is processed it is enabled
         //back. For share the toolbar state should be same as it was 
         //earlier, so we take the current state and reset back after
@@ -566,28 +562,35 @@
         CAknButton* markButton =
             static_cast<CAknButton*> (toolbar->ControlOrNull(EGlxCmdStartMultipleMarking));
         TBool markButtondimmed = EFalse;
-
-        if(slideshowButton)
-            {
-            // Get current button state
-            CAknButtonState* currentState = slideshowButton->State();
-            slideshowdimmed = slideshowButton->IsDimmed();
-            }
+        
+        CAknButton* deleteButton =
+            static_cast<CAknButton*> (toolbar->ControlOrNull(EGlxCmdDelete));
+        TBool deleteButtondimmed = EFalse;
+        
+        CAknButton* sendButton =
+            static_cast<CAknButton*> (toolbar->ControlOrNull(EGlxCmdSend));
+        TBool sendButtondimmed = EFalse;
 
         if(markButton)
             {
-            // Get current button state
-            CAknButtonState* currentState = markButton->State();
             markButtondimmed = markButton->IsDimmed();
             }        
         
         if(uploadButton)
             {
-            // Get current button state
-            CAknButtonState* currentState = uploadButton->State();
             uploaddimmed = uploadButton->IsDimmed();
+            }     
+        
+        if(deleteButton)
+            {
+			deleteButtondimmed = deleteButton->IsDimmed();
             }
-
+        
+        if(sendButton)
+            {
+			sendButtondimmed = sendButton->IsDimmed();
+            }
+        
         // Deactivate the toolbar. Don't accept the toolbar input when the command
         // execution is already in progress.
         SetToolbarItemsDimmed(ETrue); 
@@ -599,20 +602,28 @@
         // after command execution.
         SetToolbarStateL();
 
+        // Note: Slideshow toolbar item update is done
+        // at CGlxToolbarController::SetStatusL()
+
         if(!markButtondimmed)
             {
             toolbar->SetItemDimmed(EGlxCmdStartMultipleMarking, EFalse, ETrue);
             }
 
-        if(!slideshowdimmed)
-            {
-            toolbar->SetItemDimmed(EGlxCmdSlideshowPlay, EFalse, ETrue);
-            }
-        
         if(uploaddimmed || (aCommand == EGlxCmdStartMultipleMarking))
             {
             toolbar->SetItemDimmed(EGlxCmdUpload, ETrue, ETrue);
             }
+ 
+        if(!deleteButtondimmed)
+            {
+            toolbar->SetItemDimmed(EGlxCmdDelete, EFalse, ETrue);
+            }
+        
+        if(!sendButtondimmed)
+            {
+            toolbar->SetItemDimmed(EGlxCmdSend, EFalse, ETrue);
+            }        
         }    
     }
 
@@ -739,6 +750,8 @@
         toolbar->SetItemDimmed(EGlxCmdSlideshowPlay, aDimmed, ETrue);
         toolbar->SetItemDimmed(EGlxCmdStartMultipleMarking, aDimmed, ETrue);
         toolbar->SetItemDimmed(EGlxCmdUpload, aDimmed, ETrue);
+        toolbar->SetItemDimmed(EGlxCmdDelete, aDimmed, ETrue);
+        toolbar->SetItemDimmed(EGlxCmdSend, aDimmed, ETrue);
         }
     }