# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279813030 -3600
# Node ID 60521bbb1b721248d63d1601eaf36cc233540c48
# Parent  4d2d69762e13ffc20916a58097dcf97271c82cb9# Parent  f4f0635530ced5a3f59c4dc18521a77d419508e5
Catchup to latest Symbian^4

diff -r f4f0635530ce -r 60521bbb1b72 imservices/imfeatureplugin/srcimdatamodel/group/imdatamodel.mmp
--- a/imservices/imfeatureplugin/srcimdatamodel/group/imdatamodel.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/imfeatureplugin/srcimdatamodel/group/imdatamodel.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -71,7 +71,7 @@
 
 //EXPORTUNFROZEN
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 imservices/imfeatureplugin/srcimdatamodel/group/imdatamodelhook.mmp
--- a/imservices/imfeatureplugin/srcimdatamodel/group/imdatamodelhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/imfeatureplugin/srcimdatamodel/group/imdatamodelhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -52,7 +52,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 imservices/imfeatureplugin/srcimfrontend/group/imecomhook.mmp
--- a/imservices/imfeatureplugin/srcimfrontend/group/imecomhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/imfeatureplugin/srcimfrontend/group/imecomhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -54,7 +54,7 @@
 
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 imservices/imfeatureplugin/srcimfrontend/group/immanager.mmp
--- a/imservices/imfeatureplugin/srcimfrontend/group/immanager.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/imfeatureplugin/srcimfrontend/group/immanager.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -67,7 +67,7 @@
 //EXPORTUNFROZEN
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 imservices/imfeatureplugin/srcimoperations/group/imoperation.mmp
--- a/imservices/imfeatureplugin/srcimoperations/group/imoperation.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/imfeatureplugin/srcimoperations/group/imoperation.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -73,7 +73,7 @@
 //EXPORTUNFROZEN
 
                
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 imservices/imfeatureplugin/srcimoperations/group/imoperationshook.mmp
--- a/imservices/imfeatureplugin/srcimoperations/group/imoperationshook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/imfeatureplugin/srcimoperations/group/imoperationshook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -54,7 +54,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 imservices/imfeatureplugin/srcimprocessor/group/improcessor.mmp
--- a/imservices/imfeatureplugin/srcimprocessor/group/improcessor.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/imfeatureplugin/srcimprocessor/group/improcessor.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -63,7 +63,7 @@
 
 //EXPORTUNFROZEN
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 imservices/imfeatureplugin/srcimprocessor/group/improcessorhook.mmp
--- a/imservices/imfeatureplugin/srcimprocessor/group/improcessorhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/imfeatureplugin/srcimprocessor/group/improcessorhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -54,7 +54,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 imservices/searchfeatureplugin/srcsearchdatamodel/group/searchdatamodel.mmp
--- a/imservices/searchfeatureplugin/srcsearchdatamodel/group/searchdatamodel.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/searchfeatureplugin/srcsearchdatamodel/group/searchdatamodel.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -67,7 +67,7 @@
 LIBRARY         		flogger.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 imservices/searchfeatureplugin/srcsearchdatamodel/group/searchdatamodelhook.mmp
--- a/imservices/searchfeatureplugin/srcsearchdatamodel/group/searchdatamodelhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/searchfeatureplugin/srcsearchdatamodel/group/searchdatamodelhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -52,7 +52,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 imservices/searchfeatureplugin/srcsearchfrontend/group/searchecomhook.mmp
--- a/imservices/searchfeatureplugin/srcsearchfrontend/group/searchecomhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/searchfeatureplugin/srcsearchfrontend/group/searchecomhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -54,7 +54,7 @@
 
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 imservices/searchfeatureplugin/srcsearchfrontend/group/searchmanager.mmp
--- a/imservices/searchfeatureplugin/srcsearchfrontend/group/searchmanager.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/searchfeatureplugin/srcsearchfrontend/group/searchmanager.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -67,7 +67,7 @@
 //EXPORTUNFROZEN
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 imservices/searchfeatureplugin/srcsearchoperations/group/searchoperation.mmp
--- a/imservices/searchfeatureplugin/srcsearchoperations/group/searchoperation.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/searchfeatureplugin/srcsearchoperations/group/searchoperation.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -74,7 +74,7 @@
 LIBRARY                 flogger.lib 
 
                
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 imservices/searchfeatureplugin/srcsearchoperations/group/searchoperationshook.mmp
--- a/imservices/searchfeatureplugin/srcsearchoperations/group/searchoperationshook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/searchfeatureplugin/srcsearchoperations/group/searchoperationshook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -54,7 +54,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 imservices/searchfeatureplugin/srcsearchprocessor/group/searchprocessor.mmp
--- a/imservices/searchfeatureplugin/srcsearchprocessor/group/searchprocessor.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/searchfeatureplugin/srcsearchprocessor/group/searchprocessor.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -64,7 +64,7 @@
 
 //EXPORTUNFROZEN
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 imservices/searchfeatureplugin/srcsearchprocessor/group/searchprocessorhook.mmp
--- a/imservices/searchfeatureplugin/srcsearchprocessor/group/searchprocessorhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/imservices/searchfeatureplugin/srcsearchprocessor/group/searchprocessorhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -54,7 +54,7 @@
 LIBRARY                 ecom.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../../eabi/ 
 #elif defined ( WINSCW )
 deffile ../../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 ximpfw/presence/eabi/presencedatamodelu.def
