Fix TV profile build brakes.

Change-Id: I97c2db97014d7a0c248d502577ede71dd5f26b41

diff --git a/services/BookmarkFlowUI/BookmarkFlowUI.h b/services/BookmarkFlowUI/BookmarkFlowUI.h
index 54e5b27fba7adef12522decb3b0f1ee9fb70b0b4..08a483270f1150cf522eff76f4f8f79da2c65752 100644 (file)
--- a/services/BookmarkFlowUI/BookmarkFlowUI.h
+++ b/services/BookmarkFlowUI/BookmarkFlowUI.h
@@ -112,6 +112,7 @@ private:
     Evas_Object *m_title_area;
     std::string m_edjFilePath;
     bool m_state;
+    unsigned int m_all_folder_id;
 
     static char* _folder_title_text_get(void* data, Evas_Object*, const char* part);
 #if PROFILE_MOBILE
@@ -149,7 +150,6 @@ private:
     Elm_Genlist_Item_Class *m_folder_selected_item_class;
     std::map<unsigned int, Elm_Object_Item*> m_map_folders;
     unsigned int m_folder_id;
-    unsigned int m_all_folder_id;
     unsigned int m_special_folder_id;
     unsigned int m_max_items;
     const unsigned int MAX_ITEMS = 4;

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index 2093bedd4a8b58c92f1d13dc6db16d9751613389..b3414ed07ecd136bb8b6587c070b1ebac070e61b 100644 (file)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -548,7 +548,6 @@ void SimpleUI::connectModelSignals()
     m_webEngine->loadFinished.connect(boost::bind(&SimpleUI::loadFinished, this));
     m_webEngine->loadStop.connect(boost::bind(&SimpleUI::loadFinished, this));
     m_webEngine->loadError.connect(boost::bind(&SimpleUI::loadError, this));
-    m_webEngine->confirmationRequest.connect(boost::bind(&SimpleUI::handleConfirmationRequest, this, _1));
     m_webEngine->tabCreated.connect(boost::bind(&SimpleUI::tabCreated, this));
     m_webEngine->checkIfCreate.connect(boost::bind(&SimpleUI::checkIfCreate, this));
     m_webEngine->tabClosed.connect(boost::bind(&SimpleUI::tabClosed,this,_1));
@@ -562,6 +561,7 @@ void SimpleUI::connectModelSignals()
     m_webEngine->redirectedWebPage.connect(boost::bind(&SimpleUI::redirectedWebPage, this, _1, _2));
     m_webEngine->setCertificatePem.connect(boost::bind(&services::CertificateContents::saveCertificateInfo, m_certificateContents, _1, _2, _3, false));
 #if PROFILE_MOBILE
+    m_webEngine->confirmationRequest.connect(boost::bind(&SimpleUI::handleConfirmationRequest, this, _1));
     m_webEngine->getRotation.connect(boost::bind(&SimpleUI::getRotation, this));
     m_webEngine->closeFindOnPage.connect(boost::bind(&SimpleUI::closeFindOnPageUI, this));
     m_webEngine->unsecureConnection.connect(boost::bind(&SimpleUI::showUnsecureConnectionPopup, this));
@@ -1365,10 +1365,11 @@ int SimpleUI::tabsCount()
     return m_webEngine->tabsCount();
 }
 
+#if PROFILE_MOBILE
 void SimpleUI::handleConfirmationRequest(basic_webengine::WebConfirmationPtr webConfirmation)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-#if PROFILE_MOBILE
+
     if (webConfirmation->getConfirmationType() == basic_webengine::WebConfirmation::ConfirmationType::CertificateConfirmation) {
         if (m_webPageUI->stateEquals(WPUState::MAIN_WEB_PAGE)) {
             auto cert = std::dynamic_pointer_cast<basic_webengine::CertificateConfirmation, basic_webengine::WebConfirmation>(webConfirmation);
@@ -1395,7 +1396,6 @@ void SimpleUI::handleConfirmationRequest(basic_webengine::WebConfirmationPtr web
     } else {
         BROWSER_LOGW("[%s:%d] Unknown WebConfirmation::ConfirmationType!", __PRETTY_FUNCTION__, __LINE__);
     }
-#endif
 }
 
 void SimpleUI::showCertificatePopup()
@@ -1434,6 +1434,7 @@ void SimpleUI::showCertificatePopup(const std::string& host, const std::string&
     popup->popupDismissed.connect(boost::bind(&SimpleUI::dismissPopup, this, _1));
     popup->show();
 }
+#endif
 
 void SimpleUI::certPopupButtonClicked(PopupButtons button, std::shared_ptr<PopupData> popupData)
 {
@@ -1457,7 +1458,9 @@ void SimpleUI::certPopupButtonClicked(PopupButtons button, std::shared_ptr<Popup
             break;
         case VIEW_CERTIFICATE:
         {
+#if PROFILE_MOBILE
             showCertificatePopup(certPopupData->cert->getURI(), certPopupData->cert->getPem(), services::CertificateContents::UNSECURE_HOST_UNKNOWN);
+#endif
             break;
         }
         default:

diff --git a/services/SimpleUI/SimpleUI.h b/services/SimpleUI/SimpleUI.h
index cd323176c9951468549088ac865c9f2009219eba..b31a915bf5954fcc03fd38541642a5942402849d 100644 (file)
--- a/services/SimpleUI/SimpleUI.h
+++ b/services/SimpleUI/SimpleUI.h
@@ -187,13 +187,13 @@ private:
     void onSnapshotCaptured(std::shared_ptr<tools::BrowserImage> snapshot, tools::SnapshotType snapshot_type);
     void onCreateTabId();
 
-    void handleConfirmationRequest(basic_webengine::WebConfirmationPtr webConfirmation);
     void authPopupButtonClicked(PopupButtons button, std::shared_ptr<PopupData> popupData);
     void certPopupButtonClicked(PopupButtons button, std::shared_ptr<PopupData> popupData);
 
     void onActionTriggered(const Action& action);
 #if PROFILE_MOBILE
     void onMenuButtonPressed();
+    void handleConfirmationRequest(basic_webengine::WebConfirmationPtr webConfirmation);
 #else
     void onRedKeyPressed();
     void onYellowKeyPressed();