equal
deleted
inserted
replaced
162 TFileName dllFileName; |
162 TFileName dllFileName; |
163 Dll::FileName( dllFileName ); |
163 Dll::FileName( dllFileName ); |
164 |
164 |
165 TFileName resourceFileName; |
165 TFileName resourceFileName; |
166 resourceFileName.Copy( TParsePtrC( dllFileName ).Drive() ); |
166 resourceFileName.Copy( TParsePtrC( dllFileName ).Drive() ); |
167 |
167 |
168 parse.Set( GetStoreFormatResourceFileL(), &KDC_RESOURCE_FILES_DIR, NULL ); |
168 resourceFileName.Append( GetStoreFormatResourceFileL() ); |
|
169 |
|
170 parse.Set( resourceFileName, &KDC_RESOURCE_FILES_DIR, NULL ); |
169 |
171 |
170 fileName = parse.FullName(); |
172 fileName = parse.FullName(); |
|
173 |
|
174 DBG_ARGS(_S("CNSmlContactsDataProvider::SetOwnStoreFormatL(): '%S'"), &parse.FullName()); |
171 |
175 |
172 RResourceFile resourceFile; |
176 RResourceFile resourceFile; |
173 BaflUtils::NearestLanguageFile( iRfs, fileName ); |
177 BaflUtils::NearestLanguageFile( iRfs, fileName ); |
174 |
178 |
175 resourceFile.OpenL( iRfs,fileName ); |
179 resourceFile.OpenL( iRfs,fileName ); |
299 TInt error = RProperty::Get( KPSUidDataSynchronizationInternalKeys, |
303 TInt error = RProperty::Get( KPSUidDataSynchronizationInternalKeys, |
300 KDataSyncStatus, |
304 KDataSyncStatus, |
301 value ); |
305 value ); |
302 if ( error == KErrNone && value == EDataSyncRunning ) |
306 if ( error == KErrNone && value == EDataSyncRunning ) |
303 { |
307 { |
304 _DBG_FILE("CNSmlContactsDataProvider::GetStoreFormatResourceFileL(): END"); |
308 _DBG_FILE("CNSmlContactsDataProvider::GetStoreFormatResourceFileL() 1.1.2 : END"); |
305 return KNSmlContactsStoreFormatRsc_1_1_2; |
309 return KNSmlContactsStoreFormatRsc_1_1_2; |
306 } |
310 } |
307 else // error or protocol version 1.2 |
311 else // error or protocol version 1.2 |
308 { |
312 { |
309 _DBG_FILE("CNSmlContactsDataProvider::GetStoreFormatResourceFileL(): END"); |
313 _DBG_FILE("CNSmlContactsDataProvider::GetStoreFormatResourceFileL() 1.2 : END"); |
310 return KNSmlContactsStoreFormatRsc_1_2; |
314 return KNSmlContactsStoreFormatRsc_1_2; |
311 } |
315 } |
312 } |
316 } |
313 |
317 |
314 // ------------------------------------------------------------------------------------------------ |
318 // ------------------------------------------------------------------------------------------------ |