diff -r 33a5d2bbf6fc -r 73a1feb507fb mmsharing/mmshavailability/inc/musavacontactavailability.h
--- a/mmsharing/mmshavailability/inc/musavacontactavailability.h	Thu Aug 19 09:51:39 2010 +0300
+++ b/mmsharing/mmshavailability/inc/musavacontactavailability.h	Tue Aug 31 15:12:07 2010 +0300
@@ -22,19 +22,16 @@
 #include "musavaavailability.h"
 #include "musunittesting.h"
 #include "mussettingskeys.h"
-#include "muscallmonitorobserver.h"
+
 #include <badesca.h>
-#include <PbkFields.hrh>
 
 class MMusAvaAvailabilityObserver;
 class MMusAvaObserver;
 class CMusAvaSharedObject;
-class CPbkContactEngine;
 class CContactIdArray;
-class CPbkContactItem;
 class CContactItem;
 class CMusAvaSettingsImp;
-class CMusAvaCallEventMonitor;
+
 
 /**
  *  Implemets register vailability.
@@ -43,8 +40,7 @@
  *
  *  @lib musavailabilityplugin.lib
  */
-class CMusAvaContactAvailability : public CMusAvaAvailability,
-								   public MMusCallMonitorObserver
+class CMusAvaContactAvailability : public CMusAvaAvailability
 	{
 
 public:
@@ -99,118 +95,23 @@
      * @return Name of *this* availability.
      */
     virtual MMusAvaObserver::TAvailabilityName Name();
-    // from class MMusCallMonitorObserver
-    /**
-    * Call connected
-    *
-    * @since  S60 v3.2
-    * @return
-    */
-    virtual void CallConnectedL( const TDesC& aTelNumber );
-    
-    /**
-    * Call on hold
-    *
-    * @since  S60 v3.2
-    * @return
-    */
-    virtual void CallHoldL( const TDesC& aTelNumber );
-
-    /**
-    * Call disconnected
-    *
-    * @since  S60 v3.2
-    * @return
-    */
-    virtual void NoActiveCallL();
-
-    /**
-    * Call on hold
-    *
-    * @since  S60 v3.2
-    * @return
-    */
-    virtual void ConferenceCallL();
-    
-    
-    virtual void ConferenceCallLTerminated();
 
 private:
 
      /**
      *
      */
-	TBool ActiveCallL( CDesCArrayFlat*& aContactsArray );
-
-     /**
-     *
-     */
-    TBool ContactL( CContactIdArray*& aContactIdArray,
-                    CPbkContactEngine& aPbkContactEngine );
-
-     /**
-     *
-     */
-    void UpdateContactNameL( CContactItem& aContactItem );
-
-     /**
-     *
-     */
-    TInt ContactArrayL(  CContactIdArray*& aContactIdArray,
-                         CPbkContactEngine& aPbkContactEngine );
-
-     /**
-     *
-     */
-    TInt ContactItem( CContactIdArray& aContactIdArray,
-                       CPbkContactItem*& aPbkContactItem,
-                       CPbkContactEngine& aPbkContactEngine );
-
-    /**
-    *
-    */
-    TBool ContactId( CPbkContactItem& aPbkItem,
-                    TPbkFieldId aTPbkFieldId  );
-    /**
-    *
-    */
-    TPbkFieldId ContactIdSearch( CContactIdArray& aContactIdArray,
-                                  CPbkContactEngine& aPbkContactEngine );
-
-     /**
-     *
-     */
-    TBool PhoneResolutionL( CPbkContactItem& aPbkItem,
-                            CDesCArrayFlat*& aContactsArray  );
+    TBool ActiveCallL( CDesCArrayFlat*& aContactsArray );
 
 
      /**
      *
      */
-    TBool ResolveAddressesL( CPbkContactItem& aPbkItem,
-                             CDesCArrayFlat*& aContactsArray,
-                             TPbkFieldId aTPbkFieldId  );
-
-     /**
-     *
-     */
-    TBool ResolvePhoneContactL( CPbkContactItem& aPbkItem,
-                                CDesCArrayFlat*& aContactsArray );
+    TBool ResolveAddressesL( const TDesC& aContactId,
+                             CDesCArrayFlat*& aContactsArray );
 
-    /* -------------------------------------------------------------------------
-    *  Checks that whether aDesItem present in aDesArray.
-    *  Utility function used to avoid dublication.
-    * -------------------------------------------------------------------------
-    */
-    TBool IsExistAlready(const MDesCArray& aDesArray,
-                                          const TDesC& aDesItem);
-
+    
 private:
-    /**
-    * iPhoneStatus subscribe property resource. When the resource 
-    * changed somewhere,availability will get notification.
-    */
-    CMusAvaCallEventMonitor* iPhoneStatus;
 
      /**
      * resolved contact name
@@ -236,4 +137,4 @@
     };
 
 
-#endif // __MUSAVACONTACTAVAILABILITY_H__
\ No newline at end of file
+#endif // __MUSAVACONTACTAVAILABILITY_H__