--- a/ximpfw/presence/eabi/presencedatamodelu.def	Fri Jun 11 13:59:20 2010 +0300
+++ b/ximpfw/presence/eabi/presencedatamodelu.def	Thu Jul 22 16:37:10 2010 +0100
@@ -226,7 +226,7 @@
 	_ZTI38CGroupMembersPresenceConfigurationItem @ 225 NONAME ; #<TI>#
 	_ZTI47CPresentityGroupMembersPresenceSubscriptionItem @ 226 NONAME ; #<TI>#
 	_ZTIN20CPresenceFilterStore27CPresenceFilterStoreMappingE @ 227 NONAME ; #<TI>#
-	_ZTIN22CPresenceInfoFilterImp12CFilterFieldE @ 228 NONAME ; #<TI>#
+	_ZTIN22CPresenceInfoFilterImp12CFilterFieldE @ 228 NONAME ABSENT ; #<TI>#
 	_ZTV18CPresenceDataCache @ 229 NONAME ; #<VT>#
 	_ZTV20CPresenceFilterStore @ 230 NONAME ; #<VT>#
 	_ZTV25CPresenceObjectFactoryImp @ 231 NONAME ; #<VT>#
@@ -242,6 +242,6 @@
 	_ZTV38CGroupMembersPresenceConfigurationItem @ 241 NONAME ; #<VT>#
 	_ZTV47CPresentityGroupMembersPresenceSubscriptionItem @ 242 NONAME ; #<VT>#
 	_ZTVN20CPresenceFilterStore27CPresenceFilterStoreMappingE @ 243 NONAME ; #<VT>#
-	_ZTVN22CPresenceInfoFilterImp12CFilterFieldE @ 244 NONAME ; #<VT>#
-	_ZThn4_NK21CPresenceBuddyInfoImp14EqualsIdentityEPK18MPresenceBuddyInfo @ 245 NONAME ; #<thunk>#
+	_ZTVN22CPresenceInfoFilterImp12CFilterFieldE @ 244 NONAME ABSENT ; #<VT>#
+	_ZThn4_NK21CPresenceBuddyInfoImp14EqualsIdentityEPK18MPresenceBuddyInfo @ 245 NONAME ABSENT ; #<thunk>#
 
diff -r f4f0635530ce -r 60521bbb1b72 ximpfw/presence/group/presencecacheclient.mmp
--- a/ximpfw/presence/group/presencecacheclient.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/ximpfw/presence/group/presencecacheclient.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -52,7 +52,7 @@
 LIBRARY                 presencedatamodel.lib
 LIBRARY                 ximpdatamodel.lib
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 ximpfw/presence/group/presencecacheecomhook.mmp
--- a/ximpfw/presence/group/presencecacheecomhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/ximpfw/presence/group/presencecacheecomhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -50,7 +50,7 @@
 LIBRARY                 presencecacheclient.lib
 LIBRARY                 ecom.lib
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 ximpfw/presence/group/presencedatamodelhook.mmp
--- a/ximpfw/presence/group/presencedatamodelhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/ximpfw/presence/group/presencedatamodelhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -53,7 +53,7 @@
 LIBRARY                 presencedatamodel.lib
 LIBRARY                 ecom.lib
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 ximpfw/presence/group/presenceecomhook.mmp
--- a/ximpfw/presence/group/presenceecomhook.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/ximpfw/presence/group/presenceecomhook.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -53,7 +53,7 @@
 LIBRARY                 presencemanager.lib
 LIBRARY                 ecom.lib
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwins/ 
diff -r f4f0635530ce -r 60521bbb1b72 ximpfw/presence/group/presencemanager.mmp
--- a/ximpfw/presence/group/presencemanager.mmp	Fri Jun 11 13:59:20 2010 +0300
+++ b/ximpfw/presence/group/presencemanager.mmp	Thu Jul 22 16:37:10 2010 +0100
@@ -66,7 +66,7 @@
 LIBRARY                 presencedatamodel.lib
 LIBRARY                 ximpsrvclient.lib
 
-#if defined( ARMCC )
+#if defined( EABI )
 DEFFILE ../eabi/ 
 #elif defined ( WINSCW )
 deffile ../bwins/