updated to CommonAPI 3.1.9

17 files changed, 216 insertions, 395 deletions

diff --git a/src/navigation/build.sh b/src/navigation/build.sh
index 906bc2c..6eebc53 100755
--- a/src/navigation/build.sh
+++ b/src/navigation/build.sh
@@ -71,6 +71,7 @@ then
 			rm ./build/CMakeCache.txt
 			rm ./build/cmake_install.cmake
 			rm ./build/Makefile
+			rm -rf ./build/positioning
 		fi
 	fi
 fi
diff --git a/src/navigation/map-viewer/CMakeLists.txt b/src/navigation/map-viewer/CMakeLists.txt
index ad8194d..fdf39ef 100644
--- a/src/navigation/map-viewer/CMakeLists.txt
+++ b/src/navigation/map-viewer/CMakeLists.txt
@@ -90,6 +90,26 @@ if(${YOCTO_CONFIG})
 endif()
 
 if (WITH_PLUGIN_MIGRATION)
+    # DBus Path
+    if(DBUS_LIB_PATH)
+      set(DBUS_INCLUDE_DIRS ${DBUS_LIB_PATH}/include/dbus-1.0 ${DBUS_LIB_PATH}/lib/dbus-1.0/include)
+      set(DBUS_LIBDIR ${DBUS_LIB_PATH}/lib)
+      set(DBUS_LIBRARIES ${DBUS_LIB_PATH}/lib/libdbus-1.so)
+    else()
+      message(FATAL_ERROR "Please specify the path to your patched DBus library using -DDBUS_LIB_PATH=yourPath")
+    endif()
+
+    # Packages
+    find_package(CommonAPI)
+    find_package(CommonAPI-DBus)
+
+    #pkg_check_modules(DBUS "dbus-1 >= 1.8.4") // #to be fixed, it doesn't work so the paths are set manually (see above)
+    pkg_check_modules(COMMONAPI "CommonAPI >= 3.1.5")
+    pkg_check_modules(COMMONAPI_DBUS "CommonAPI-DBus >= 3.1.5")
+    pkg_check_modules(GOBJECT gobject-2.0)
+    pkg_check_modules(GLIB REQUIRED glib-2.0)
+    pkg_check_modules(DBUS_CPP_GLIB dbus-c++-glib-1)
+
     set(FRANCA_DIR "${API_DIR}/franca")
     add_subdirectory(configuration-server-plugin)
     add_subdirectory(mapviewercontrol-server-plugin)
diff --git a/src/navigation/map-viewer/configuration-server-plugin/CMakeLists.txt b/src/navigation/map-viewer/configuration-server-plugin/CMakeLists.txt
index f04c55f..3e31d54 100644
--- a/src/navigation/map-viewer/configuration-server-plugin/CMakeLists.txt
+++ b/src/navigation/map-viewer/configuration-server-plugin/CMakeLists.txt
@@ -28,26 +28,6 @@ set(CMAKE_CXX_FLAGS "-Wall -std=c++0x")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
-
-# DBus Path
-if(DBUS_LIB_PATH)
-  set(DBUS_INCLUDE_DIRS ${DBUS_LIB_PATH}/include/dbus-1.0 ${DBUS_LIB_PATH}/lib/dbus-1.0/include)
-  set(DBUS_LIBDIR ${DBUS_LIB_PATH}/lib)
-  set(DBUS_LIBRARIES ${DBUS_LIB_PATH}/lib/libdbus-1.so)
-else()
-  message(FATAL_ERROR "Please specify the path to your patched DBus library using -DDBUS_LIB_PATH=yourPath")
-endif()
-
-# Packages
-find_package(CommonAPI 3.1.5 REQUIRED)
-find_package(CommonAPI-DBus 3.1.5 REQUIRED)
-
-#pkg_check_modules(DBUS "dbus-1 >= 1.8.4") // #to be fixed, it doesn't work so the paths are set manually (see above)
-pkg_check_modules(COMMONAPI "CommonAPI >= 3.1.5")
-pkg_check_modules(COMMONAPI_DBUS "CommonAPI-DBus >= 3.1.5")
-pkg_check_modules(GOBJECT gobject-2.0)
-pkg_check_modules(GLIB REQUIRED glib-2.0)
-
 # Path to the generated files
 set(API_VERSION_MAJOR 4)
 set(API_VERSION "v${API_VERSION_MAJOR}")
diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
index 96b1fe5..04be7ae 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -344,46 +344,54 @@ class  MapViewerControl
     CreateMapViewInstance(const uint32_t& sessionHandle, const ::DBus::Struct< uint16_t, uint16_t >& mapViewSize, const DBusCommonAPIEnumeration& mapViewType, int32_t& error, uint32_t& mapViewInstanceHandle)
 	{
         dbg(lvl_debug,"enter\n");
-		if (mapViewType != GENIVI_MAPVIEWER_MAIN_MAP) 
-			throw DBus::ErrorInvalidArgs("Unsupported mapViewType");
-        mapViewInstanceHandle=1;
-        while (handles[mapViewInstanceHandle]) {
-            mapViewInstanceHandle++;
-            if (mapViewInstanceHandle == 256)
-				throw DBus::ErrorLimitsExceeded("Out of mapviewinstance handles");
-		}
-        handles[mapViewInstanceHandle]=new MapViewerControlObj(this, mapViewInstanceHandle, mapViewSize);
         error=0; //not used
+        mapViewInstanceHandle=0;
+        if (mapViewType != GENIVI_MAPVIEWER_MAIN_MAP) {
+            throw DBus::ErrorInvalidArgs("Unsupported mapViewType");
+        } else {
+            mapViewInstanceHandle=1;
+            while (handles[mapViewInstanceHandle]) {
+                mapViewInstanceHandle++;
+                if (mapViewInstanceHandle == 256)
+                                    throw DBus::ErrorLimitsExceeded("Out of mapviewinstance handles");
+                    }
+            handles[mapViewInstanceHandle]=new MapViewerControlObj(this, mapViewInstanceHandle, mapViewSize);
+        }
     }
 
     int32_t
     ReleaseMapViewInstance(const uint32_t& SessionHandle, const uint32_t& MapViewInstanceHandle)
-	{
-		MapViewerControlObj *obj=handles[MapViewInstanceHandle];
-		if (!obj)
-			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-		delete(obj);
-		handles[MapViewInstanceHandle]=NULL;
-        return(0); //not implemented yet
-	}
-
+    {
+        std::map<uint32_t, MapViewerControlObj *>::iterator iter = handles.find(MapViewInstanceHandle);
+        if (iter != handles.end())
+        {
+            MapViewerControlObj *obj=handles[MapViewInstanceHandle];
+            delete(obj); //delete the navit mapviewer instance
+            //and remove the handle from the dictionary too
+            handles.erase(iter);
+            return(0);
+	}
+        else {
+            return(1);
+        }
+    }
 	void
     SetMapViewPerspective(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const DBusCommonAPIEnumeration& perspective)
 	{
         MapViewerControlObj *obj=handles[mapViewInstanceHandle];
-		if (!obj)
-			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetMapViewPerspective(sessionHandle, perspective);
+            if (!obj)
+                throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
+            else obj->SetMapViewPerspective(sessionHandle, perspective);
 	}
 
     DBusCommonAPIEnumeration
     GetMapViewPerspective(const uint32_t& mapViewInstanceHandle)
 	{
-		uint16_t MapViewPerspectiveMode;
+                uint16_t MapViewPerspectiveMode=0;
         MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetMapViewPerspective(MapViewPerspectiveMode);
+        else obj->GetMapViewPerspective(MapViewPerspectiveMode);
 		return MapViewPerspectiveMode;
 	}
 
