X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffeedback%2Ffeedback-style.cpp;h=e02dbc12762dfb84ac08a4bddace161134416d70;hb=5e6cbdae47a886e55e1d607a061adbf2adea9537;hp=c1dca7ede6cc11f8864d86750c54ab5b8af7f5cf;hpb=5cc78df05271786e4c1c18a0eaab32e05612df9d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/feedback/feedback-style.cpp b/dali-toolkit/internal/feedback/feedback-style.cpp
index c1dca7e..e02dbc1 100644
--- a/dali-toolkit/internal/feedback/feedback-style.cpp
+++ b/dali-toolkit/internal/feedback/feedback-style.cpp
@@ -195,7 +195,7 @@ const FeedbackStyleInfo& FeedbackStyle::GetStyleInfo( const string& type ) const
 
 void FeedbackStyle::StyleChanged( const std::string& userDefinedThemePath, Dali::StyleChange::Type styleChange )
 {
-  if( StyleChange::THEME_CHANGE )
+  if( styleChange == StyleChange::THEME_CHANGE )
   {
     string userDefinedTheme;
 
@@ -289,19 +289,19 @@ void FeedbackStyle::LoadFromString( const string& data )
             DALI_ASSERT_ALWAYS(type && TreeNode::STRING == type->GetType() && "Signal must have a type");
             signalFeedbackInfo.mSignalName = type->GetString();
 
-            GetIfString( (*signalIter).second, "haptic-feedback-pattern",
+            GetIfString( (*signalIter).second, "hapticFeedbackPattern",
                          signalFeedbackInfo.mHasHapticFeedbackInfo,
                          signalFeedbackInfo.mHapticFeedbackPattern );
 
-            GetIfString( (*signalIter).second, "haptic-feedback-file",
+            GetIfString( (*signalIter).second, "hapticFeedbackFile",
                          signalFeedbackInfo.mHasHapticFeedbackInfo,
                          signalFeedbackInfo.mHapticFeedbackFile );
 
-            GetIfString( (*signalIter).second, "sound-feedback-pattern",
+            GetIfString( (*signalIter).second, "soundFeedbackPattern",
                          signalFeedbackInfo.mHasSoundFeedbackInfo,
                          signalFeedbackInfo.mSoundFeedbackPattern );
 
-            GetIfString( (*signalIter).second, "haptic-feedback-file",
+            GetIfString( (*signalIter).second, "hapticFeedbackFile",
                          signalFeedbackInfo.mHasSoundFeedbackInfo,
                          signalFeedbackInfo.mSoundFeedbackFile );