Binary file connectivitymodules/SeCon/group/stubs/sconftpplugin_stub.SIS has changed
Binary file connectivitymodules/SeCon/group/stubs/sconftpplugin_stub.sis has changed
Binary file connectivitymodules/SeCon/group/stubs/sconpcconnplugin_stub.SIS has changed
Binary file connectivitymodules/SeCon/group/stubs/sconpcconnplugin_stub.sis has changed
Binary file connectivitymodules/SeCon/group/stubs/secon_stub.SIS has changed
Binary file connectivitymodules/SeCon/group/stubs/secon_stub.sis has changed
Binary file connectivitymodules/SeCon/services/csc/bld/101F9698.xml has changed
Binary file connectivitymodules/SeCon/services/csc/bld/101F99F6.xml has changed
Binary file connectivitymodules/SeCon/services/csc/bld/101f9698.xml has changed
Binary file connectivitymodules/SeCon/services/csc/bld/101f99f6.xml has changed
--- a/connectivitymodules/SeCon/services/csc/src/sconversioninfo.cpp Mon May 03 12:24:28 2010 +0300
+++ b/connectivitymodules/SeCon/services/csc/src/sconversioninfo.cpp Tue Jul 13 03:28:47 2010 +0530
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -23,8 +23,7 @@
#include <etel3rdparty.h> // read imsi
#include <etel.h>
#include <etelmm.h>
-#include <e32event.h>
-#include <e32svr.h>
+#include <hal.h>
#include "caputils.h"
#include "debug.h"
@@ -200,13 +199,6 @@
iProductCode = info.AllocL();
}
- // screen size
- TPckgBuf<TScreenInfoV01> siBuf;
- UserSvr::ScreenInfo(siBuf);
- TScreenInfoV01& si=siBuf();
- iScreenSize = si.iScreenSize;
-
-
// read DesktopSync key value
CRepository* repository(NULL);
TRAP( iDesktopSyncError, repository = CRepository::NewL( KCRUidDSDCMOConfig ));
@@ -222,7 +214,9 @@
LOGGER_WRITE_1("Could not create CRepository, err: %d", iDesktopSyncError );
}
-
+ // screen size
+ HAL::Get(HAL::EDisplayXPixels, iScreenSize.iWidth);
+ HAL::Get(HAL::EDisplayYPixels, iScreenSize.iHeight);
iInfoFetched = ETrue;
TRACE_FUNC_EXIT;
--- a/connectivitymodules/SeCon/services/pcd/inc/sconpcdconsts.h Mon May 03 12:24:28 2010 +0300
+++ b/connectivitymodules/SeCon/services/pcd/inc/sconpcdconsts.h Tue Jul 13 03:28:47 2010 +0530
@@ -42,6 +42,7 @@
// ConML Status code: No memory
const TInt KSConCodeNoMemory( 420 );
+
// ConML Status codes in installer errorcases
const TInt KSConCodeInstErrUserCancel = KSConCodeCancelled; // User cancelled the operation
const TInt KSConCodeInstErrFileCorrupted = 600; // File is corrupted
@@ -57,6 +58,9 @@
const TInt KSConCodeInstErrAccessDenied = 608; // Target location of package is not accessible
const TInt KSConCodeInstUpgradeError = 609; // The package is an invalid upgrade
+// ConML Status code: 1001...1050 System wide error code
+const TInt KSConCodeFirstSymbianErr( 1000 );
+
struct SDeviceInfo
{
TSConMethodName method;
--- a/connectivitymodules/SeCon/services/pcd/inc/sconvideoparser.h Mon May 03 12:24:28 2010 +0300
+++ b/connectivitymodules/SeCon/services/pcd/inc/sconvideoparser.h Tue Jul 13 03:28:47 2010 +0530
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -141,9 +141,12 @@
private: // data
CVideoPlayerUtility* iVideoUtil;
CTNEVideoClipInfo* iVideoClip;
-
+
RWsSession iWsSession;
CWsScreenDevice* iScreen;
+ RWindow* iWindow;
+ RWindowGroup iRootWindow;
+
TRequestStatus* iCallerStatus;
CActiveSchedulerWait iWait;
CSconTimeOut* iTimeOut;
@@ -156,6 +159,7 @@
TBool iVideoClipReady;
TInt iVideoUtilErr;
TInt iVideoClipErr;
+ TBool iAsyncStopCalled;
};
#endif // SCONVIDEOPARSER_H
--- a/connectivitymodules/SeCon/services/pcd/src/sconbrqueue.cpp Mon May 03 12:24:28 2010 +0300
+++ b/connectivitymodules/SeCon/services/pcd/src/sconbrqueue.cpp Tue Jul 13 03:28:47 2010 +0530
@@ -30,12 +30,10 @@
//
CSConBackupRestoreQueue* CSConBackupRestoreQueue::NewL( const TInt aMaxObjectSize, RFs& aFs )
{
- TRACE_FUNC_ENTRY;
CSConBackupRestoreQueue* self = new (ELeave) CSConBackupRestoreQueue();
CleanupStack::PushL( self );
self->ConstructL( aMaxObjectSize, aFs );
CleanupStack::Pop( self );
- TRACE_FUNC_EXIT;
return self;
}
@@ -56,11 +54,9 @@
//
void CSConBackupRestoreQueue::ConstructL( const TInt aMaxObjectSize, RFs& aFs )
{
- TRACE_FUNC_ENTRY;
iBackupRestore = CSConBackupRestore::NewL( this, aMaxObjectSize, aFs );
CActiveScheduler::Add( iBackupRestore );
User::LeaveIfError( iTimer.CreateLocal() );
- TRACE_FUNC_EXIT;
}
// -----------------------------------------------------------------------------
@@ -88,7 +84,6 @@
//
void CSConBackupRestoreQueue::StartQueue()
{
- TRACE_FUNC_ENTRY;
if( IsActive() )
{
Cancel();
@@ -96,7 +91,6 @@
iTimer.After( iStatus, KSConTimerValue );
SetActive();
- TRACE_FUNC_EXIT;
}
// -----------------------------------------------------------------------------
@@ -106,9 +100,7 @@
//
void CSConBackupRestoreQueue::StopQueue()
{
- TRACE_FUNC_ENTRY;
iTimer.Cancel();
- TRACE_FUNC_EXIT;
}
// -----------------------------------------------------------------------------
@@ -139,7 +131,6 @@
}
ret = iQueue.InsertInOrder( aNewTask, CSConTaskQueue::Compare );
- LOGGER_WRITE_1( "CSConBackupRestoreQueue::AddNewTask() : returned %d", ret );
return ret;
}
@@ -189,7 +180,6 @@
//
void CSConBackupRestoreQueue::QueueAddress( CSConInstallerQueue*& aTaskQueue )
{
- TRACE_FUNC;
iInstQueueAddress = aTaskQueue;
}
@@ -253,14 +243,11 @@
//
void CSConBackupRestoreQueue::RunL()
{
- TRACE_FUNC_ENTRY;
- LOGGER_WRITE_1( "There are still %d tasks in this queue", iQueue.Count() );
if( iQueue.Count() > 0 )
{
PollQueue();
StartQueue();
}
- TRACE_FUNC_EXIT;
}
// End of file
--- a/connectivitymodules/SeCon/services/pcd/src/sconmetadata.cpp Mon May 03 12:24:28 2010 +0300
+++ b/connectivitymodules/SeCon/services/pcd/src/sconmetadata.cpp Tue Jul 13 03:28:47 2010 +0530
@@ -568,7 +568,7 @@
CleanupStack::PopAndDestroy( &file );
CleanupStack::PushL( readBuffer );
-
+ TRACE_FUNC_EXIT;
return readBuffer;
}
@@ -1023,19 +1023,21 @@
denom = 0;
Mem::Copy(&numer, ratData + ((y * 2) * sizeof(numer)), sizeof(numer));
Mem::Copy(&denom, ratData + (((y * 2) + 1) * sizeof(numer)), sizeof(denom));
-
- if ( y == 0 )// degrees
- {
- degrees = numer/denom;
- }
- else if ( y == 1 )// minutes
- {
- minutes = numer/denom;
- }
- else if ( y == 2 )// seconds
- {
- seconds = numer/denom;
- }
+ if (denom != 0)
+ {
+ if ( y == 0 )// degrees
+ {
+ degrees = numer/denom;
+ }
+ else if ( y == 1 )// minutes
+ {
+ minutes = numer/denom;
+ }
+ else if ( y == 2 )// seconds
+ {
+ seconds = numer/denom;
+ }
+ }
}
_LIT(KFormat, "%.0f°%.0f'%.2f\"" );
aPosDegrees.Format( KFormat, degrees, minutes, seconds );
--- a/connectivitymodules/SeCon/services/pcd/src/sconqueue.cpp Mon May 03 12:24:28 2010 +0300
+++ b/connectivitymodules/SeCon/services/pcd/src/sconqueue.cpp Tue Jul 13 03:28:47 2010 +0530
@@ -265,7 +265,17 @@
default :
iQueue[index]->SetCompleteValue( complete );
- progress = KSConCodeConflict;
+ if ( aError < KErrNone && aError >= KErrCorruptSurrogateFound )
+ {
+ // aError is always negative
+ // -> returned errorcode is from KSConCodeFirstSymbianErr...n
+ progress = KSConCodeFirstSymbianErr - aError;
+ }
+ else
+ {
+ progress = KSConCodeConflict;
+ }
+
break;
}
--- a/connectivitymodules/SeCon/services/pcd/src/sconvideoparser.cpp Mon May 03 12:24:28 2010 +0300
+++ b/connectivitymodules/SeCon/services/pcd/src/sconvideoparser.cpp Tue Jul 13 03:28:47 2010 +0530
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -27,7 +27,7 @@
_LIT( KMimeTypeAudio, "audio/*" );
_LIT( KMimeTypeVideo, "video/*" );
-const TInt KVideoClipTimeout( 10000000 ); // 10 sec.
+const TInt KRequestTimeOut( 20000000 ); // 20 sec.
// -----------------------------------------------------------------------------
// CSConVideoParser::CSConVideoParser()
@@ -57,6 +57,13 @@
iVideoUtil->Close();
}
delete iVideoUtil;
+
+ if ( iWindow )
+ {
+ iWindow->Close();
+ }
+ delete iWindow;
+ iRootWindow.Close();
delete iScreen;
iWsSession.Close();
@@ -90,26 +97,16 @@
User::LeaveIfError( iWsSession.Connect() );
iScreen = new(ELeave) CWsScreenDevice( iWsSession );
- iScreen->Construct();
-
- RWindowGroup wg( iWsSession );
- User::LeaveIfError( wg.Construct(reinterpret_cast<TUint32>(&wg), EFalse) );
- CleanupClosePushL( wg );
+ User::LeaveIfError( iScreen->Construct() );
- CWindowGc* gc;
- User::LeaveIfError( iScreen->CreateContext(gc) );
- CleanupStack::PushL(gc);
+ iRootWindow = RWindowGroup(iWsSession);
+ User::LeaveIfError( iRootWindow.Construct(reinterpret_cast<TUint32>(&iWsSession), EFalse) );
- RWindow window( iWsSession );
- User::LeaveIfError( window.Construct(wg, reinterpret_cast<TUint32>(&wg) + 1) );
- CleanupClosePushL( window );
+ iWindow = new(ELeave) RWindow( iWsSession );
+ User::LeaveIfError( iWindow->Construct(iRootWindow, reinterpret_cast<TUint32>(&iRootWindow) + 1) );
TRect temp(0,0,320,240); // dummy parameter
- iVideoUtil = CVideoPlayerUtility::NewL(*this, EMdaPriorityNormal, EMdaPriorityPreferenceNone, iWsSession, *(iScreen), window, temp, temp);
-
- CleanupStack::PopAndDestroy( &window );
- CleanupStack::PopAndDestroy( gc );
- CleanupStack::PopAndDestroy( &wg );
+ iVideoUtil = CVideoPlayerUtility::NewL(*this, EMdaPriorityNormal, EMdaPriorityPreferenceNone, iWsSession, *iScreen, *iWindow, temp, temp);
iTimeOut = CSconTimeOut::NewL( *this );
@@ -153,11 +150,13 @@
{
User::Leave( KErrNotFound );
}
-
+ iAsyncStopCalled = EFalse;
iVideoClip = CTNEVideoClipInfo::NewL( aFileName, *this );
iVideoUtil->OpenFileL( aFileName );
+ LOGGER_WRITE("Start timeout");
+ iTimeOut->Start( KRequestTimeOut );
LOGGER_WRITE("iWait.Start()");
iWait.Start();
@@ -356,6 +355,12 @@
void CSConVideoParser::MvpuoOpenComplete( TInt aError )
{
TRACE_FUNC_ENTRY;
+ if ( iVideoUtilReady )
+ {
+ // already timeout
+ LOGGER_WRITE("Already timeout");
+ return;
+ }
LOGGER_WRITE_1( "aError: %d", aError );
if ( aError == KErrNone )
{
@@ -367,8 +372,10 @@
iVideoUtilErr = aError;
}
- if ( iVideoUtilReady && iVideoClipReady )
+ if ( iVideoUtilReady && iVideoClipReady && !iAsyncStopCalled )
{
+ iAsyncStopCalled = ETrue;
+ iTimeOut->Cancel();
LOGGER_WRITE("AsyncStop");
iWait.AsyncStop();
}
@@ -383,13 +390,21 @@
void CSConVideoParser::MvpuoPrepareComplete( TInt aError )
{
TRACE_FUNC_ENTRY;
+ if ( iVideoUtilReady )
+ {
+ // already timeout
+ LOGGER_WRITE("Already timeout");
+ return;
+ }
LOGGER_WRITE_1( "aError: %d", aError );
iVideoUtilReady = ETrue;
iVideoUtilErr = aError;
- if ( iVideoUtilReady && iVideoClipReady )
+ if ( iVideoUtilReady && iVideoClipReady && !iAsyncStopCalled )
{
+ iAsyncStopCalled = ETrue;
+ iTimeOut->Cancel();
LOGGER_WRITE("AsyncStop");
iWait.AsyncStop();
}
@@ -431,6 +446,12 @@
void CSConVideoParser::NotifyVideoClipInfoReady(CTNEVideoClipInfo& aInfo, TInt aError)
{
TRACE_FUNC_ENTRY;
+ if ( iVideoClipReady )
+ {
+ // already timeout
+ LOGGER_WRITE("Already timeout");
+ return;
+ }
LOGGER_WRITE_1("aError: %d", aError);
if ( aError == KErrNone )
{
@@ -443,11 +464,6 @@
iVideoClipReady = ETrue;
iVideoClipErr = err;
}
- else
- {
- LOGGER_WRITE("Start timeout");
- iTimeOut->Start( KVideoClipTimeout );
- }
}
else
{
@@ -455,8 +471,10 @@
iVideoClipErr = aError;
}
- if ( iVideoUtilReady && iVideoClipReady )
+ if ( iVideoUtilReady && iVideoClipReady && !iAsyncStopCalled )
{
+ iAsyncStopCalled = ETrue;
+ iTimeOut->Cancel();
LOGGER_WRITE("AsyncStop");
iWait.AsyncStop();
}
@@ -473,8 +491,14 @@
CFbsBitmap* aThumb)
{
TRACE_FUNC_ENTRY;
+ if ( iVideoClipReady )
+ {
+ // already timeout
+ LOGGER_WRITE("Already timeout");
+ delete aThumb;
+ return;
+ }
LOGGER_WRITE_1("aError: %d", aError);
- iTimeOut->Cancel();
if ( aError == KErrNone)
{
delete iThumbnail;
@@ -500,8 +524,10 @@
iVideoClipReady = ETrue;
iVideoClipErr = aError;
- if ( iVideoUtilReady && iVideoClipReady )
+ if ( iVideoUtilReady && iVideoClipReady && !iAsyncStopCalled )
{
+ iAsyncStopCalled = ETrue;
+ iTimeOut->Cancel();
LOGGER_WRITE("AsyncStop");
iWait.AsyncStop();
}
@@ -525,9 +551,17 @@
iVideoClipErr = KErrCancel;
}
- if ( iVideoUtilReady && iVideoClipReady )
+ if ( !iVideoUtilReady )
+ {
+ LOGGER_WRITE("videoUtil cancelled");
+ iVideoUtilReady = ETrue;
+ iVideoUtilErr = KErrCancel;
+ }
+
+ if ( iVideoUtilReady && iVideoClipReady && !iAsyncStopCalled )
{
LOGGER_WRITE("AsyncStop");
+ iAsyncStopCalled = ETrue;
iWait.AsyncStop();
}
TRACE_FUNC_EXIT;
--- a/connectivitymodules/SeCon/wbxml/conmlhandler/bld/sconconmlhandler.mmp Mon May 03 12:24:28 2010 +0300
+++ b/connectivitymodules/SeCon/wbxml/conmlhandler/bld/sconconmlhandler.mmp Tue Jul 13 03:28:47 2010 +0530
@@ -16,7 +16,6 @@
*/
-// To get the MW_LAYER_SYSTEMINCLUDE-definition
#include <platform_paths.hrh>
VENDORID VID_DEFAULT
--- a/contentcontrol.pro Mon May 03 12:24:28 2010 +0300
+++ b/contentcontrol.pro Tue Jul 13 03:28:47 2010 +0530
@@ -1,17 +1,17 @@
#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+# Name : contentcontrol.pro
+# Part of : contentcontrol
+# Description : This is the project specification file for the contentcontrol project.
+# Version : 1
#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: This is the project specification file for the contentcontrol project.
+# Copyright © 2009 Nokia. All rights reserved.
+# This material, including documentation and any related computer
+# programs, is protected by copyright controlled by Nokia. All
+# rights are reserved. Copying, including reproducing, storing,
+# adapting or translating, any or all of this material requires the
+# prior written consent of Nokia. This material also contains
+# confidential information which may not be disclosed to others
+# without the prior written consent of Nokia.
#
TEMPLATE = subdirs
--- a/omads/omads.pro Mon May 03 12:24:28 2010 +0300
+++ b/omads/omads.pro Tue Jul 13 03:28:47 2010 +0530
@@ -1,17 +1,17 @@
#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+# Name : omads.pro
+# Part of : contentcontrol
+# Description : This is the project specification file for the contentcontrol project.
+# Version : 1
#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: This is the project specification file for the contentcontrol project.
+# Copyright © 2009 Nokia. All rights reserved.
+# This material, including documentation and any related computer
+# programs, is protected by copyright controlled by Nokia. All
+# rights are reserved. Copying, including reproducing, storing,
+# adapting or translating, any or all of this material requires the
+# prior written consent of Nokia. This material also contains
+# confidential information which may not be disclosed to others
+# without the prior written consent of Nokia.
#
TEMPLATE = subdirs
--- a/omads/omadsextensions/adapters/agenda/inc/nsmlagendadatastore.h Mon May 03 12:24:28 2010 +0300
+++ b/omads/omadsextensions/adapters/agenda/inc/nsmlagendadatastore.h Tue Jul 13 03:28:47 2010 +0530
@@ -49,7 +49,7 @@
const TInt KNSmlDefaultStoreNameMaxSize = 256;
const TInt KNSmlItemDataExpandSize = 1024;
_LIT( KNSmlDriveC, "C" );
-_LIT( KNSmlAgendaStoreNameForDefaultDB, "Calendar" );
+_LIT( KNSmlAgendaStoreNameForDefaultDB, "C:Calendar" );
_LIT8( KNSmlMRUtilitiesEComPlugInUID, "AgnEntryUi" );
_LIT8( KNSmlVersitTokenRecurrenceID, "RECURRENCE-ID");
_LIT8( KNSmlVersitTokenXRecurrenceID, "X-RECURRENCE-ID");
--- a/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp Mon May 03 12:24:28 2010 +0300
+++ b/omads/omadsextensions/adapters/agenda/src/nsmlagendadatastore.cpp Tue Jul 13 03:28:47 2010 +0530
@@ -212,14 +212,14 @@
// Open database
TInt err( KErrNone );
- if ( aStoreName == KNSmlAgendaStoreNameForDefaultDB )
- {
- TRAP( err, iVCalSession->OpenL( *iDefaultStoreName ) );
- }
- else
- {
- TRAP( err, iVCalSession->OpenL( aStoreName ) );
- }
+ TRAP( err, iVCalSession->OpenL( aStoreName ) );
+ DBG_ARGS(_S("CNSmlAgendaDataStore::DoOpenL: error while opening '%d'"), err );
+ if( err == KErrNotFound )
+ {
+ err = KErrNone;
+ TRAP( err, iVCalSession->CreateCalFileL( aStoreName ));
+ DBG_ARGS(_S("CNSmlAgendaDataStore::DoOpenL: creating the new calfile '%d'"), err );
+ }
if ( err )
{
User::RequestComplete( iCallerStatus, err );
--- a/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStore.cpp Mon May 03 12:24:28 2010 +0300
+++ b/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStore.cpp Tue Jul 13 03:28:47 2010 +0530
@@ -94,6 +94,8 @@
iState = ENSmlClosed;
iStoreName = NULL;
+ iDrive = -1;
+
_DBG_FILE("CNSmlContactsDataStore::CNSmlContactsDataStore(): end");
}
@@ -229,10 +231,12 @@
return;
}
- if( RFs::CharToDrive(aStoreName[0], iDrive) != KErrNone )
+ RFs::CharToDrive( KNSmlDriveC()[0], iDrive );
+
+ /*if( RFs::CharToDrive(aStoreName[0], iDrive) != KErrNone )
{
RFs::CharToDrive( KNSmlDriveC()[0], iDrive );
- }
+ }*/
iOpened = EFalse;
if( iStoreName )
--- a/omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro Mon May 03 12:24:28 2010 +0300
+++ b/omads/omadsextensions/dsutils/contactsdatastoreextension/contactsdatastoreextension.pro Tue Jul 13 03:28:47 2010 +0530
@@ -1,18 +1,19 @@
#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+# ============================================================================
+# Name : contactsdatastoreextension.pro
+# Part of : contactsdatastoreextension
+# Description : Project file
#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: Project file
-#
+# Copyright © 2009 Nokia. All rights reserved.
+# This material, including documentation and any related computer
+# programs, is protected by copyright controlled by Nokia. All
+# rights are reserved. Copying, including reproducing, storing,
+# adapting or translating, any or all of this material requires the
+# prior written consent of Nokia. This material also contains
+# confidential information which may not be disclosed to others
+# without the prior written consent of Nokia.
+# ============================================================================
+#
TEMPLATE = lib
--- a/omads/omadsextensions/dsutils/dsutils.pro Mon May 03 12:24:28 2010 +0300
+++ b/omads/omadsextensions/dsutils/dsutils.pro Tue Jul 13 03:28:47 2010 +0530
@@ -1,17 +1,17 @@
#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+# Name : dsutils.pro
+# Part of : contentcontrol
+# Description : This is the project specification file for the contentcontrol project.
+# Version : 1
#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: This is the project specification file for the contentcontrol project.
+# Copyright © 2009 Nokia. All rights reserved.
+# This material, including documentation and any related computer
+# programs, is protected by copyright controlled by Nokia. All
+# rights are reserved. Copying, including reproducing, storing,
+# adapting or translating, any or all of this material requires the
+# prior written consent of Nokia. This material also contains
+# confidential information which may not be disclosed to others
+# without the prior written consent of Nokia.
#
TEMPLATE = subdirs
--- a/omads/omadsextensions/omadsextensions.pro Mon May 03 12:24:28 2010 +0300
+++ b/omads/omadsextensions/omadsextensions.pro Tue Jul 13 03:28:47 2010 +0530
@@ -1,17 +1,17 @@
#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+# Name : omadsextensions.pro
+# Part of : contentcontrol
+# Description : This is the project specification file for the contentcontrol project.
+# Version : 1
#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: This is the project specification file for the contentcontrol project.
+# Copyright © 2009 Nokia. All rights reserved.
+# This material, including documentation and any related computer
+# programs, is protected by copyright controlled by Nokia. All
+# rights are reserved. Copying, including reproducing, storing,
+# adapting or translating, any or all of this material requires the
+# prior written consent of Nokia. This material also contains
+# confidential information which may not be disclosed to others
+# without the prior written consent of Nokia.
#
TEMPLATE = subdirs