--- a/locationmanager/locationtrail/inc/cnetworkinfo.h	Wed Sep 15 12:40:59 2010 +0300
+++ b/locationmanager/locationtrail/inc/cnetworkinfo.h	Wed Oct 13 15:02:02 2010 +0300
@@ -20,8 +20,6 @@
 #define C_CNETWORKINFO_H
 
 #include <etel3rdparty.h>
-#include <etel.h>
-#include <etelmm.h>
 
 /**
 *  An observer interface, which is used for getting current network cell id.
@@ -36,12 +34,6 @@
      * location trail.
      */
     virtual void NetworkInfo( const CTelephony::TNetworkInfoV1 &aNetworkInfo, const TInt aError ) = 0;
-
-    /**
-     * Get mobile phone object for network info object
-     * @return mobile phone object
-     */
-    virtual RMobilePhone& GetMobilePhone4NwInfo() = 0;
     };
 
 /**
@@ -63,33 +55,6 @@
      */    
     IMPORT_C virtual ~CNetworkInfo();
 
-    /**
-     * Listen to n/w info change
-     * @since S60 9.2
-     */    
-    IMPORT_C void StartNwInfoChangeNotifier();
-
-   /**
-     * Stop n/w info change listener
-     * @since S60 9.2
-     */    
-   IMPORT_C void StopNwInfoChangeNotifier();
-   
-   /**
-     * Map etel to ctelephony
-     * @since S60 9.2
-     */    
-   IMPORT_C static void MapNetworkInfo(CTelephony::TNetworkInfoV1* aISVNetworkInfo, 
-       RMobilePhone::TMobilePhoneNetworkInfoV2* aMMNetworkInfo, 
-       RMobilePhone::TMobilePhoneLocationAreaV1* aMMArea);
-    
-    /*
-    * Get registrer network country code
-    *
-    * @return current register n/w info
-    */
-    RMobilePhone::TMobilePhoneNetworkInfoV2& GetCurrentRegisterNw();
-    
 protected:
     /**
      * Run error implementation in case of RunL leaving.
@@ -120,13 +85,6 @@
     void RunL(); 
 
 private:
-   typedef enum
-    {
-    ENetworkInfoNoOptState = 0x00,
-    ENetworkInfoOptGetState,
-    ENetworkInfoOptNotifyState
-    }TNetworkInfoOptState;
-   
     /**
      * An observer interface to set current cell id to the location trail.
      * Not own.
@@ -134,23 +92,18 @@
     MNetworkInfoObserver* iTrail;
     
     /**
-     * phone object to retrieve modem parameters
-     */ 
-    RMobilePhone& iMobilePhone;
-
-    /**
-     * Maintain the operation state.
+     * Flag to indicate that we retrieve network info for the first time.
      */ 
-    TNetworkInfoOptState iState;
-
-    /*
-    * Retained this object just to give backward compatibility
-    */
+    TBool iFirstTime;
+    
+    /**
+     * Interface to phone's telephony system to get Cell Id.
+     * Own.
+     */
+    CTelephony* iTelephony;
+    
     CTelephony::TNetworkInfoV1 iNetworkInfoV1;
-
-	RMobilePhone::TMobilePhoneNetworkInfoV2 iMMNetworkInfo;
-	RMobilePhone::TMobilePhoneNetworkInfoV2Pckg iMMNetworkInfoPckg;
-	RMobilePhone::TMobilePhoneLocationAreaV1 iMMArea;
+    CTelephony::TNetworkInfoV1Pckg iNetworkInfoV1Pckg;
     };
 
 #endif // C_CNETWORKINFO_H