[dali_2.0.9] Merge branch 'devel/master'

Change-Id: If6ae1cc6c95263c742cd45326acf416c11a0da13

diff --git a/dali/internal/adaptor/common/adaptor-impl.h b/dali/internal/adaptor/common/adaptor-impl.h
index 0506ae0..5590aa0 100644 (file)
--- a/dali/internal/adaptor/common/adaptor-impl.h
+++ b/dali/internal/adaptor/common/adaptor-impl.h
@@ -413,6 +413,12 @@ public:
   void GetAppId( std::string& appId );
 
   /**
+   * Gets path for resource storage.
+   * @param[out] path Path for resource storage
+   */
+  void GetResourceStoragePath( std::string& path );
+
+  /**
    * @copydoc Dali::Adaptor::SurfaceResizePrepare
    */
   void SurfaceResizePrepare( Dali::RenderSurfaceInterface* surface, SurfaceSize surfaceSize );

diff --git a/dali/internal/adaptor/tizen-wayland/adaptor-impl-tizen.cpp b/dali/internal/adaptor/tizen-wayland/adaptor-impl-tizen.cpp
index af3ceb2..cff3073 100755 (executable)
--- a/dali/internal/adaptor/tizen-wayland/adaptor-impl-tizen.cpp
+++ b/dali/internal/adaptor/tizen-wayland/adaptor-impl-tizen.cpp
@@ -76,7 +76,23 @@ std::string Adaptor::GetApplicationPackageName()
   return appname;
 }
 
-void Adaptor::GetDataStoragePath( std::string& path)
+void Adaptor::GetResourceStoragePath( std::string& path )
+{
+#ifdef USE_APPFW
+  char *pathInt = app_get_resource_path();
+  if ( pathInt )
+  {
+    path = pathInt;
+    free( pathInt );
+  }
+  else
+  {
+    path = "";
+  }
+#endif
+}
+
+void Adaptor::GetDataStoragePath( std::string& path )
 {
 #ifdef USE_APPFW
   char *pathInt = app_get_data_path();

diff --git a/dali/public-api/dali-adaptor-version.cpp b/dali/public-api/dali-adaptor-version.cpp
index 8ff304e..e78637f 100644 (file)
--- a/dali/public-api/dali-adaptor-version.cpp
+++ b/dali/public-api/dali-adaptor-version.cpp
@@ -27,7 +27,7 @@ namespace Dali
 {
 const unsigned int ADAPTOR_MAJOR_VERSION = 2;
 const unsigned int ADAPTOR_MINOR_VERSION = 0;
-const unsigned int ADAPTOR_MICRO_VERSION = 8;
+const unsigned int ADAPTOR_MICRO_VERSION = 9;
 const char* const  ADAPTOR_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index f259109..5efa016 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -17,7 +17,7 @@
 
 Name:       dali2-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    2.0.8
+Version:    2.0.9
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT