From: JuWan Kim <juwan.kim@samsung.com>
Date: Thu, 5 Feb 2015 03:06:01 +0000 (+0900)
Subject: Fix launch bug / Remove manifest file
X-Git-Tag: submit/tizen_tv/20150205.090014^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45a27ee23ac47962e35db8851e053fb36913402e;p=profile%2Ftv%2Fapps%2Fnative%2Ffilebrowser.git

Fix launch bug / Remove manifest file

Change-Id: Idc7bfdae9bc352371555e2d67c6e475ba3be39dd
Signed-off-by: JuWan Kim <juwan.kim@samsung.com>
---

diff --git a/include/FbBaseView.h b/include/FbBaseView.h
index abc4844..c887b1b 100644
--- a/include/FbBaseView.h
+++ b/include/FbBaseView.h
@@ -1,11 +1,10 @@
 #ifndef __FBBASE_VIEW_H__
 #define __FBBASE_VIEW_H__
 
+#include <MediaContentDbListener.h>
+#include <UsbConnectionListener.h>
 
-#include "ManagerUsb.h"
-
-
-class CFbBaseView : public CBaseView, CUsbConnectionListener, CDbUpdateListener {
+class CFbBaseView : public CBaseView, CUsbConnectionListener, CMediaContentDbUpdateListener {
 private:
 	struct SFbBaseView* m;
 
diff --git a/org.tizen.file-browser-tv-ref.manifest b/org.tizen.file-browser-tv-ref.manifest
deleted file mode 100644
index 8eb07db..0000000
--- a/org.tizen.file-browser-tv-ref.manifest
+++ /dev/null
@@ -1,19 +0,0 @@
-<manifest>
-    <define>
-        <domain name="dtv-org.tizen.file-browser-tv-ref"/>
-	<request>
-		<smack request="system::media" type="rwx"/>
-		<smack request="device::app_logging" type="rwx"/>
-		<smack request="ail::db" type="rwx"/>
-		<smack request="system::vconf" type="rwx"/>
-		<smack request="system::homedir" type="rwx"/>
-		<smack request="system::use_internet" type="rwx"/>
-		<smack request="xorg" type="rwx"/>
-		<smack request="isf" type="rwx"/>
-		<smack request="media-data::db" type="rwx"/>
-    	</request>
-    </define>
-    <request>
-        <domain name="dtv-org.tizen.file-browser-tv-ref"/>
-    </request>
-</manifest>
diff --git a/src/main.cpp b/src/main.cpp
index 02c0227..f6c5e22 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+
  *
  * Licensed under the Apache License, Version 2.0 (the License);
  * you may not use this file except in compliance with the License.
@@ -106,6 +106,10 @@ protected:
 			ad.source = strdup(source);
 			free(source);
 		}
+		else
+		{
+			ad.source = strdup("all");
+		}
 
 		CViewMgr::Initialize(ad.win,NULL);
 		viewmgr = CViewMgr::GetInstance();
diff --git a/src/views/BaseView/FbBaseView.cpp b/src/views/BaseView/FbBaseView.cpp
index 3011e49..c3bff6a 100644
--- a/src/views/BaseView/FbBaseView.cpp
+++ b/src/views/BaseView/FbBaseView.cpp
@@ -25,7 +25,8 @@
 #include "ExtNameInfo.h"
 #include "common.h"
 #include "dbg.h"
-#include "ManagerUsb.h"
+#include <MediaContentDbListener.h>
+#include <UsbConnectionListener.h>
 #include "SortName.h"
 #include "Popup.h"
 #include "InputHandler.h"
diff --git a/src/views/BaseView/SourceCtxPopup.cpp b/src/views/BaseView/SourceCtxPopup.cpp
index 2d4da2c..667c50b 100644
--- a/src/views/BaseView/SourceCtxPopup.cpp
+++ b/src/views/BaseView/SourceCtxPopup.cpp
@@ -21,10 +21,10 @@
 #include "i18n.h"
 #include "define.h"
 #include "common.h"
-
 #include "Info.h"
 #include "CtxPopup.h"
-#include "ManagerUsb.h"
+#include <MediaContentDbListener.h>
+#include <UsbConnectionListener.h>
 #include "SourceCtxPopup.h"
 
 const char *srcbtnids[] = {