X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2a6cdce89409dc0275e23523c3807972a82f2cf7..fdd708fdeb5ddbb23b471a4a309d7f107a3c67b3:/Navigation.py

diff --git a/Navigation.py b/Navigation.py
index 03a1c618..6934f11f 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -11,15 +11,11 @@ class Navigation:
 			raise NavigationInstance.instance
 		
 		NavigationInstance.instance = self
-		self.ServiceHandler = eServiceCenterPtr()
-		eServiceCenter.getInstance(self.ServiceHandler)
+		self.ServiceHandler = eServiceCenter.getInstance()
 
 		import Navigation as Nav
 		Nav.navcore = self
 		
-		print "Navcore instance set!"
-		print Nav.navcore
-		
 		self.pnav = pNavigation()
 		self.pnav.m_event.get().append(self.callEvent)
 		self.event = [ ]
@@ -45,12 +41,12 @@ class Navigation:
 		print "recording service: %s" % (str(ref))
 		if isinstance(ref, ServiceReference.ServiceReference):
 			ref = ref.ref
-		service = iRecordableServicePtr()
-		if self.pnav.recordService(ref, service):
+		service = self.pnav.recordService(ref)
+		
+		if service is None:
 			print "record returned non-zero"
 			return None
 		else:
-			print "ok, recordService didn't fail"
 			return service
 	
 	def enqueueService(self, ref):