Merge "Added websocket server for supporting legacy Web IMEs" into tizen
authorJihoon Kim <jihoon48.kim@samsung.com>
Tue, 3 May 2016 08:37:37 +0000 (01:37 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Tue, 3 May 2016 08:37:37 +0000 (01:37 -0700)
1  2 
packaging/libscl-core.spec
src/sclcoreui-efl.cpp
src/sclcoreui-efl.h

Simple merge
index 364c4ce7b5afd9136c06a4e5f5b368b8dd9f84e8,63c08a278ae1c9a0fb000c3a7d4d1b93019b683a..1b582e4f3cb78ea649ddec1ed9aa5f17899d80bc
@@@ -71,8 -71,11 +71,10 @@@ sclboolean CSCLCoreUIEFL::init(
  
      for (int loop = 0;loop < OPTION_WINDOW_TYPE_MAX;loop++) {
          m_option_window_info[loop].window = SCLWINDOW_INVALID;
 -        m_option_window_info[loop].handler = NULL;
      }
  
+     m_websocket.init();
      return TRUE;
  }
  
Simple merge