--- a/locationmanager/geotagger/src/cinternalgeotagger.cpp	Thu Sep 02 20:52:02 2010 +0300
+++ b/locationmanager/geotagger/src/cinternalgeotagger.cpp	Fri Sep 17 08:32:54 2010 +0300
@@ -24,10 +24,6 @@
 #include "mdeconstants.h"
 #include "mdesession.h"
 #include "cinternalgeotagger.h"
-#ifdef LOC_REVERSEGEOCODE
-#include "reversegeocoderplugin.h"
-const TUid KReverseGeoCodeUid = {0x2002DD12};
-#endif
 
 using namespace MdeConstants;
 
@@ -113,15 +109,15 @@
     //for reverse geocoding (geo-tagging)
     
 #ifdef LOC_REVERSEGEOCODE
-      
-	   TRAP_IGNORE(
-        iRevGeocoderPlugin = reinterpret_cast<CReverseGeoCoderPlugin*>(
-           REComSession::CreateImplementationL(KReverseGeoCodeUid, iDtorKey));)
-           	
-        if( iRevGeocoderPlugin )
-			{
-            iRevGeocoderPlugin->AddObserverL(*this); 
-			}
+    	
+		TInt pluginerr = KErrNone;
+    TRAP(pluginerr,iRevGeocoderPlugin = CReverseGeoCoderPlugin::NewL());
+    		
+   if(pluginerr == KErrNone)
+   	{
+		iRevGeocoderPlugin->AddObserverL(*this);
+	 	}
+
 
 #endif //LOC_REVERSEGEOCODE
 
@@ -168,7 +164,7 @@
     iTagCreator = NULL;
     delete iRevGeocoderPlugin;
     iRevGeocoderPlugin = NULL;
-    REComSession::DestroyedImplementation(iDtorKey);	
+
 #endif //LOC_REVERSEGEOCODE
     if(iMdeSessionOwnFlag)
         {