diff -r 4e91876724a2 -r 9ba538e329bd photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxcommandhandlerremovefrom.h
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxcommandhandlerremovefrom.h	Thu Dec 17 08:45:44 2009 +0200
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/inc/glxcommandhandlerremovefrom.h	Thu Jan 07 12:46:23 2010 +0200
@@ -48,17 +48,8 @@
      * unsupported types.
      */
 	IMPORT_C static CGlxCommandHandlerRemoveFrom* NewL(
-	    MGlxMediaListProvider* aMediaListProvider, 
-            TMPXGeneralCategory aContainerType, TInt aCommandId = NULL);
+	    MGlxMediaListProvider* aMediaListProvider, TMPXGeneralCategory aContainerType);
 	    
-    /** 
-    * Create remove (from) Favourites command handler 
-    * @param aMediaListProvider object that provides the media list.
-    */
-   IMPORT_C static CGlxCommandHandlerRemoveFrom* NewRemFromFavCommandHandlerL(
-       MGlxMediaListProvider* aMediaListProvider);
-
-
 	/** Destructor */
 	IMPORT_C ~CGlxCommandHandlerRemoveFrom();
 	
@@ -79,15 +70,13 @@
     /** See CGlxMpxCommandCommandHandler::ConfirmationTextL */
     virtual HBufC* ConfirmationTextL(TInt aCommandId, TBool aMultiSelection) const;
 
-    virtual HBufC* CompletionTextL() const;
-    
 protected: // from CGlxCommandHandler
     /** See @ref CGlxCommandHandler::DoActivateL */
     void DoActivateL(TInt /*aViewId*/);
     
 private:
     /** Second phase constructor */
-	void ConstructL(TInt aCommandId);
+	void ConstructL();
 
     /** Constructor */
 	CGlxCommandHandlerRemoveFrom(MGlxMediaListProvider* aMediaListProvider, TMPXGeneralCategory aContainerType);
@@ -97,7 +86,6 @@
 	TInt iResourceOffset;
 	TGlxMediaId iRemoveFromContainerId;
 	TMPXGeneralCategory iContainerType;
-	TInt iCommandId;
 	};
 
 #endif // __C_GLXCOMMANDHANDLERREMOVEFROM_H__