@@ -400,9 +408,11 @@ class  MapViewerControl
         MapViewerControlObj *obj=handles[MapViewInstanceHandle];
         if (!obj)
                 throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetMapViewScale(SessionHandle, ScaleID);
-        //todo: manage the isminmax indicator
-        MapViewScaleChanged(MapViewInstanceHandle,ScaleID,GENIVI_MAPVIEWER_INVALID);
+        else {
+            obj->SetMapViewScale(SessionHandle, ScaleID);
+            //todo: manage the isminmax indicator
+            MapViewScaleChanged(MapViewInstanceHandle,ScaleID,GENIVI_MAPVIEWER_INVALID);
+        }
     }
 
     void
@@ -411,11 +421,13 @@ class  MapViewerControl
         MapViewerControlObj *obj=handles[MapViewInstanceHandle];
         if (!obj)
                 throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetMapViewScaleByDelta(SessionHandle, ScaleDelta);
-        uint8_t current_scale;
-        DBusCommonAPIEnumeration is_min_max;
-        obj->GetMapViewScale(current_scale,is_min_max);
-        MapViewScaleChanged(MapViewInstanceHandle,current_scale,is_min_max);
+        else {
+            obj->SetMapViewScaleByDelta(SessionHandle, ScaleDelta);
+            uint8_t current_scale;
+            DBusCommonAPIEnumeration is_min_max;
+            obj->GetMapViewScale(current_scale,is_min_max);
+            MapViewScaleChanged(MapViewInstanceHandle,current_scale,is_min_max);
+        }
     }
 
 	void
@@ -424,7 +436,7 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[MapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetMapViewScale(ScaleID, IsMinMax);
+        else obj->GetMapViewScale(ScaleID, IsMinMax);
 	}
 
     void
@@ -434,10 +446,12 @@ class  MapViewerControl
         MapViewerControlObj *obj=handles[mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        if (pixelCoordinates.size())
-        {
-            pixel = pixelCoordinates.at(0);
-            obj->SetMapViewPan(sessionHandle, panningAction, pixel);
+        else {
+            if (pixelCoordinates.size())
+            {
+                pixel = pixelCoordinates.at(0);
+                obj->SetMapViewPan(sessionHandle, panningAction, pixel);
+            }
         }
     }
 
@@ -449,8 +463,9 @@ class  MapViewerControl
         MapViewerControlObj *obj=handles[mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetMapViewPan(valueToReturn, pixel); //limited to one pixel coordinate
+        else obj->GetMapViewPan(valueToReturn, pixel); //limited to one pixel coordinate
         pixelCoordinates.push_back(pixel);
+        return pixelCoordinates;
     }
 
 	void
@@ -459,7 +474,7 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[MapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-		obj->DisplayRoute(SessionHandle, RouteHandle, highlighted);
+                else obj->DisplayRoute(SessionHandle, RouteHandle, highlighted);
 	}
 
 	void	
@@ -468,7 +483,7 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[MapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-		obj->HideRoute(SessionHandle, RouteHandle);
+                else obj->HideRoute(SessionHandle, RouteHandle);
 	}
 
 	::DBus::Struct< uint16_t, uint16_t, uint16_t, std::string >
@@ -485,11 +500,11 @@ class  MapViewerControl
     DBusCommonAPIEnumeration
     GetMapViewType(const uint32_t& mapViewInstanceHandle)
 	{
-		uint16_t ret;
+                uint16_t ret=0;
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetMapViewType(ret);
+        else obj->GetMapViewType(ret);
 		return ret;
 	}
 
@@ -505,7 +520,7 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-		obj->SetTargetPoint(sessionHandle, targetPoint);
+                else obj->SetTargetPoint(sessionHandle, targetPoint);
 	}
 
     ::DBus::Struct< double, double, double >
@@ -515,7 +530,7 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetTargetPoint(ret);
+        else obj->GetTargetPoint(ret);
 		return ret;
 	}
 
@@ -525,17 +540,17 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-		obj->SetFollowCarMode(sessionHandle, followCarMode);
+                else obj->SetFollowCarMode(sessionHandle, followCarMode);
 	}
 
 	bool
     GetFollowCarMode(const uint32_t& mapViewInstanceHandle)
 	{
-		bool followCarMode;
+                bool followCarMode=false;
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetFollowCarMode(followCarMode);
+        else obj->GetFollowCarMode(followCarMode);
 		return followCarMode;
 	}
 
@@ -557,7 +572,7 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-		obj->SetCameraHeadingAngle(sessionHandle, heading);
+                else obj->SetCameraHeadingAngle(sessionHandle, heading);
 	}
 
 	void
@@ -572,17 +587,17 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-		obj->SetCameraTiltAngle(sessionHandle, tilt);
+                else obj->SetCameraTiltAngle(sessionHandle, tilt);
 	}
 
 	int32_t
     GetCameraTiltAngle(const uint32_t& mapViewInstanceHandle)
 	{
-		double ret;
+                double ret=0;
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetCameraTiltAngle(ret);
+        else obj->GetCameraTiltAngle(ret);
 		return ret;
 	}
 
@@ -592,7 +607,7 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-		obj->SetCameraRollAngle(sessionHandle, roll);
+                else obj->SetCameraRollAngle(sessionHandle, roll);
 	}
 
 	int32_t
@@ -612,18 +627,18 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-		obj->SetCameraDistanceFromTargetPoint(sessionHandle, distance);
+                else obj->SetCameraDistanceFromTargetPoint(sessionHandle, distance);
 	}
 
 
     uint32_t
     GetCameraDistanceFromTargetPoint(const uint32_t& mapViewInstanceHandle)
     {
-        double ret;
+        double ret=0;
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetCameraDistanceFromTargetPoint(ret);
+        else obj->GetCameraDistanceFromTargetPoint(ret);
 		return ret;
 	}
 
@@ -651,17 +666,17 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-		obj->SetCameraHeight(sessionHandle, height);
+                else obj->SetCameraHeight(sessionHandle, height);
 	}
 
 	uint32_t
     GetCameraHeight(const uint32_t& mapViewInstanceHandle)
 	{
-		double ret;
+                double ret=0;
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetCameraHeight(ret);
+        else obj->GetCameraHeight(ret);
 		return ret;
 	}
 
@@ -672,7 +687,7 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetScaleList(ret);
+        else obj->GetScaleList(ret);
 		return ret;
 	}
 
@@ -688,7 +703,7 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-		obj->SetMapViewBoundingBox(sessionHandle, boundingBox);
+                else obj->SetMapViewBoundingBox(sessionHandle, boundingBox);
 	}
 
 	::DBus::Struct< ::DBus::Struct< double, double >, ::DBus::Struct< double, double > >
