diff -r ce1c7ad1f18b -r bcb43dc84c44 photosgallery/viewframework/views/viewbase/src/glxtoolbarcontroller.cpp
--- a/photosgallery/viewframework/views/viewbase/src/glxtoolbarcontroller.cpp	Mon Mar 15 12:40:30 2010 +0200
+++ b/photosgallery/viewframework/views/viewbase/src/glxtoolbarcontroller.cpp	Wed Mar 31 21:31:03 2010 +0300
@@ -203,24 +203,6 @@
         {
         EnableLatch( EGlxCmdStartMultipleMarking, ETrue );
         }
-	/* single clk chngs
-	 * check the current view status.
-	 * need to disable upload button in toolbar for grid by default
-	 */
-	if(!IsFullScreenView())
-        {
-        if(aList->SelectionCount() >= 1 )
-            {
-            iToolbar->SetItemDimmed(EGlxCmdUpload,EFalse , ETrue);
-            }
-        else
-            {
-            iToolbar->SetItemDimmed(EGlxCmdUpload,ETrue , ETrue);
-            }    
-        }
-    
-    //DrawNow must be called since SetDimmed does not redraw the toolbar
-    iToolbar->DrawNow();    
     }
 
 //----------------------------------------------------------------------------
@@ -293,13 +275,6 @@
 			iToolbar->SetItemDimmed( EGlxCmdRename, EFalse, ETrue );
 			}    
 		}    
-	/* single clk chngs
-	 * enable/disable upload button as per selection count, only in grid view
-	 */
-	if(aList->SelectionCount()== 0 && !IsFullScreenView())
-	    {
-	    iToolbar->SetItemDimmed(EGlxCmdUpload,ETrue , ETrue);
-	    }
 	
 	//DrawNow must be called since SetDimmed does not redraw the toolbar
 	iToolbar->DrawNow();
@@ -326,42 +301,5 @@
             }
         }
     }
-//----------------------------------------------------------------------------
-// Check for current view mode .Grid/fullscreen/imgviewer
-//----------------------------------------------------------------------------
-//
-TBool CGlxToolbarController::IsFullScreenView()
-    {
-    TBool fullscreenViewingMode = EFalse;
-             
-     CGlxNavigationalState* aNavigationalState = CGlxNavigationalState::InstanceL();
-     CMPXCollectionPath* naviState = aNavigationalState->StateLC();
-     
-     if ( naviState->Levels() >= 1)
-         {
-         if (aNavigationalState->ViewingMode() == NGlxNavigationalState::EBrowse) 
-             {
-             // For image viewer collection, goto view mode
-             if (naviState->Id() == TMPXItemId(KGlxCollectionPluginImageViewerImplementationUid))
-                 {
-                 // current view mode is img vwr
-                 fullscreenViewingMode = ETrue;
-                 }
-             else
-                 {
-                 //current view mode is Grid 
-                 fullscreenViewingMode = EFalse;
-                 }
-             } 
-         else 
-             {
-             //current view mode is Fullscreen
-             fullscreenViewingMode = ETrue;
-             }                
-         }
-     CleanupStack::PopAndDestroy( naviState );
-     aNavigationalState->Close();
-     return fullscreenViewingMode;
-    }
-//end os file
+//end of file