[Release] livebox.web-provider-1.43

Change-Id: Id72704ad050b47aeb5164f3893c37304dac00386

diff --git a/packaging/livebox.web-provider.spec b/packaging/livebox.web-provider.spec
index d97c148..2365e64 100755 (executable)
--- a/packaging/livebox.web-provider.spec
+++ b/packaging/livebox.web-provider.spec
@@ -1,7 +1,7 @@
 #git:framework/web/web-provider
 Name: livebox.web-provider
 Summary: web framework for livebox 
-Version: 1.41
+Version: 1.43
 Release: 1
 Group: main/app
 License: Flora License, Version 1.1

diff --git a/src/Core/Service/MessageManager.cpp b/src/Core/Service/MessageManager.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 501480f..29344dd
--- a/src/Core/Service/MessageManager.cpp
+++ b/src/Core/Service/MessageManager.cpp
@@ -46,7 +46,9 @@ bool MessageManager::send(Evas_Object* webview, ReceiverType receiver, std::stri
     LogD("enter");
 
     std::string eventName;
-
+    if(!webview) {
+        return false;
+    }
     // set message event name triggered by receiver
     switch (receiver) {
     case TO_BOX:

diff --git a/src/Core/View/WebView.cpp b/src/Core/View/WebView.cpp
index 760ac62..f580c6c 100755 (executable)
--- a/src/Core/View/WebView.cpp
+++ b/src/Core/View/WebView.cpp
@@ -117,6 +117,9 @@ bool WebView::hide()
     if (!unsetBasicSetting(m_topWebview)) {
         return false;
     }
+    if(!m_topWebview) {
+        return false;
+    }
     evas_object_del(m_topWebview);
     m_topWebview = NULL;
 

diff --git a/src/Plugin/AppBoxPlugin/AppBoxRenderView.cpp b/src/Plugin/AppBoxPlugin/AppBoxRenderView.cpp
index f71d7f8..a7c3939 100755 (executable)
--- a/src/Plugin/AppBoxPlugin/AppBoxRenderView.cpp
+++ b/src/Plugin/AppBoxPlugin/AppBoxRenderView.cpp
@@ -23,6 +23,7 @@
 #include <Eina.h>
 #include <Evas.h>
 #include <Ecore.h>
+#include <EWebKit2.h>
 #include <ewk_view.h>
 #include <ewk_context.h>
 #include <ewk_settings.h>
@@ -429,6 +430,7 @@ void AppBoxRenderView::executeScriptCallback(
         Evas_Object* webview, const char* result, void* data)
 {
     LogD("enter");
+
     std::string resultStr(result ? result : "null");
     LogD("result: %s", resultStr.c_str());
 }
@@ -436,6 +438,9 @@ void AppBoxRenderView::executeScriptCallback(
 void AppBoxRenderView::startLoadCallback(Evas_Object* webview)
 {
     LogD("enter");
+    if(!webview) {
+        return;
+    }
     // execute injection for creating js objects
     std::ifstream jsFile(injectionFile);
     std::string script((std::istreambuf_iterator<char>(jsFile)),
@@ -448,6 +453,10 @@ void AppBoxRenderView::startLoadCallback(Evas_Object* webview)
 void AppBoxRenderView::finishLoadCallback(Evas_Object* webview)
 {
     LogD("enter");
+    if (!webview) {
+        return;
+    }
+
     ewk_view_visibility_set(webview, EINA_TRUE);
 
     if (!m_pdHelper) {
@@ -486,6 +495,9 @@ void AppBoxRenderView::createWindowBeforeCallback(Evas** canvas, Evas_Object* pa
 void AppBoxRenderView::createWindowAfterCallback(Evas_Object* parent, Evas_Object* child)
 {
     LogD("enter");
+    if (!parent) {
+        return;
+    }
 
     if (m_pdHelper) {
         Evas* parentCanvas = evas_object_evas_get(parent);