@@ -698,7 +713,7 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetMapViewBoundingBox(ret);
+        else obj->GetMapViewBoundingBox(ret);
 		return ret;
 	}
 
@@ -708,7 +723,7 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-		obj->SetMapViewRotation(sessionHandle, rotationAngle, rotationAnglePerSecond);
+                else obj->SetMapViewRotation(sessionHandle, rotationAngle, rotationAnglePerSecond);
 	}
 
 	void
@@ -717,7 +732,7 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetMapViewRotation(rotationAngle, rotationAnglePerFrame);
+        else obj->GetMapViewRotation(rotationAngle, rotationAnglePerFrame);
 	}
 
 	void
@@ -777,11 +792,11 @@ class  MapViewerControl
     std::vector< ::DBus::Struct< uint32_t, bool > >
     GetDisplayedRoutes(const uint32_t& mapViewInstanceHandle)
 	{
-		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
+        std::vector< ::DBus::Struct< uint32_t, bool > >ret;
+                MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        std::vector< ::DBus::Struct< uint32_t, bool > >ret;
-        obj->GetDisplayedRoutes(ret);
+        else obj->GetDisplayedRoutes(ret);
 		return ret;
 	}
 
@@ -791,17 +806,17 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-		obj->SetMapViewTheme(sessionHandle, mapViewTheme);
+                else obj->SetMapViewTheme(sessionHandle, mapViewTheme);
 	}
 
     DBusCommonAPIEnumeration
     GetMapViewTheme(const uint32_t& mapViewInstanceHandle)
 	{
-		uint16_t ret;
+                uint16_t ret=0;
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetMapViewTheme(ret);
+        else obj->GetMapViewTheme(ret);
 		return ret;
 	}
 
@@ -814,22 +829,22 @@ class  MapViewerControl
 	std::vector< ::DBus::Struct< double, double > >
     ConvertPixelCoordsToGeoCoords(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const std::vector< ::DBus::Struct< uint16_t, uint16_t > >& pixelCoordinates)
 	{
-		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
+            std::vector< ::DBus::Struct< double, double > >ret;
+                MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-		std::vector< ::DBus::Struct< double, double > >ret;
-		obj->ConvertPixelCoordsToGeoCoords(sessionHandle, pixelCoordinates, ret);
+                else obj->ConvertPixelCoordsToGeoCoords(sessionHandle, pixelCoordinates, ret);
 		return ret;
 	}
 
 	std::vector< ::DBus::Struct< uint16_t, uint16_t > >
     ConvertGeoCoordsToPixelCoords(const uint32_t& sessionHandle, const uint32_t& mapViewInstanceHandle, const std::vector< ::DBus::Struct< double, double > >& geoCoordinates)
 	{
-		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
+            std::vector< ::DBus::Struct< uint16_t, uint16_t > >ret;
+                MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-		std::vector< ::DBus::Struct< uint16_t, uint16_t > >ret;
-		obj->ConvertGeoCoordsToPixelCoords(sessionHandle, geoCoordinates, ret);
+                else obj->ConvertGeoCoordsToPixelCoords(sessionHandle, geoCoordinates, ret);
 		return ret;
 	}
 
@@ -839,7 +854,7 @@ class  MapViewerControl
 		MapViewerControlObj *obj=handles[mapViewInstanceHandle];
 		if (!obj)
 			throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-		obj->SetCameraHeadingTrackUp(sessionHandle);
+                else obj->SetCameraHeadingTrackUp(sessionHandle);
 	}
 
 	void
diff --git a/src/navigation/map-viewer/mapviewercontrol-server-plugin/CMakeLists.txt b/src/navigation/map-viewer/mapviewercontrol-server-plugin/CMakeLists.txt
index 115d8ae..7bc22c8 100644
--- a/src/navigation/map-viewer/mapviewercontrol-server-plugin/CMakeLists.txt
+++ b/src/navigation/map-viewer/mapviewercontrol-server-plugin/CMakeLists.txt
@@ -28,29 +28,6 @@ set(CMAKE_CXX_FLAGS "-Wall -std=c++0x")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
-
-# DBus Path
-if(DBUS_LIB_PATH)
-  set(DBUS_INCLUDE_DIRS ${DBUS_LIB_PATH}/include/dbus-1.0 ${DBUS_LIB_PATH}/lib/dbus-1.0/include)
-  set(DBUS_LIBDIR ${DBUS_LIB_PATH}/lib)
-  set(DBUS_LIBRARIES ${DBUS_LIB_PATH}/lib/libdbus-1.so)
-else()
-  message(FATAL_ERROR "Please specify the path to your patched DBus library using -DDBUS_LIB_PATH=yourPath")
-endif()
-
-# Packages
-find_package(CommonAPI 3.1.5 REQUIRED)
-find_package(CommonAPI-DBus 3.1.5 REQUIRED)
-
-
-#pkg_check_modules(DBUS "dbus-1 >= 1.8.4") // #to be fixed, it doesn't work so the paths are set manually (see above)
-pkg_check_modules(COMMONAPI "CommonAPI >= 3.1.5")
-pkg_check_modules(COMMONAPI_DBUS "CommonAPI-DBus >= 3.1.5")
-pkg_check_modules(GOBJECT gobject-2.0)
-pkg_check_modules(GLIB REQUIRED glib-2.0)
-pkg_check_modules(DBUS_CPP_GLIB dbus-c++-glib-1)
-
-
 # Path to the generated files
 set(API_VERSION_MAJOR 4)
 set(API_VERSION "v${API_VERSION_MAJOR}")
