Revert "Fix validation of widget-application"

This reverts commit 19e01c74fbe478ff98465c58678cf20764f1f9bc.

Change-Id: Id6f77d0ea66603b66d3ea97104ebe8474b0404a0

diff --git a/src/tpk_manifest_handlers/widget_application_handler.cc b/src/tpk_manifest_handlers/widget_application_handler.cc
index 7dad48ce2b8fab96131b1d4dc2ea58c73e7d5de9..6f03c7cba7fb190df9e317a6ca000262c0106d61 100644 (file)
--- a/src/tpk_manifest_handlers/widget_application_handler.cc
+++ b/src/tpk_manifest_handlers/widget_application_handler.cc
@@ -37,7 +37,6 @@ const char kWidgetApplicationMultipleKey[] = "@multiple";
 const char kWidgetApplicationNoDisplayKey[] = "@nodisplay";
 const char kWidgetApplicationHwAccelerationKey[] = "@hwacceleration";
 const char kWidgetApplicationKey[] = "manifest.widget-application";
-const char kWidgetApplicationMainKey[] = "@main";
 
 const char kTrue[] = "true";
 const char kFalse[] = "false";
@@ -148,12 +147,6 @@ bool WidgetAppValidation(const WidgetApplicationSingleEntry& item,
     return false;
   }
 
-  const std::string& main = item.app_info.main();
-  if (main != kTrue && main != kFalse) {
-    *error = "main attribute should have 'true' or 'false' value";
-    return false;
-  }
-
   return true;
 }
 
@@ -173,9 +166,6 @@ bool ParseWidgetApplicationAndStore(
   std::string nodisplay;
   if (app_dict.GetString(kWidgetApplicationNoDisplayKey, &nodisplay))
     widgetapplicationinfo->app_info.set_nodisplay(nodisplay);
-  std::string main("false");
-  app_dict.GetString(kWidgetApplicationMainKey, &main);
-  widgetapplicationinfo->app_info.set_main(main);
 
   std::string launch_mode;
   if (app_dict.GetString(kWidgetApplicationLaunchModeKey, &launch_mode)) {

diff --git a/src/tpk_manifest_handlers/widget_application_handler.h b/src/tpk_manifest_handlers/widget_application_handler.h
index 4f1091a4dd7da5cfcb923e9a102fc2de176dd7ba..2b3dd83ddbafbab9d6d966d01b7159c8d69c82bf 100644 (file)
--- a/src/tpk_manifest_handlers/widget_application_handler.h
+++ b/src/tpk_manifest_handlers/widget_application_handler.h
@@ -50,10 +50,6 @@ class WidgetApplicationInfo : public ApplicationInfo {
     hwacceleration_ = hwacceleration;
   }
 
-  void set_main(const std::string& main) {
-    main_ = main;
-  }
-
   /**
    * @brief launch_mode
    * @return launch mode string
@@ -80,16 +76,11 @@ class WidgetApplicationInfo : public ApplicationInfo {
     return hwacceleration_;
   }
 
-  const std::string& main() const {
-    return main_;
-  }
-
  private:
   std::string launch_mode_;
   std::string multiple_;
   std::string nodisplay_;
   std::string hwacceleration_;
-  std::string main_;
 };
 
 struct WidgetApplicationSingleEntry :