--- a/imagehandling_plat/thumbnailmanager_api/inc/thumbnailobjectsource.h	Thu Jul 15 18:59:26 2010 +0300
+++ b/imagehandling_plat/thumbnailmanager_api/inc/thumbnailobjectsource.h	Thu Aug 19 10:13:51 2010 +0300
@@ -134,6 +134,45 @@
      */
     void ConstructL( const RFile64& aFile, const TDesC& aMimeType );
 
+    /**
+     * Symbian 2nd phase constructor can leave.
+     *
+     * @since S60 v5.0
+     * @param aURI URI.
+     * @param aMimeType MimeType.
+     * @param aThumbnailId ThumbnailId
+     */
+    void ConstructL( const TDesC& aUri, const TDesC& aMimeType, TThumbnailId aThumbnailId );
+
+    /**
+     * Symbian 2nd phase constructor can leave.
+     *
+     * @since S60 v5.0
+     * @param aBitmap Bitmap.
+     * @param aURI URI.
+     */   
+    void ConstructL( CFbsBitmap* aBitmap, const TDesC& aUri );
+
+    /**
+     * Symbian 2nd phase constructor can leave.
+     *
+     * @since S60 v5.0
+     * @param aBuffer Buffer.
+     * @param aMimeType MIME type. Optional, but should be specified if known.
+     * @param aURI URI.
+     */
+    void ConstructL( TDesC8* aBuffer, const TDesC& aMimeType, const TDesC& aUri );    
+    
+    /**
+     * Symbian 2nd phase constructor can leave.
+     *
+     * @since Symbian^3
+     * @param aUri Object URI or a full path to a file in the file system.
+     * @param aTargetUri      For linking the thumbnail to a different URI.
+     * @param aMimeType MIME type. Optional, but should be specified if known.
+     */
+    void ConstructL( const TDesC& aUri, const TDesC& aTargetUri, const TDesC& aMimeType );
+    
 private:
     // data
 
@@ -160,25 +199,19 @@
     /**
      * Bitmap
      */
-
     CFbsBitmap* iBitmap; // own
     
     /**
      * ThumbnailId
-     */
+     */    
+    TThumbnailId iThumbnailId; //own
     
-    TThumbnailId iThumbnailId; //own
+    /**
+     * Uri
+     */
+    HBufC* iTargetUri; // own
 	
 public:
-    /**
-     * Symbian 2nd phase constructor can leave.
-     *
-     * @since S60 v5.0
-     * @param aURI URI.
-     * @param aMimeType MimeType.
-     * @param aThumbnailId ThumbnailId
-     */
-	void ConstructL( const TDesC& aUri, const TDesC& aMimeType, TThumbnailId aThumbnailId );
 	    
     /**
      * Construct a new CThumbnailObjectSource referring to a buffer 
@@ -211,7 +244,8 @@
      * @since S60 v5.0
      * @return New CThumbnailObjectSource instance.
      */       
-    IMPORT_C static CThumbnailObjectSource* NewL( TDesC8* aBuffer,  TDesC& aMimeType, const TDesC& aUri );
+    IMPORT_C static CThumbnailObjectSource* NewL( TDesC8* aBuffer,  TDesC& aMimeType, 
+        const TDesC& aUri );
     
     /**
      * Construct a new CThumbnailObjectSource referring to a buffer 
@@ -223,7 +257,8 @@
      * @since S60 v5.0
      * @return New CThumbnailObjectSource instance.
      */       
-    IMPORT_C static CThumbnailObjectSource* NewLC( TDesC8* aBuffer,  TDesC& aMimeType, const TDesC& aUri);
+    IMPORT_C static CThumbnailObjectSource* NewLC( TDesC8* aBuffer,  TDesC& aMimeType, 
+        const TDesC& aUri);
 
     /**
      * Construct a new CThumbnailObjectSource referring to an URI.
@@ -233,7 +268,7 @@
      * @return New CThumbnailObjectSource instance.
      */
     IMPORT_C static CThumbnailObjectSource* NewL( const TDesC& aUri, 
-            TThumbnailId aThumbnailId = 0, const TDesC& aMimeType = KNullDesC );
+        TThumbnailId aThumbnailId = 0, const TDesC& aMimeType = KNullDesC );
 
     /**
      * Construct a new CThumbnailObjectSource referring to an URI.
@@ -243,9 +278,8 @@
      * @return New CThumbnailObjectSource instance.
      */
     IMPORT_C static CThumbnailObjectSource* NewLC( const TDesC& aUri,
-            TThumbnailId aThumbnailId = 0, const TDesC& aMimeType = KNullDesC );
-    
-	 
+        TThumbnailId aThumbnailId = 0, const TDesC& aMimeType = KNullDesC );
+    	 
     /**
      * Returns source buffer.
      *
@@ -276,30 +310,8 @@
      *
      * @since S60 v5.0
      * @return ThumbnailId 
-     */ 
-    
-    IMPORT_C TThumbnailId Id(); 
-	    
-    /**
-     * Symbian 2nd phase constructor can leave.
-     *
-     * @since S60 v5.0
-     * @param aBitmap Bitmap.
-     * @param aURI URI.
-     */   
-    void ConstructL( CFbsBitmap* aBitmap, const TDesC&
-            aUri );
-
-    /**
-     * Symbian 2nd phase constructor can leave.
-     *
-     * @since S60 v5.0
-     * @param aBuffer Buffer.
-     * @param aMimeType MIME type. Optional, but should be specified if known.
-     * @param aURI URI.
-     */
-    void ConstructL( TDesC8* aBuffer, const TDesC&
-        aMimeType, const TDesC& aUri );
+     */     
+    IMPORT_C TThumbnailId Id(); 	    
     
     /**
      * Returns source bitmap.
@@ -317,6 +329,36 @@
      * @return bitmap
      */
     IMPORT_C CFbsBitmap* GetBitmapOwnership();
+    
+    /**
+     * Construct a new CThumbnailObjectSource referring to an URI.
+     * @param aUri      Object URI or a full path to a file in the file system.
+     * @param aTargetUri      For linking the thumbnail to a different URI.
+     * @param aMimeType MIME type. Optional, but should be specified if known.
+     * @since Symbian^3
+     * @return New CThumbnailObjectSource instance.
+     */
+    IMPORT_C static CThumbnailObjectSource* NewL( const TDesC& aUri, 
+            const TDesC& aTargetUri, const TDesC& aMimeType );
+
+    /**
+     * Construct a new CThumbnailObjectSource referring to an URI.
+     * @param aUri      Object URI or a full path to a file in the file system.
+     * @param aTargetUri      For linking the thumbnail to a different URI.
+     * @param aMimeType MIME type. 
+     * @since Symbian^3
+     * @return New CThumbnailObjectSource instance.
+     */
+    IMPORT_C static CThumbnailObjectSource* NewLC( const TDesC& aUri, 
+            const TDesC& aTargetUri, const TDesC& aMimeType );
+    
+    /**
+     * Returns target uri.
+     *
+     * @since Symbian^3
+     * @return uri
+     */
+    IMPORT_C const TDesC& TargetUri();
 };
 
 #endif // THUMBNAILOBJECTSOURCE_H