diff --git a/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx
index 38c2856..2914746 100644
--- a/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -344,16 +344,19 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
     void createMapViewInstance(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _sessionHandle, MapViewerControl::Dimension _mapViewSize, MapViewerControl::MapViewType _mapViewType, createMapViewInstanceReply_t _reply)
     {
         MapViewerControl::createMapViewInstanceError _error = MapViewerControl::createMapViewInstanceError::OK;
+        NavigationTypes::Handle  _mapViewInstanceHandle=0;
         dbg(lvl_debug,"enter\n");
         if (_mapViewType != MapViewerControl::MapViewType::MAIN_MAP)
             _error = MapViewerControl::createMapViewInstanceError::MAPVIEWERCONTROL_ERROR_NOMOREMAPVIEWINSTANCEHANDLES;
-        NavigationTypes::Handle _mapViewInstanceHandle=FIRST_SESSION_HANDLE;
-        while ((mp_handles.count(_mapViewInstanceHandle)>0 ) && (mp_handles[_mapViewInstanceHandle] != NULL)) {
-            _mapViewInstanceHandle++;
-            if (_mapViewInstanceHandle == MAX_SESSION_HANDLE)
-                _error = MapViewerControl::createMapViewInstanceError::MAPVIEWERCONTROL_ERROR_NOMOREMAPVIEWINSTANCEHANDLES;
+        else {
+            _mapViewInstanceHandle=FIRST_SESSION_HANDLE;
+            while ((mp_handles.count(_mapViewInstanceHandle)>0 ) && (mp_handles[_mapViewInstanceHandle] != NULL)) {
+                _mapViewInstanceHandle++;
+                if (_mapViewInstanceHandle == MAX_SESSION_HANDLE)
+                    _error = MapViewerControl::createMapViewInstanceError::MAPVIEWERCONTROL_ERROR_NOMOREMAPVIEWINSTANCEHANDLES;
+            }
+            mp_handles[_mapViewInstanceHandle]=new MapViewerControlObj(this, _mapViewInstanceHandle, _mapViewSize);
         }
-        mp_handles[_mapViewInstanceHandle]=new MapViewerControlObj(this, _mapViewInstanceHandle, _mapViewSize);
         _reply(_error,_mapViewInstanceHandle);
 	}
 
@@ -364,11 +367,13 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
     void releaseMapViewInstance(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _sessionHandle, ::v4::org::genivi::navigation::NavigationTypes::Handle _mapViewInstanceHandle, releaseMapViewInstanceReply_t _reply)
 	{
         MapViewerControl::releaseMapViewInstanceError _error = MapViewerControl::releaseMapViewInstanceError::OK;
-        if (mp_handles.find(_mapViewInstanceHandle) != mp_handles.end())
+        std::map<uint32_t, MapViewerControlObj *>::iterator iter = mp_handles.find(_mapViewInstanceHandle);
+        if (iter != mp_handles.end())
         {
             MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
-            delete(obj);
-            mp_handles[_mapViewInstanceHandle]=NULL;
+            delete(obj); //delete the navit mapviewer instance
+            //and remove the handle from the dictionary too
+            mp_handles.erase(iter);
         }
         else {
            _error = MapViewerControl::releaseMapViewInstanceError::MAPVIEWERCONTROL_ERROR_MAPVIEWINSTANCENOTAVAILABLE;
@@ -382,11 +387,11 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
      *   set using CreateMapViewInstance
      */
     void getMapViewType(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _mapViewInstanceHandle, getMapViewTypeReply_t _reply){
-        MapViewerControl::MapViewType _mapViewType;
+        MapViewerControl::MapViewType _mapViewType=MapViewerControl::MapViewType::INVALID;
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetMapViewType(_mapViewType);
+        else obj->GetMapViewType(_mapViewType);
         _reply(_mapViewType);
 
     }
@@ -408,7 +413,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetTargetPoint(_sessionHandle, _targetPoint);
+        else obj->SetTargetPoint(_sessionHandle, _targetPoint);
         _reply();
     }
 
@@ -420,7 +425,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetTargetPoint(_targetPoint);
+        else obj->GetTargetPoint(_targetPoint);
         _reply(_targetPoint);
 
     }
@@ -432,7 +437,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetFollowCarMode(_sessionHandle, _followCarMode);
+        else obj->SetFollowCarMode(_sessionHandle, _followCarMode);
         _reply();
     }
 
@@ -440,11 +445,11 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
      * description: getFollowCarMode = This method returns the current FollowCar-mode
      */
     void getFollowCarMode(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _mapViewInstanceHandle, getFollowCarModeReply_t _reply){
-        bool _followCarMode;
+        bool _followCarMode=false;
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetFollowCarMode(_followCarMode);
+        else obj->GetFollowCarMode(_followCarMode);
         _reply(_followCarMode);
 
     }
@@ -477,7 +482,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetCameraHeadingAngle(_sessionHandle, _heading);
+        else obj->SetCameraHeadingAngle(_sessionHandle, _heading);
         _reply();
     }
 
@@ -497,7 +502,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetCameraHeadingTrackUp(_sessionHandle);
+        else obj->SetCameraHeadingTrackUp(_sessionHandle);
         _reply();
     }
 
@@ -515,7 +520,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetCameraTiltAngle(_sessionHandle, _tilt);
+        else obj->SetCameraTiltAngle(_sessionHandle, _tilt);
         _reply();
     }
 
@@ -527,7 +532,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetCameraTiltAngle(_tilt);
+        else obj->GetCameraTiltAngle(_tilt);
         _reply(_tilt);
 
     }
@@ -539,7 +544,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetCameraRollAngle(_sessionHandle, _roll);
+        else obj->SetCameraRollAngle(_sessionHandle, _roll);
         _reply();
     }
 
@@ -551,7 +556,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetCameraRollAngle(_roll);
+        else obj->GetCameraRollAngle(_roll);
         _reply(_roll);
 
     }
@@ -564,7 +569,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetCameraDistanceFromTargetPoint(_sessionHandle, _distance);
+        else obj->SetCameraDistanceFromTargetPoint(_sessionHandle, _distance);
         _reply();
     }
 
@@ -573,11 +578,11 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
      *   distance from the target point
      */
     void getCameraDistanceFromTargetPoint(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _mapViewInstanceHandle, getCameraDistanceFromTargetPointReply_t _reply){
-        uint32_t _distance;
+        uint32_t _distance=0;
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetCameraDistanceFromTargetPoint(_distance);
+        else obj->GetCameraDistanceFromTargetPoint(_distance);
         _reply(_distance);
     }
 
@@ -625,7 +630,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetCameraHeight(_sessionHandle, _height);
+        else obj->SetCameraHeight(_sessionHandle, _height);
         _reply();
     }
 
@@ -637,7 +642,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetCameraHeight(_height);
+        else obj->GetCameraHeight(_height);
         _reply(_height);
     }
 
@@ -648,7 +653,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetMapViewPerspective(_sessionHandle, _perspective);
+        else obj->SetMapViewPerspective(_sessionHandle, _perspective);
         _reply();
     }
 
@@ -656,11 +661,11 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
      * description: getMapViewPerspective = This method returns the current map perspective
      */
     void getMapViewPerspective(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _mapViewInstanceHandle, getMapViewPerspectiveReply_t _reply){
-        MapViewerControl::MapPerspective _perspective;
+        MapViewerControl::MapPerspective _perspective=MapViewerControl::MapPerspective::INVALID;
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetMapViewPerspective(_perspective);
+        else obj->GetMapViewPerspective(_perspective);
         _reply(_perspective);
     }
 
@@ -704,7 +709,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetScaleList(_scaleList);
+        else obj->GetScaleList(_scaleList);
         _reply(_scaleList);
     }
 
@@ -716,9 +721,13 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetMapViewScale(_sessionHandle, _scaleID);
-        //todo: manage the isminmax indicator
-        fireMapViewScaleChangedEvent(_mapViewInstanceHandle,_scaleID,MapViewerControl::MapScaleType::INVALID);
+        else  {
+            obj->SetMapViewScale(_sessionHandle, _scaleID);
+            uint8_t current_scale;
+            MapViewerControl::MapScaleType is_min_max;
+            obj->GetMapViewScale(current_scale,is_min_max);
+            fireMapViewScaleChangedEvent(_mapViewInstanceHandle,current_scale,is_min_max);
+        }
         _reply();
     }
 
