[dali_1.3.52] Merge branch 'devel/master'

Change-Id: Ic491219da14185c8b888bbd92b9e5747a4f192e2

diff --git a/dali/internal/system/common/locale-utils.cpp b/dali/internal/system/common/locale-utils.cpp
index 369a5e2..d9f906a 100644 (file)
--- a/dali/internal/system/common/locale-utils.cpp
+++ b/dali/internal/system/common/locale-utils.cpp
@@ -53,6 +53,7 @@ const LocaleDirectionInfo LOCALE_DIRECTION_LOOKUP_TABLE[] =
   { "bo", "Tibetan",            Locale::LeftToRight },
   { "bs", "Bosnian",            Locale::LeftToRight },
   { "ca", "Catalan",            Locale::LeftToRight },
+  { "ck", "Iraq",               Locale::RightToLeft },
   { "cs", "Czech",              Locale::LeftToRight },
   { "cy", "Welsh",              Locale::LeftToRight },
   { "da", "Danish",             Locale::LeftToRight },
@@ -81,7 +82,7 @@ const LocaleDirectionInfo LOCALE_DIRECTION_LOOKUP_TABLE[] =
   { "it", "Italian",            Locale::LeftToRight },
   { "ja", "Japanese",           Locale::LeftToRight },
   { "ka", "Georgian",           Locale::LeftToRight },
-  { "kk", "Kazakh",             Locale::RightToLeft },
+  { "kk", "Kazakh",             Locale::LeftToRight },
   { "km", "Khmer",              Locale::LeftToRight },
   { "kn", "Kannada",            Locale::LeftToRight },
   { "ko", "Korean",             Locale::LeftToRight },

diff --git a/dali/internal/system/linux/callback-manager-ecore.cpp b/dali/internal/system/linux/callback-manager-ecore.cpp
index fb46fb2..8398a75 100644 (file)
--- a/dali/internal/system/linux/callback-manager-ecore.cpp
+++ b/dali/internal/system/linux/callback-manager-ecore.cpp
@@ -178,6 +178,11 @@ void EcoreCallbackManager::RemoveIdleCallback( CallbackBase* callback )
       CallbackBase::Execute( *data->mRemoveFromContainerFunction, data );
 
       ecore_idler_del( data->mIdler );
+
+      // delete our data
+      delete data;
+
+      return;
     }
   }
 }
@@ -219,6 +224,11 @@ void EcoreCallbackManager::RemoveIdleEntererCallback( CallbackBase* callback )
       CallbackBase::Execute( *data->mRemoveFromContainerFunction, data );
 
       ecore_idle_enterer_del( data->mIdleEnterer );
+
+      // delete our data
+      delete data;
+
+      return;
     }
   }
 }

diff --git a/dali/public-api/dali-adaptor-version.cpp b/dali/public-api/dali-adaptor-version.cpp
index 0f5ca5a..d3bf349 100644 (file)
--- a/dali/public-api/dali-adaptor-version.cpp
+++ b/dali/public-api/dali-adaptor-version.cpp
@@ -28,7 +28,7 @@ namespace Dali
 
 const unsigned int ADAPTOR_MAJOR_VERSION = 1;
 const unsigned int ADAPTOR_MINOR_VERSION = 3;
-const unsigned int ADAPTOR_MICRO_VERSION = 51;
+const unsigned int ADAPTOR_MICRO_VERSION = 52;
 const char * const ADAPTOR_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index d0afeeb..2ce5d12 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -19,7 +19,7 @@
 
 Name:       dali-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    1.3.51
+Version:    1.3.52
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT