Merge pull request #49 from szulak/fix_lib_name

Fix lib name for wgt-manifest-handlers

diff --git a/extensions/renderer/runtime_ipc_client.h b/extensions/renderer/runtime_ipc_client.h
old mode 100644 (file)
new mode 100755 (executable)
index c743570..b5da104
--- a/extensions/renderer/runtime_ipc_client.h
+++ b/extensions/renderer/runtime_ipc_client.h
@@ -18,7 +18,7 @@
 #define XWALK_EXTENSIONS_RENDERER_RUNTIME_IPC_CLIENT_H_
 
 #include <v8/v8.h>
-#include <ewk_ipc_message.h>
+#include <ewk_chromium.h>
 
 #include <functional>
 #include <map>

diff --git a/packaging/crosswalk-tizen.spec b/packaging/crosswalk-tizen.spec
index 707fe28..5d13f34 100644 (file)
--- a/packaging/crosswalk-tizen.spec
+++ b/packaging/crosswalk-tizen.spec
@@ -14,14 +14,6 @@ URL:        https://www.tizen.org
 Source0:    %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
 
-################ disable builds in X11 repos #################
-# currently, crosswalk-tizen is not needed on X11 profiles
-# see TINF-965
-%if %{with x}
-ExclusiveArch:
-%endif
-##############################################################
-
 ########## disable builds in wearable profile ################
 # currently, crosswalk-tizen doesn't support wearable profile
 %if "%{?profile}" == "wearable"

diff --git a/runtime/browser/native_window.cc b/runtime/browser/native_window.cc
index c1b36cd..89a6c5d 100755 (executable)
--- a/runtime/browser/native_window.cc
+++ b/runtime/browser/native_window.cc
@@ -16,12 +16,7 @@
 
 #include "runtime/browser/native_window.h"
 
-#if defined(HAVE_X11)
-#include <Ecore_X.h>
-#elif defined(HAVE_WAYLAND)
 #include <Ecore_Wayland.h>
-#endif
-
 #include <cstdint>
 
 #include "common/logger.h"
@@ -51,17 +46,7 @@ void NativeWindow::Initialize() {
   window_ = CreateWindowInternal();
   elm_win_conformant_set(window_, EINA_TRUE);
   int w, h;
-#if defined(HAVE_X11)
-  uint16_t pid = getpid();
-  ecore_x_window_prop_property_set(
-    elm_win_xwindow_get(window_),
-    ECORE_X_ATOM_NET_WM_PID,
-    ECORE_X_ATOM_CARDINAL, 32, &pid, 1);
-  ecore_x_vsync_animator_tick_source_set(elm_win_xwindow_get(window_));
-  ecore_x_window_size_get(ecore_x_window_root_first_get(), &w, &h);
-#elif defined(HAVE_WAYLAND)
   ecore_wl_screen_size_get(&w, &h);
-#endif
   evas_object_resize(window_, w, h);
   elm_win_autodel_set(window_, EINA_TRUE);
   evas_object_smart_callback_add(window_, "delete,request",

diff --git a/runtime/browser/splash_screen.cc b/runtime/browser/splash_screen.cc
index fd7a8b0..935673c 100644 (file)
--- a/runtime/browser/splash_screen.cc
+++ b/runtime/browser/splash_screen.cc
@@ -20,11 +20,7 @@
 #include <map>
 #include <string>
 
-#if defined(HAVE_X11)
-#include <Ecore_X.h>
-#elif defined(HAVE_WAYLAND)
 #include <Ecore_Wayland.h>
-#endif
 #include <Evas_Legacy.h>
 
 #include "common/logger.h"
@@ -149,17 +145,7 @@ void SplashScreen::HideSplashScreen(HideReason reason) {
 
 std::pair<int, int> SplashScreen::GetDimensions() {
   int w, h;
-#if defined(HAVE_X11)
-  uint16_t pid = getpid();
-  ecore_x_window_prop_property_set(elm_win_xwindow_get(window_.evas_object()),
-                                   ECORE_X_ATOM_NET_WM_PID,
-                                   ECORE_X_ATOM_CARDINAL, 32, &pid, 1);
-  ecore_x_vsync_animator_tick_source_set(
-      elm_win_xwindow_get(window_.evas_object()));
-  ecore_x_window_size_get(ecore_x_window_root_first_get(), &w, &h);
-#elif defined(HAVE_WAYLAND)
   ecore_wl_screen_size_get(&w, &h);
-#endif
   evas_object_resize(background_, w, h);
   return std::make_pair(w, h);
 }

diff --git a/runtime/browser/web_view.h b/runtime/browser/web_view.h
old mode 100644 (file)
new mode 100755 (executable)
index 8bb1823..273a701
--- a/runtime/browser/web_view.h
+++ b/runtime/browser/web_view.h
@@ -18,7 +18,7 @@
 #define XWALK_RUNTIME_BROWSER_WEB_VIEW_H_
 
 #include <Elementary.h>
-#include <ewk_ipc_message.h>
+#include <ewk_chromium.h>
 #include <functional>
 #include <string>
 

diff --git a/runtime/renderer/injected_bundle.cc b/runtime/renderer/injected_bundle.cc
old mode 100644 (file)
new mode 100755 (executable)
index 57cfc3b..f2c8b0c
--- a/runtime/renderer/injected_bundle.cc
+++ b/runtime/renderer/injected_bundle.cc
@@ -15,7 +15,7 @@
  */
 
 #include <Ecore.h>
-#include <ewk_ipc_message.h>
+#include <ewk_chromium.h>
 #include <unistd.h>
 #include <v8.h>
 

diff --git a/runtime/resources/locales/ko_KR.po b/runtime/resources/locales/ko_KR.po
index efef5c1..812291b 100755 (executable)
--- a/runtime/resources/locales/ko_KR.po
+++ b/runtime/resources/locales/ko_KR.po
@@ -5,7 +5,7 @@ msgid "IDS_BR_POP_STARTING_DOWNLOAD_ING"
 msgstr "다운로드를 시작하는 중..."
 
 msgid "IDS_BR_BODY_SECURITY_CERTIFICATE_PROBLEM_MSG"
-msgstr "URL을 검색하거나 입력하세요"
+msgstr "이 사이트의 보안 인증서에 문제가 있습니다"
 
 msgid "IDS_BR_SK_CANCEL"
 msgstr "취소"

diff --git a/runtime/runtime.gyp b/runtime/runtime.gyp
index 007159b..b827529 100644 (file)
--- a/runtime/runtime.gyp
+++ b/runtime/runtime.gyp
@@ -37,9 +37,6 @@
         'browser/notification_manager.h',
         'browser/notification_manager.cc',
       ],
-      'defines': [
-        'HAVE_WAYLAND',
-      ],
       'variables': {
         'packages': [
           'capi-appfw-application',