@@ -730,11 +739,13 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetMapViewScaleByDelta(_sessionHandle, _scaleDelta);
-        uint8_t current_scale;
-        MapViewerControl::MapScaleType is_min_max;
-        obj->GetMapViewScale(current_scale,is_min_max);
-        fireMapViewScaleChangedEvent(_mapViewInstanceHandle,current_scale,is_min_max);
+        else {
+            obj->SetMapViewScaleByDelta(_sessionHandle, _scaleDelta);
+            uint8_t current_scale;
+            MapViewerControl::MapScaleType is_min_max;
+            obj->GetMapViewScale(current_scale,is_min_max);
+            fireMapViewScaleChangedEvent(_mapViewInstanceHandle,current_scale,is_min_max);
+        }
         _reply();
     }
 
@@ -750,12 +761,12 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
      * description: getMapViewScale = This method returns the currently used map scale
      */
     void getMapViewScale(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _mapViewInstanceHandle, getMapViewScaleReply_t _reply){
-        uint8_t _scaleID;
-        MapViewerControl::MapScaleType _isMinMax;
+        uint8_t _scaleID=0;
+        MapViewerControl::MapScaleType _isMinMax=MapViewerControl::MapScaleType::INVALID;
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetMapViewScale(_scaleID, _isMinMax);
+        else obj->GetMapViewScale(_scaleID, _isMinMax);
         _reply(_scaleID,_isMinMax);
     }
 
@@ -766,7 +777,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetMapViewBoundingBox(_sessionHandle, _boundingBox);
+        else obj->SetMapViewBoundingBox(_sessionHandle, _boundingBox);
         _reply();
     }
 
@@ -779,7 +790,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetMapViewBoundingBox(_boundingBox);
+        else obj->GetMapViewBoundingBox(_boundingBox);
         _reply(_boundingBox);
     }
 
@@ -807,10 +818,12 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        if (_pixelCoordinates.size())
-        {
-            pixel = _pixelCoordinates.at(0);
-            obj->SetMapViewPan(_sessionHandle, _panningAction, pixel);
+        else {
+            if (_pixelCoordinates.size())
+            {
+                pixel = _pixelCoordinates.at(0);
+                obj->SetMapViewPan(_sessionHandle, _panningAction, pixel);
+            }
         }
         _reply();
     }
@@ -824,7 +837,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetMapViewPan(_valueToReturn, pixel); //limited to one pixel coordinate
+        else obj->GetMapViewPan(_valueToReturn, pixel); //limited to one pixel coordinate
         _pixelCoordinates.push_back(pixel);
         _reply(_pixelCoordinates);
     }
@@ -836,7 +849,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetMapViewRotation(_sessionHandle, _rotationAngle, _rotationAnglePerSecond);
+        else obj->SetMapViewRotation(_sessionHandle, _rotationAngle, _rotationAnglePerSecond);
         _reply();
     }
 
@@ -845,12 +858,12 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
      *   purposes
      */
     void getMapViewRotation(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _mapViewInstanceHandle, getMapViewRotationReply_t _reply){
-        int32_t _rotationAngle;
-        int32_t _rotationAnglePerFrame;
+        int32_t _rotationAngle=0;
+        int32_t _rotationAnglePerFrame=0;
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetMapViewRotation(_rotationAngle, _rotationAnglePerFrame);
+        else obj->GetMapViewRotation(_rotationAngle, _rotationAnglePerFrame);
         _reply(_rotationAngle,_rotationAnglePerFrame);
     }
 
@@ -907,7 +920,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->DisplayRoute(_sessionHandle, _routeHandle, _highlighted);
+        else obj->DisplayRoute(_sessionHandle, _routeHandle, _highlighted);
         _reply();
     }
 
@@ -918,7 +931,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->HideRoute(_sessionHandle, _routeHandle);
+        else obj->HideRoute(_sessionHandle, _routeHandle);
         _reply();
     }
 
@@ -927,10 +940,10 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
      */
     void getDisplayedRoutes(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _mapViewInstanceHandle, getDisplayedRoutesReply_t _reply){
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
+        std::vector<MapViewerControl::DisplayedRoute> _displayedRoutes;
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        std::vector<MapViewerControl::DisplayedRoute> _displayedRoutes;
-        obj->GetDisplayedRoutes(_displayedRoutes);
+        else obj->GetDisplayedRoutes(_displayedRoutes);
         _reply(_displayedRoutes);
     }
 
@@ -985,7 +998,7 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->SetMapViewTheme(_sessionHandle, _mapViewTheme);
+        else obj->SetMapViewTheme(_sessionHandle, _mapViewTheme);
         _reply();
     }
 
@@ -994,11 +1007,11 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
      *   instance
      */
     void getMapViewTheme(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _mapViewInstanceHandle, getMapViewThemeReply_t _reply){
-        MapViewerControl::MapTheme _mapViewTheme;
+        MapViewerControl::MapTheme _mapViewTheme=MapViewerControl::MapTheme::INVALID;
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        obj->GetMapViewTheme(_mapViewTheme);
+        else obj->GetMapViewTheme(_mapViewTheme);
         _reply(_mapViewTheme);
 
     }
@@ -1016,10 +1029,10 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
      */
     void convertPixelCoordsToGeoCoords(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _sessionHandle, ::v4::org::genivi::navigation::NavigationTypes::Handle _mapViewInstanceHandle, std::vector<MapViewerControl::Pixel> _pixelCoordinates, convertPixelCoordsToGeoCoordsReply_t _reply){
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
+        std::vector< ::v4::org::genivi::navigation::NavigationTypes::Coordinate2D> _geoCoordinates;
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        std::vector< ::v4::org::genivi::navigation::NavigationTypes::Coordinate2D> _geoCoordinates;
-        obj->ConvertPixelCoordsToGeoCoords(_sessionHandle, _pixelCoordinates, _geoCoordinates);
+        else obj->ConvertPixelCoordsToGeoCoords(_sessionHandle, _pixelCoordinates, _geoCoordinates);
         _reply(_geoCoordinates);
     }
 
@@ -1029,10 +1042,10 @@ class  MapViewerControlServerStub : public MapViewerControlStubDefault
      */
     void convertGeoCoordsToPixelCoords(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _sessionHandle, ::v4::org::genivi::navigation::NavigationTypes::Handle _mapViewInstanceHandle, std::vector< ::v4::org::genivi::navigation::NavigationTypes::Coordinate2D> _geoCoordinates, convertGeoCoordsToPixelCoordsReply_t _reply){
         MapViewerControlObj *obj=mp_handles[_mapViewInstanceHandle];
+        std::vector<MapViewerControl::Pixel> _pixelCoordinates;
         if (!obj)
             throw DBus::ErrorInvalidArgs("Invalid mapviewinstance handle");
-        std::vector<MapViewerControl::Pixel> _pixelCoordinates;
-        obj->ConvertGeoCoordsToPixelCoords(_sessionHandle, _geoCoordinates, _pixelCoordinates);
+        else obj->ConvertGeoCoordsToPixelCoords(_sessionHandle, _geoCoordinates, _pixelCoordinates);
         _reply(_pixelCoordinates);
     }
 
