[Release] wrt_0.8.274

[platform/framework/web/wrt.git] / src / api_new / core_module.cpp

diff --git a/src/api_new/core_module.cpp b/src/api_new/core_module.cpp
index 73a8c75..d5c07de 100644 (file)
--- a/src/api_new/core_module.cpp
+++ b/src/api_new/core_module.cpp
@@ -29,20 +29,19 @@
 #include <dpl/assert.h>
 #include <dpl/exception.h>
 #include <dpl/singleton_impl.h>
+#include <dpl/optional_typedefs.h>
 #include "localization_setting.h"
 #include <dpl/wrt-dao-ro/global_config.h>
 #include <profiling_util.h>
 #include <widget_deserialize_model.h>
 #include <dpl/wrt-dao-ro/widget_dao_read_only.h>
 #include <dpl/wrt-dao-ro/global_dao_read_only.h>
-#include "webkit/bundles/plugin_module_support.h"
-
-#include <EWebKit2.h>
 
 IMPLEMENT_SINGLETON(WRT::CoreModule)
 
-namespace { //Anonymous
-const char * const bundlePath = "/usr/lib/wrt-wk2-bundles/libwrt-wk2-bundle.so";
+namespace {
+const char* const TEXT_DOMAIN = "wrt";
+const char* const TEXT_LOCALE_PATH = "/usr/share/wrt-engine/locale";
 
 std::string cutOffFileName(const std::string& path)
 {
@@ -71,20 +70,8 @@ bool checkPaths()
 
     bool if_ok = true;
     if_ok &= (isDir(cutOffFileName(GetWrtDatabaseFilePath())));
-    if (!if_ok) {
-        LogError("Path <" << GetWrtDatabaseFilePath() << "> does not exist.");
-    }
-
     if_ok &= (isDir(GetDevicePluginPath()));
-    if (!if_ok) {
-        LogError("Path <" << GetDevicePluginPath() << "> does not exist.");
-    }
-
     if_ok &= (isDir(GetUserInstalledWidgetPath()));
-    if (!if_ok) {
-        LogError("Path <" << GetUserInstalledWidgetPath() <<
-                 "> does not exist.");
-    }
     return if_ok;
 }
 } // namespace anonymous
@@ -94,7 +81,7 @@ class CoreModuleImpl
 {
   public:
 
-    CoreModuleImpl() : m_initialized(false), m_ewkContext(NULL)
+    CoreModuleImpl() : m_initialized(false)
     {
         LogDebug("enter");
     }
@@ -129,6 +116,7 @@ class CoreModuleImpl
                  */
                 return false;
             }
+            bindtextdomain(TEXT_DOMAIN, TEXT_LOCALE_PATH);
             m_initialized = true;
         }
         return true;
@@ -145,7 +133,8 @@ class CoreModuleImpl
     {
         try {
             RunnableWidgetObjectPtr runnable;
-            WidgetModelPtr model = Domain::deserializeWidgetModel(tizenId);
+            WidgetModelPtr model =
+                Domain::deserializeWidgetModel(tizenId);
             if (!!model) {
                 runnable.reset(new RunnableWidgetObject(model));
             }
@@ -188,14 +177,8 @@ class CoreModuleImpl
         return CoreModule::ALWAYS_ASK;
     }
 
-    bool developerMode()
-    {
-        return WrtDB::GlobalDAOReadOnly::GetDeveloperMode();
-    }
-
   private:
     bool m_initialized;
-    Ewk_Context* m_ewkContext;
 };
 
 CoreModule::CoreModule() : m_impl(new CoreModuleImpl())
@@ -230,8 +213,4 @@ CoreModule::NetworkAccessMode CoreModule::roamingNetworkAccess()
     return m_impl->roamingNetworkAccess();
 }
 
-bool CoreModule::developerMode()
-{
-    return m_impl->developerMode();
-}
 } /* namespace WRT */