From: santhosh <santhosh.ic@samsung.com>
Date: Fri, 12 Jul 2013 12:26:05 +0000 (+0530)
Subject: 45979
X-Git-Tag: submit/tizen_2.2/20130716.172725~5
X-Git-Url: http://review.tizen.org/git/?p=apps%2Fosp%2FGallery.git;a=commitdiff_plain;h=42d6b4e6c4016f68c4b9c902729846b0c45680a9

45979

Change-Id: I837237c67bd89fb6accf5d7b0be58ac8026a0bd4
Signed-off-by: santhosh <santhosh.ic@samsung.com>
---

diff --git a/inc/GlAlbumListPresentationModel.h b/inc/GlAlbumListPresentationModel.h
index 8bbf574..b360a12 100644
--- a/inc/GlAlbumListPresentationModel.h
+++ b/inc/GlAlbumListPresentationModel.h
@@ -76,7 +76,7 @@ public:
 
 	virtual void OnThumbnailReceivedN(Tizen::Base::Runtime::IEventArg& eventArg);
 
-	void OnContentScanCompleted(const Tizen::Base::String &scanPath);
+	bool OnContentScanCompleted(const Tizen::Base::String &scanPath);
 
 	void OnContentCreated(void);
 	void OnContentUpdated(void);
diff --git a/src/GlAlbumListPresentationModel.cpp b/src/GlAlbumListPresentationModel.cpp
index 7e8b035..63a048f 100644
--- a/src/GlAlbumListPresentationModel.cpp
+++ b/src/GlAlbumListPresentationModel.cpp
@@ -323,7 +323,7 @@ AlbumListPresentationModel::RenameAlbum(const String& orgPath, const String& new
 	return r;
 }
 
-void AlbumListPresentationModel::OnContentScanCompleted (const Tizen::Base::String &scanPath)
+bool AlbumListPresentationModel::OnContentScanCompleted (const Tizen::Base::String &scanPath)
 {
 	AppLogDebug("ENTER");
 	if (__pAlbumListener && (scanPath == __renameNewPath))
@@ -331,8 +331,11 @@ void AlbumListPresentationModel::OnContentScanCompleted (const Tizen::Base::Stri
 		InitializeAlbumInfoList(CONTENT_TYPE_ALL);
 		__pAlbumListener->OnAlbumRenameComplete();
 		__renameNewPath = L"";
+		AppLogDebug("EXIT");
+		return true;
 	}
 	AppLogDebug("EXIT");
+	return false;
 }
 
 void
diff --git a/src/GlContentUpdateEventListener.cpp b/src/GlContentUpdateEventListener.cpp
index ec3931c..818f175 100644
--- a/src/GlContentUpdateEventListener.cpp
+++ b/src/GlContentUpdateEventListener.cpp
@@ -225,7 +225,11 @@ ContentUpdateEventListener::OnContentDirectoryScanCompleted(const Tizen::Base::S
 	}
 	else
 	{
-		__changeNotificationReceived = true;
+		bool renameHandled = AlbumListPresentationModel::GetInstance()->OnContentScanCompleted(directoryPath);
+		if (!renameHandled)
+		{
+			__changeNotificationReceived = true;
+		}
 	}
 
 	AppLogDebug("EXIT");