@@ -1116,12 +1129,13 @@ MapViewerControlObj::SetMapViewScale(NavigationTypes::Handle SessionHandle, uint
 void
 MapViewerControlObj::SetMapViewScaleByDelta(NavigationTypes::Handle SessionHandle, int16_t ScaleDelta)
 {
-	if (!ScaleDelta) 
+    if (!ScaleDelta)
 		throw DBus::ErrorInvalidArgs("ScaleDelta must not be 0");
-	if (ScaleDelta < 0) 
-		navit_zoom_out(m_navit.u.navit,1 << (-ScaleDelta),NULL);
-	else if (ScaleDelta > 0) 
-		navit_zoom_in(m_navit.u.navit,1 << ScaleDelta,NULL);
+    else {
+        if (ScaleDelta < 0)
+            navit_zoom_out(m_navit.u.navit,1 << (-ScaleDelta),NULL);
+        else navit_zoom_in(m_navit.u.navit,1 << ScaleDelta,NULL);
+    }
 }
 
 void
@@ -1490,7 +1504,7 @@ MapViewerControlObj::GetMapViewBoundingBox(NavigationTypes::Rectangle& boundingB
 void
 MapViewerControlObj::GetDisplayedRoutes(std::vector<MapViewerControl::DisplayedRoute>& displayedRoutes)
 {
-	int i;
+    size_t i;
 	for (i = 0 ; i < m_displayed_routes.size(); i++) {
         MapViewerControl::DisplayedRoute route;
         route.setRouteHandle(m_displayed_routes[i]->RouteHandle());
diff --git a/src/navigation/map-viewer/session-server-plugin/CMakeLists.txt b/src/navigation/map-viewer/session-server-plugin/CMakeLists.txt
index 797bf89..df45597 100644
--- a/src/navigation/map-viewer/session-server-plugin/CMakeLists.txt
+++ b/src/navigation/map-viewer/session-server-plugin/CMakeLists.txt
@@ -27,29 +27,6 @@ set(CMAKE_CXX_FLAGS "-Wall -std=c++0x")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
-
-# DBus Path
-if(DBUS_LIB_PATH)
-  set(DBUS_INCLUDE_DIRS ${DBUS_LIB_PATH}/include/dbus-1.0 ${DBUS_LIB_PATH}/lib/dbus-1.0/include)
-  set(DBUS_LIBDIR ${DBUS_LIB_PATH}/lib)
-  set(DBUS_LIBRARIES ${DBUS_LIB_PATH}/lib/libdbus-1.so)
-else()
-  message(FATAL_ERROR "Please specify the path to your patched DBus library using -DDBUS_LIB_PATH=yourPath")
-endif()
-
-# Packages
-find_package(CommonAPI 3.1.5 REQUIRED)
-find_package(CommonAPI-DBus 3.1.5 REQUIRED)
-
-
-#pkg_check_modules(DBUS "dbus-1 >= 1.8.4") // #to be fixed, it doesn't work so the paths are set manually (see above)
-pkg_check_modules(COMMONAPI "CommonAPI >= 3.1.5")
-pkg_check_modules(COMMONAPI_DBUS "CommonAPI-DBus >= 3.1.5")
-pkg_check_modules(GOBJECT gobject-2.0)
-pkg_check_modules(GLIB REQUIRED glib-2.0)
-pkg_check_modules(DBUS_CPP_GLIB dbus-c++-glib-1)
-
-
 # Path to the generated files
 set(API_VERSION_MAJOR 4)
 set(API_VERSION "v${API_VERSION_MAJOR}")
diff --git a/src/navigation/navigation-core/CMakeLists.txt b/src/navigation/navigation-core/CMakeLists.txt
index d6b08c9..4a0d362 100644
--- a/src/navigation/navigation-core/CMakeLists.txt
+++ b/src/navigation/navigation-core/CMakeLists.txt
@@ -90,6 +90,26 @@ if(${YOCTO_CONFIG})
 endif()
 
 if (WITH_PLUGIN_MIGRATION)
+    # DBus Path
+    if(DBUS_LIB_PATH)
+      set(DBUS_INCLUDE_DIRS ${DBUS_LIB_PATH}/include/dbus-1.0 ${DBUS_LIB_PATH}/lib/dbus-1.0/include)
+      set(DBUS_LIBDIR ${DBUS_LIB_PATH}/lib)
+      set(DBUS_LIBRARIES ${DBUS_LIB_PATH}/lib/libdbus-1.so)
+    else()
+      message(FATAL_ERROR "Please specify the path to your patched DBus library using -DDBUS_LIB_PATH=yourPath")
+    endif()
+
+    # Packages
+    find_package(CommonAPI)
+    find_package(CommonAPI-DBus)
+
+    #pkg_check_modules(DBUS "dbus-1 >= 1.8.4") // #to be fixed, it doesn't work so the paths are set manually (see above)
+    pkg_check_modules(COMMONAPI "CommonAPI >= 3.1.5")
+    pkg_check_modules(COMMONAPI_DBUS "CommonAPI-DBus >= 3.1.5")
+    pkg_check_modules(GOBJECT gobject-2.0)
+    pkg_check_modules(GLIB REQUIRED glib-2.0)
+    pkg_check_modules(DBUS_CPP_GLIB dbus-c++-glib-1)
+
     set(FRANCA_DIR "${API_DIR}/franca")
     add_subdirectory(configuration-server-plugin)
     add_subdirectory(locationinput-server-plugin)
diff --git a/src/navigation/navigation-core/configuration-server-plugin/CMakeLists.txt b/src/navigation/navigation-core/configuration-server-plugin/CMakeLists.txt
index 7b286e6..4e35c17 100644
--- a/src/navigation/navigation-core/configuration-server-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/configuration-server-plugin/CMakeLists.txt
@@ -28,28 +28,6 @@ set(CMAKE_CXX_FLAGS "-Wall -std=c++0x")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
-
-# DBus Path
-if(DBUS_LIB_PATH)
-  set(DBUS_INCLUDE_DIRS ${DBUS_LIB_PATH}/include/dbus-1.0 ${DBUS_LIB_PATH}/lib/dbus-1.0/include)
-  set(DBUS_LIBDIR ${DBUS_LIB_PATH}/lib)
-  set(DBUS_LIBRARIES ${DBUS_LIB_PATH}/lib/libdbus-1.so)
-else()
-  message(FATAL_ERROR "Please specify the path to your patched DBus library using -DDBUS_LIB_PATH=yourPath")
-endif()
-
-# Packages
-find_package(CommonAPI 3.1.5 REQUIRED)
-find_package(CommonAPI-DBus 3.1.5 REQUIRED)
-
-
-#pkg_check_modules(DBUS "dbus-1 >= 1.8.4") // #to be fixed, it doesn't work so the paths are set manually (see above)
-pkg_check_modules(COMMONAPI "CommonAPI >= 3.1.5")
-pkg_check_modules(COMMONAPI_DBUS "CommonAPI-DBus >= 3.1.5")
-pkg_check_modules(GOBJECT gobject-2.0)
-pkg_check_modules(GLIB REQUIRED glib-2.0)
-
-
 # Path to the generated files
 set(API_VERSION_MAJOR 4)
 set(API_VERSION "v${API_VERSION_MAJOR}")
diff --git a/src/navigation/navigation-core/enhancedposition-client-plugin/CMakeLists.txt b/src/navigation/navigation-core/enhancedposition-client-plugin/CMakeLists.txt
index 65bcaa7..3d4e7fe 100644
--- a/src/navigation/navigation-core/enhancedposition-client-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/enhancedposition-client-plugin/CMakeLists.txt
@@ -28,29 +28,6 @@ set(CMAKE_CXX_FLAGS "-Wall -std=c++0x")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
-
-# DBus Path
-if(DBUS_LIB_PATH)
-  set(DBUS_INCLUDE_DIRS ${DBUS_LIB_PATH}/include/dbus-1.0 ${DBUS_LIB_PATH}/lib/dbus-1.0/include)
-  set(DBUS_LIBDIR ${DBUS_LIB_PATH}/lib)
-  set(DBUS_LIBRARIES ${DBUS_LIB_PATH}/lib/libdbus-1.so)
-else()
-  message(FATAL_ERROR "Please specify the path to your patched DBus library using -DDBUS_LIB_PATH=yourPath")
-endif()
-
-# Packages
-find_package(CommonAPI 3.1.5 REQUIRED)
-find_package(CommonAPI-DBus 3.1.5 REQUIRED)
-
-
-#pkg_check_modules(DBUS "dbus-1 >= 1.8.4") // #to be fixed, it doesn't work so the paths are set manually (see above)
-pkg_check_modules(COMMONAPI "CommonAPI >= 3.1.5")
-pkg_check_modules(COMMONAPI_DBUS "CommonAPI-DBus >= 3.1.5")
-pkg_check_modules(GOBJECT gobject-2.0)
-pkg_check_modules(GLIB REQUIRED glib-2.0)
-pkg_check_modules(DBUS_CPP_GLIB dbus-c++-glib-1)
-
-
 # Path to the generated files
 set(PRJ_SRC_GEN_ENHANCEDPOSITIONSERVICE_PATH "${COMMONAPI_GEN_DIR_POSITIONING}/org/genivi/EnhancedPositionService") #files shared by the enhanced position service APIs
 
diff --git a/src/navigation/navigation-core/guidance-server-plugin/CMakeLists.txt b/src/navigation/navigation-core/guidance-server-plugin/CMakeLists.txt
index 8477e5b..749b82a 100644
--- a/src/navigation/navigation-core/guidance-server-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/guidance-server-plugin/CMakeLists.txt
@@ -28,29 +28,6 @@ set(CMAKE_CXX_FLAGS "-Wall -std=c++0x")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
-
-# DBus Path
-if(DBUS_LIB_PATH)
-  set(DBUS_INCLUDE_DIRS ${DBUS_LIB_PATH}/include/dbus-1.0 ${DBUS_LIB_PATH}/lib/dbus-1.0/include)
-  set(DBUS_LIBDIR ${DBUS_LIB_PATH}/lib)
-  set(DBUS_LIBRARIES ${DBUS_LIB_PATH}/lib/libdbus-1.so)
-else()
-  message(FATAL_ERROR "Please specify the path to your patched DBus library using -DDBUS_LIB_PATH=yourPath")
-endif()
-
-# Packages
-find_package(CommonAPI 3.1.5 REQUIRED)
-find_package(CommonAPI-DBus 3.1.5 REQUIRED)
-
-
-#pkg_check_modules(DBUS "dbus-1 >= 1.8.4") // #to be fixed, it doesn't work so the paths are set manually (see above)
-pkg_check_modules(COMMONAPI "CommonAPI >= 3.1.5")
-pkg_check_modules(COMMONAPI_DBUS "CommonAPI-DBus >= 3.1.5")
-pkg_check_modules(GOBJECT gobject-2.0)
-pkg_check_modules(GLIB REQUIRED glib-2.0)
-pkg_check_modules(DBUS_CPP_GLIB dbus-c++-glib-1)
-
-
 # Path to the generated files
 set(API_VERSION_MAJOR 4)
 set(API_VERSION "v${API_VERSION_MAJOR}")
diff --git a/src/navigation/navigation-core/locationinput-server-plugin/CMakeLists.txt b/src/navigation/navigation-core/locationinput-server-plugin/CMakeLists.txt
index 5cee666..20cb3ac 100644
--- a/src/navigation/navigation-core/locationinput-server-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/locationinput-server-plugin/CMakeLists.txt
@@ -28,29 +28,6 @@ set(CMAKE_CXX_FLAGS "-Wall -std=c++0x")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
-
-# DBus Path
-if(DBUS_LIB_PATH)
-  set(DBUS_INCLUDE_DIRS ${DBUS_LIB_PATH}/include/dbus-1.0 ${DBUS_LIB_PATH}/lib/dbus-1.0/include)
-  set(DBUS_LIBDIR ${DBUS_LIB_PATH}/lib)
-  set(DBUS_LIBRARIES ${DBUS_LIBDIR}/libdbus-1.so)
-else()
-  message(FATAL_ERROR "Please specify the path to your patched DBus library using -DDBUS_LIB_PATH=yourPath")
-endif()
-
-# Packages
-find_package(CommonAPI 3.1.5 REQUIRED)
-find_package(CommonAPI-DBus 3.1.5 REQUIRED)
-
-
-#pkg_check_modules(DBUS "dbus-1 >= 1.8.4") // #to be fixed, it doesn't work so the paths are set manually (see above)
-pkg_check_modules(COMMONAPI "CommonAPI >= 3.1.5")
-pkg_check_modules(COMMONAPI_DBUS "CommonAPI-DBus >= 3.1.5")
-pkg_check_modules(GOBJECT gobject-2.0)
-pkg_check_modules(GLIB REQUIRED glib-2.0)
-pkg_check_modules(DBUS_CPP_GLIB dbus-c++-glib-1)
-
-
 # Path to the generated files
 set(API_VERSION_MAJOR 4)
 set(API_VERSION "v${API_VERSION_MAJOR}")
diff --git a/src/navigation/navigation-core/mapmatchedposition-server-plugin/CMakeLists.txt b/src/navigation/navigation-core/mapmatchedposition-server-plugin/CMakeLists.txt
index 1251da4..bf5cac5 100644
--- a/src/navigation/navigation-core/mapmatchedposition-server-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/mapmatchedposition-server-plugin/CMakeLists.txt
@@ -28,29 +28,6 @@ set(CMAKE_CXX_FLAGS "-Wall -std=c++0x")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
-
-# DBus Path
-if(DBUS_LIB_PATH)
-  set(DBUS_INCLUDE_DIRS ${DBUS_LIB_PATH}/include/dbus-1.0 ${DBUS_LIB_PATH}/lib/dbus-1.0/include)
-  set(DBUS_LIBDIR ${DBUS_LIB_PATH}/lib)
-  set(DBUS_LIBRARIES ${DBUS_LIB_PATH}/lib/libdbus-1.so)
-else()
-  message(FATAL_ERROR "Please specify the path to your patched DBus library using -DDBUS_LIB_PATH=yourPath")
-endif()
-
-# Packages
-find_package(CommonAPI 3.1.5 REQUIRED)
-find_package(CommonAPI-DBus 3.1.5 REQUIRED)
-
-
-#pkg_check_modules(DBUS "dbus-1 >= 1.8.4") // #to be fixed, it doesn't work so the paths are set manually (see above)
-pkg_check_modules(COMMONAPI "CommonAPI >= 3.1.5")
-pkg_check_modules(COMMONAPI_DBUS "CommonAPI-DBus >= 3.1.5")
-pkg_check_modules(GOBJECT gobject-2.0)
-pkg_check_modules(GLIB REQUIRED glib-2.0)
-pkg_check_modules(DBUS_CPP_GLIB dbus-c++-glib-1)
-
-
 # Path to the generated files
 set(API_VERSION_MAJOR 4)
 set(API_VERSION "v${API_VERSION_MAJOR}")
diff --git a/src/navigation/navigation-core/poicam-server-plugin/CMakeLists.txt b/src/navigation/navigation-core/poicam-server-plugin/CMakeLists.txt
index dee705b..2256ffa 100644
--- a/src/navigation/navigation-core/poicam-server-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/poicam-server-plugin/CMakeLists.txt
@@ -28,29 +28,6 @@ set(CMAKE_CXX_FLAGS "-Wall -std=c++0x")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
-
-# DBus Path
-if(DBUS_LIB_PATH)
-  set(DBUS_INCLUDE_DIRS ${DBUS_LIB_PATH}/include/dbus-1.0 ${DBUS_LIB_PATH}/lib/dbus-1.0/include)
-  set(DBUS_LIBDIR ${DBUS_LIB_PATH}/lib)
-  set(DBUS_LIBRARIES ${DBUS_LIB_PATH}/lib/libdbus-1.so)
-else()
-  message(FATAL_ERROR "Please specify the path to your patched DBus library using -DDBUS_LIB_PATH=yourPath")
-endif()
-
-# Packages
-find_package(CommonAPI 3.1.5 REQUIRED)
-find_package(CommonAPI-DBus 3.1.5 REQUIRED)
-
-
-#pkg_check_modules(DBUS "dbus-1 >= 1.8.4") // #to be fixed, it doesn't work so the paths are set manually (see above)
-pkg_check_modules(COMMONAPI "CommonAPI >= 3.1.5")
-pkg_check_modules(COMMONAPI_DBUS "CommonAPI-DBus >= 3.1.5")
-pkg_check_modules(GOBJECT gobject-2.0)
-pkg_check_modules(GLIB REQUIRED glib-2.0)
-pkg_check_modules(DBUS_CPP_GLIB dbus-c++-glib-1)
-
-
 # Path to the generated files
 set(API_VERSION_MAJOR 4)
 set(API_VERSION "v${API_VERSION_MAJOR}")
diff --git a/src/navigation/navigation-core/routing-server-plugin/CMakeLists.txt b/src/navigation/navigation-core/routing-server-plugin/CMakeLists.txt
index c8d0a5b..ea1fbcf 100644
--- a/src/navigation/navigation-core/routing-server-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/routing-server-plugin/CMakeLists.txt
@@ -28,29 +28,6 @@ set(CMAKE_CXX_FLAGS "-Wall -std=c++0x")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
-
-# DBus Path
-if(DBUS_LIB_PATH)
-  set(DBUS_INCLUDE_DIRS ${DBUS_LIB_PATH}/include/dbus-1.0 ${DBUS_LIB_PATH}/lib/dbus-1.0/include)
-  set(DBUS_LIBDIR ${DBUS_LIB_PATH}/lib)
-  set(DBUS_LIBRARIES ${DBUS_LIB_PATH}/lib/libdbus-1.so)
-else()
-  message(FATAL_ERROR "Please specify the path to your patched DBus library using -DDBUS_LIB_PATH=yourPath")
-endif()
-
-# Packages
-find_package(CommonAPI 3.1.5 REQUIRED)
-find_package(CommonAPI-DBus 3.1.5 REQUIRED)
-
-
-#pkg_check_modules(DBUS "dbus-1 >= 1.8.4") // #to be fixed, it doesn't work so the paths are set manually (see above)
-pkg_check_modules(COMMONAPI "CommonAPI >= 3.1.5")
-pkg_check_modules(COMMONAPI_DBUS "CommonAPI-DBus >= 3.1.5")
-pkg_check_modules(GOBJECT gobject-2.0)
-pkg_check_modules(GLIB REQUIRED glib-2.0)
-pkg_check_modules(DBUS_CPP_GLIB dbus-c++-glib-1)
-
-
 # Path to the generated files
 set(API_VERSION_MAJOR 4)
 set(API_VERSION "v${API_VERSION_MAJOR}")
diff --git a/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx
index bef3b16..ae10e09 100644
--- a/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx
+++ b/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx
@@ -405,7 +405,7 @@ class  RoutingServerStub : public RoutingStubDefault
      *   starting from the one closest to the current position to the one closest to
      *   the destination
      */
-    void getRouteSegments(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _routeHandle, int16_t _detailLevel, std::vector<Routing::RouteSegmentType> _valuesToReturn, uint32_t _numberOfSegments, uint32_t _offset, getRouteSegmentsReply_t _reply){
+    void getRouteSegments(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _routeHandle, int16_t _detailLevel, std::vector< Routing::RouteSegmentType > _valuesToReturn, uint32_t _numberOfSegments, uint32_t _offset, getRouteSegmentsReply_t _reply){
         dbg(lvl_debug,"enter\n");
         uint32_t _totalNumberOfSegments;
         std::vector<Routing::RouteSegment> _routeSegments;
diff --git a/src/navigation/navigation-core/session-server-plugin/CMakeLists.txt b/src/navigation/navigation-core/session-server-plugin/CMakeLists.txt
index 680f83c..5a4931a 100644
--- a/src/navigation/navigation-core/session-server-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/session-server-plugin/CMakeLists.txt
@@ -27,29 +27,6 @@ set(CMAKE_CXX_FLAGS "-Wall -std=c++0x")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
-
-# DBus Path
-if(DBUS_LIB_PATH)
-  set(DBUS_INCLUDE_DIRS ${DBUS_LIB_PATH}/include/dbus-1.0 ${DBUS_LIB_PATH}/lib/dbus-1.0/include)
-  set(DBUS_LIBDIR ${DBUS_LIB_PATH}/lib)
-  set(DBUS_LIBRARIES ${DBUS_LIB_PATH}/lib/libdbus-1.so)
-else()
-  message(FATAL_ERROR "Please specify the path to your patched DBus library using -DDBUS_LIB_PATH=yourPath")
-endif()
-
-# Packages
-find_package(CommonAPI 3.1.5 REQUIRED)
-find_package(CommonAPI-DBus 3.1.5 REQUIRED)
-
-
-#pkg_check_modules(DBUS "dbus-1 >= 1.8.4") // #to be fixed, it doesn't work so the paths are set manually (see above)
-pkg_check_modules(COMMONAPI "CommonAPI >= 3.1.5")
-pkg_check_modules(COMMONAPI_DBUS "CommonAPI-DBus >= 3.1.5")
-pkg_check_modules(GOBJECT gobject-2.0)
-pkg_check_modules(GLIB REQUIRED glib-2.0)
-pkg_check_modules(DBUS_CPP_GLIB dbus-c++-glib-1)
-
-
 # Path to the generated files
 set(API_VERSION_MAJOR 4)
 set(API_VERSION "v${API_VERSION_MAJOR}")