From 275b7621fd06d3a6e8157b97e4a898a04af78f9a Mon Sep 17 00:00:00 2001
From: asanoaozora <fifitaneki@hotmail.com>
Date: Mon, 10 Oct 2016 19:03:27 +0200
Subject: fix wrong DBus name

---
 .../poicam-server-plugin/genivi_poiservice_cam_navit.cxx | 16 ++++++++++------
 src/poi-service/poi-server-capi/main.cpp                 |  5 -----
 2 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/navigation/navigation-core/poicam-server-plugin/genivi_poiservice_cam_navit.cxx b/src/navigation/navigation-core/poicam-server-plugin/genivi_poiservice_cam_navit.cxx
index 55ab977..98d4dca 100644
--- a/src/navigation/navigation-core/poicam-server-plugin/genivi_poiservice_cam_navit.cxx
+++ b/src/navigation/navigation-core/poicam-server-plugin/genivi_poiservice_cam_navit.cxx
@@ -124,6 +124,8 @@ void setLocale(const std::shared_ptr<CommonAPI::ClientId> _client, std::string _
     changedSettings.push_back(POIServiceTypes::Settings::LOCALE);
 
     fireConfigurationChangedEvent(changedSettings);
+
+    _reply();
 }
 
 /**
@@ -257,6 +259,7 @@ void poiSearchStarted(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::
     else
         m_sort_func=NULL;
 
+    _reply();
 }
 
 /**
@@ -264,6 +267,8 @@ void poiSearchStarted(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::
  */
 void poiSearchCanceled(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _poiSearchHandle, poiSearchCanceledReply_t _reply){
     dbg(lvl_debug,"enter\n");
+    //to be completed
+    _reply();
 }
 
 /**
@@ -427,7 +432,7 @@ plugin_init(void)
     std::shared_ptr < CommonAPI::Runtime > runtime = CommonAPI::Runtime::get();
 
     const std::string domain = "local";
-    const std::string instancePOIContentAccessModule = "POIContentAccessModuleService";
+    const std::string instancePOIContentAccessModule = "POIContentAccessModule";
 
     std::shared_ptr<POIContentAccessModuleServerStub> myServicePOIContentAccessModule = std::make_shared<POIContentAccessModuleServerStub>();
 
@@ -439,10 +444,9 @@ plugin_init(void)
     const std::string instancePOIContentAccess = "POIContentAccess";
     myServicePOIContentAccess = runtime->buildProxy<POIContentAccessProxy>(domain, instancePOIContentAccess);
 
-    // not working correctly (blocked) so removed for the moment
-//    while (!myServicePOIContentAccess->isAvailable()) {
-//        usleep(10);
-//    }
+    while (!myServicePOIContentAccess->isAvailable()) {
+        usleep(10);
+    }
 
-        myServicePOIContentAccessModule->register_cam();
+    myServicePOIContentAccessModule->register_cam();
 }
diff --git a/src/poi-service/poi-server-capi/main.cpp b/src/poi-service/poi-server-capi/main.cpp
index db5f0e1..27dd453 100644
--- a/src/poi-service/poi-server-capi/main.cpp
+++ b/src/poi-service/poi-server-capi/main.cpp
@@ -1761,11 +1761,6 @@ void POISearchServerStub::requestResultList(const std::shared_ptr<CommonAPI::Cli
                     element.setDistance(camElement.getDistance()); //distance
                     element.setRouteStatus(POIServiceTypes::RouteStatus::OFF_ROUTE);
                     attributes = camElement.getAttributeList();
-                    for (sub_index=0;sub_index<attributes.size();sub_index++)
-                    {
-                        attribute = (attributes.at(sub_index));
-                        attributes.push_back(attribute);
-                    }
                     element.setAttributeList(attributes);
                     _resultListWindow.push_back(element);
                     index++;
-- 
cgit v1.2.1