# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1272642513 -3600
# Node ID 75c06c88bfa367e9812b4084d1f07bb0d966f831
# Parent  6d5320894977933f0b0a099c2e1188f63aa77b39# Parent  9bab6ffc7f45d073360c2b0caf1aa6a67023dd8d
Merge fix for bug 2611

diff -r 9bab6ffc7f45 -r 75c06c88bfa3 networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp
--- a/networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp	Tue Apr 27 18:14:09 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp	Fri Apr 30 16:48:33 2010 +0100
@@ -34,7 +34,9 @@
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY     	euser.lib efsrv.lib 
-LIBRARY		cinidata.lib
+// darios: cinidata is deprecated, see bug #1894
+//LIBRARY		cinidata.lib
+LIBRARY		IniParser.lib
 
 epocheapsize  1000 6000000
 CAPABILITY All -Tcb
diff -r 9bab6ffc7f45 -r 75c06c88bfa3 networkingtestandutils/networkingintegrationtest/inc/TestStep.h
--- a/networkingtestandutils/networkingintegrationtest/inc/TestStep.h	Tue Apr 27 18:14:09 2010 +0300
+++ b/networkingtestandutils/networkingintegrationtest/inc/TestStep.h	Fri Apr 30 16:48:33 2010 +0100
@@ -26,7 +26,9 @@
 #if (!defined __TESTSTEP_H__)
 #define __TESTSTEP_H__
 
-#include "cinidata.h"
+// darios: cinidata is deprecated, see bug #1894
+//#include "cinidata.h"
+#include <iniparser.h>
 #include "networking/log.h"
 
 class CTestSuite;