Disabling Efreet icon cache

[platform/core/uifw/dali-adaptor.git] / dali / internal / adaptor / ubuntu / framework-ubuntu.cpp

diff --git a/dali/internal/adaptor/ubuntu/framework-ubuntu.cpp b/dali/internal/adaptor/ubuntu/framework-ubuntu.cpp
index 6588896..38e3d76 100644 (file)
--- a/dali/internal/adaptor/ubuntu/framework-ubuntu.cpp
+++ b/dali/internal/adaptor/ubuntu/framework-ubuntu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,10 @@
 #include <dali/internal/adaptor/common/framework.h>
 
 // EXTERNAL INCLUDES
+#include <X11/Xlib.h>
 #include <dali/internal/system/linux/dali-ecore.h>
+#include <dali/internal/system/linux/dali-efreet.h>
 #include <dali/internal/system/linux/dali-elementary.h>
-#include <X11/Xlib.h>
 
 #include <dali/integration-api/debug.h>
 
@@ -30,16 +31,12 @@
 
 namespace Dali
 {
-
 namespace Internal
 {
-
 namespace Adaptor
 {
-
 namespace
 {
-
 /// Application Status Enum
 enum
 {
@@ -61,10 +58,10 @@ struct Framework::Impl
   // Constructor
 
   Impl(void* data)
-  : mAbortCallBack( NULL ),
-    mCallbackManager( CallbackManager::New() ),
-    mLanguage( "NOT_SUPPORTED" ),
-    mRegion( "NOT_SUPPORTED" )
+  : mAbortCallBack(NULL),
+    mCallbackManager(CallbackManager::New()),
+    mLanguage("NOT_SUPPORTED"),
+    mRegion("NOT_SUPPORTED")
   {
   }
 
@@ -89,17 +86,17 @@ struct Framework::Impl
   }
 
   // Data
-  CallbackBase* mAbortCallBack;
-  CallbackManager *mCallbackManager;
-  std::string mLanguage;
-  std::string mRegion;
+  CallbackBase*    mAbortCallBack;
+  CallbackManager* mCallbackManager;
+  std::string      mLanguage;
+  std::string      mRegion;
 
   // Static methods
 
   /**
    * Called by AppCore on application creation.
    */
-  static bool AppCreate(void *data)
+  static bool AppCreate(void* data)
   {
     return static_cast<Framework*>(data)->AppStatusHandler(APP_CREATE, NULL);
   }
@@ -107,7 +104,7 @@ struct Framework::Impl
   /**
    * Called by AppCore when the application should terminate.
    */
-  static void AppTerminate(void *data)
+  static void AppTerminate(void* data)
   {
     static_cast<Framework*>(data)->AppStatusHandler(APP_TERMINATE, NULL);
   }
@@ -115,7 +112,7 @@ struct Framework::Impl
   /**
    * Called by AppCore when the application is paused.
    */
-  static void AppPause(void *data)
+  static void AppPause(void* data)
   {
     static_cast<Framework*>(data)->AppStatusHandler(APP_PAUSE, NULL);
   }
@@ -123,7 +120,7 @@ struct Framework::Impl
   /**
    * Called by AppCore when the application is resumed.
    */
-  static void AppResume(void *data)
+  static void AppResume(void* data)
   {
     static_cast<Framework*>(data)->AppStatusHandler(APP_RESUME, NULL);
   }
@@ -135,18 +132,18 @@ struct Framework::Impl
   {
     static_cast<Framework*>(data)->AppStatusHandler(APP_LANGUAGE_CHANGE, NULL);
   }
-
 };
 
-Framework::Framework( Framework::Observer& observer, int *argc, char ***argv, Type type )
+Framework::Framework(Framework::Observer& observer, int* argc, char*** argv, Type type)
 : mObserver(observer),
   mInitialised(false),
+  mPaused(false),
   mRunning(false),
   mArgc(argc),
   mArgv(argv),
   mBundleName(""),
   mBundleId(""),
-  mAbortHandler( MakeCallback( this, &Framework::AbortCallback ) ),
+  mAbortHandler(MakeCallback(this, &Framework::AbortCallback)),
   mImpl(NULL)
 {
   InitThreads();
@@ -155,7 +152,7 @@ Framework::Framework( Framework::Observer& observer, int *argc, char ***argv, Ty
 
 Framework::~Framework()
 {
-  if (mRunning)
+  if(mRunning)
   {
     Quit();
   }
@@ -167,7 +164,8 @@ void Framework::Run()
 {
   mRunning = true;
 
-  elm_init(*mArgc, *mArgv);
+  efreet_cache_disable();
+  elm_init(mArgc ? *mArgc : 0, mArgv ? *mArgv : nullptr);
 
   Impl::AppCreate(this);
 
@@ -188,7 +186,7 @@ bool Framework::IsMainLoopRunning()
   return mRunning;
 }
 
-void Framework::AddAbortCallback( CallbackBase* callback )
+void Framework::AddAbortCallback(CallbackBase* callback)
 {
   mImpl->mAbortCallBack = callback;
 }
@@ -212,22 +210,27 @@ std::string Framework::GetResourcePath()
 {
   // "DALI_APPLICATION_PACKAGE" is used by Ubuntu specifically to get the already configured Application package path.
   const char* ubuntuEnvironmentVariable = "DALI_APPLICATION_PACKAGE";
-  char* value = getenv( ubuntuEnvironmentVariable );
+  char*       value                     = getenv(ubuntuEnvironmentVariable);
   std::string resourcePath;
-  if ( value != NULL )
+  if(value != NULL)
   {
     resourcePath = value;
   }
 
+  if(resourcePath.back() != '/')
+  {
+    resourcePath += "/";
+  }
+
   return resourcePath;
 }
 
 std::string Framework::GetDataPath()
 {
   const char* ubuntuEnvironmentVariable = "DALI_APPLICATION_DATA_DIR";
-  char* value = getenv( ubuntuEnvironmentVariable );
+  char*       value                     = getenv(ubuntuEnvironmentVariable);
   std::string dataPath;
-  if ( value != NULL )
+  if(value != NULL)
   {
     dataPath = value;
   }
@@ -240,12 +243,12 @@ void Framework::SetBundleId(const std::string& id)
   mBundleId = id;
 }
 
-void Framework::AbortCallback( )
+void Framework::AbortCallback()
 {
   // if an abort call back has been installed run it.
-  if (mImpl->mAbortCallBack)
+  if(mImpl->mAbortCallBack)
   {
-    CallbackBase::Execute( *mImpl->mAbortCallBack );
+    CallbackBase::Execute(*mImpl->mAbortCallBack);
   }
   else
   {
@@ -253,9 +256,9 @@ void Framework::AbortCallback( )
   }
 }
 
-bool Framework::AppStatusHandler(int type, void *bundleData)
+bool Framework::AppStatusHandler(int type, void* bundleData)
 {
-  switch (type)
+  switch(type)
   {
     case APP_CREATE:
     {