--- a/messagingfw/alwaysonline/AlwaysOnlineManager/src/AlwaysOnlineManager.cpp Fri Apr 16 15:27:42 2010 +0300
+++ b/messagingfw/alwaysonline/AlwaysOnlineManager/src/AlwaysOnlineManager.cpp Mon May 03 12:58:18 2010 +0300
@@ -185,12 +185,27 @@
}
// ----------------------------------------------------------------------------
+// PointerArrayCleanup()
+//
+// An utility function to handle cleanup of RImplInfoPtrArray instances
+// @param aArray Pointer to RImpInfoPtrArray to be deleted.
+// Guaranteed not to be NULL.
+// ----------------------------------------------------------------------------
+//
+static void PointerArrayCleanup( TAny* aArray )
+ {
+ static_cast< RImplInfoPtrArray* >( aArray )->ResetAndDestroy();
+ }
+
+// ----------------------------------------------------------------------------
// LoadPluginsL()
// ----------------------------------------------------------------------------
//
void CAlwaysOnlineManager::LoadPluginsL()
{
- RImplInfoPtrArray pluginArray;
+ RImplInfoPtrArray pluginArray;
+ TCleanupItem arrayCleanup( PointerArrayCleanup, &pluginArray );
+ CleanupStack::PushL( arrayCleanup );
//List all plugins which implement AlwaysOnlineManagerInterface
REComSession::ListImplementationsL( KCEComInterfaceUid, pluginArray );
@@ -204,45 +219,42 @@
{
TInt index = -1;
TKeyArrayFix key( 0, ECmpTInt32 );
- TInt result = KErrNotFound;
for( TInt i = 0; i < pluginArray.Count(); i++ )
{
CImplementationInformation* info = pluginArray[ i ];
-
- TUid id = info->ImplementationUid();
- delete info;
- info = NULL;
-
- result = iDisabledPluginUidsArray->Find( id, key, index );
+
+ TUid id = info->ImplementationUid();
+
+ TInt result( iDisabledPluginUidsArray->Find( id, key, index ) );
// if id is found from disabled plugins list, then we don't
// load it.
if ( result == 0 )
{
- KAOMANAGER_LOGGER_WRITE_FORMAT("CAlwaysOnlineManager::LoadPluginsL() disabled plugin: 0x%x", id );
+ KAOMANAGER_LOGGER_WRITE_FORMAT( "CAlwaysOnlineManager::LoadPluginsL() disabled plugin: 0x%x", id );
}
else
{
- CAlwaysOnlineEComInterface* implementation = NULL;
+ CAlwaysOnlineEComInterface* implementation( NULL );
//be sure that if plugin leaves, manager doesn't.
//This applies in every place!
- TRAPD( err, implementation =
- CAlwaysOnlineEComInterface::NewL( id ) );
-
- if ( err == KErrNone )
- {
- implementation->SetStatusQueryObject( this );
+ TRAP_IGNORE( implementation = CAlwaysOnlineEComInterface::NewL( id ) );
+ CleanupStack::PushL( implementation );
+ if ( implementation )
+ {
+ implementation->SetStatusQueryObject( this );
iPluginArray->AppendL( implementation );
-
+
KAOMANAGER_LOGGER_WRITE_FORMAT("CAlwaysOnlineManager::LoadPluginsL() plugin loaded succesfully: 0x%x", id);
- }
+ }
else
{
// Just write to debug log, that all the plugins could not be loaded.
// Perhaps there should be some nice way to acknoledge the user or the system!
KAOMANAGER_LOGGER_WRITE_FORMAT("CAlwaysOnlineManager::LoadPluginsL() plugin load failed: 0x%x", id);
}
+ CleanupStack::Pop( implementation );
}
}//for
@@ -256,6 +268,7 @@
//no plugins. This shouldn't be, there's something wrong with build.
//if plugins are not in build, server shouldn't be either!
}
+ CleanupStack::PopAndDestroy(); // arrayCleanup
}
// ----------------------------------------------------------------------------
--- a/messagingfw/msgsrvnstore/group/messaging_framework.history.xml Fri Apr 16 15:27:42 2010 +0300
+++ b/messagingfw/msgsrvnstore/group/messaging_framework.history.xml Mon May 03 12:58:18 2010 +0300
@@ -4,6 +4,10 @@
Framework for storage, retrieval, editing, sending and receiving of messages such as email or SMS.
</purpose>
+ <defect number="PDEF145298" title="No message content shown, when opening new mail with POP3 account" revision= "133">
+ TMsvEntry::SetConnected() was updated wronly.
+ </defect>
+
<defect number="PDEF142159/EHGO-7V4CS2 " title="A note is displayed after formatting Memory card when "Memory in use" " revision= "132">
Updated the Notification wrt DiskRemove and Disk Insert.
</defect>
--- a/messagingfw/msgsrvnstore/server/src/MSVSERV.CPP Fri Apr 16 15:27:42 2010 +0300
+++ b/messagingfw/msgsrvnstore/server/src/MSVSERV.CPP Mon May 03 12:58:18 2010 +0300
@@ -3567,7 +3567,9 @@
// if an operation is already running, queue this one
if (opRunning)
{
- aOperation.SetCapability(hasCapability);
+#if (defined SYMBIAN_USER_PROMPT_SERVICE)
+ aOperation.SetCapability(hasCapability);
+#endif
QueueOperationL(aOperation, aSessionId);
return;
}
@@ -3747,7 +3749,11 @@
}
}
+#if (defined SYMBIAN_USER_PROMPT_SERVICE)
aQueue->At(0)->Start(*aQueue->iMtm, aQueue->At(0)->Capability());
+#else
+ aQueue->At(0)->Start(*aQueue->iMtm, EFalse);
+#endif
aQueue->At(0)->SetState(EMsvOperationRunning);
}
--- a/messagingfw/msgsrvnstore/server/src/msvindexadapter.cpp Fri Apr 16 15:27:42 2010 +0300
+++ b/messagingfw/msgsrvnstore/server/src/msvindexadapter.cpp Mon May 03 12:58:18 2010 +0300
@@ -1423,12 +1423,9 @@
newVisibleFolderNode->DeleteEntryL(oldEntry->GetId());
User::Leave(err);
}
- UpdateDates(*oldEntry, EFalse);
- if(aNewEntryContents.Connected())
- {
- oldEntry->Entry().SetConnected(EFalse);
- }
- if(aForcedUpdate || changedPrivateInfo && aOwnerId != KMsvServerId )
+
+ UpdateDates(*oldEntry, EFalse);
+ if(aForcedUpdate || changedPrivateInfo && aOwnerId != KMsvServerId )
{
oldEntry->SetEntryOwnerId(aOwnerId);
}
--- a/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp Fri Apr 16 15:27:42 2010 +0300
+++ b/messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp Mon May 03 12:58:18 2010 +0300
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# 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"
--- a/msgbranched/group/bld.inf Fri Apr 16 15:27:42 2010 +0300
+++ b/msgbranched/group/bld.inf Mon May 03 12:58:18 2010 +0300
@@ -33,9 +33,9 @@
// export localised loc file
-../messaging/email/clientmtms/loc/imcm.loc OS_LAYER_LOC_EXPORT_PATH(imcm.loc)
-../messaging/email/clientmtms/loc/imcm_default_charset.loc OS_LAYER_LOC_EXPORT_PATH(imcm_default_charset.loc)
-../messaging/framework/server/loc/msgs.loc OS_LAYER_LOC_EXPORT_PATH(msgs.loc)
+../messagingbr/emailbr/clientmtms/loc/imcm.loc OS_LAYER_LOC_EXPORT_PATH(imcm.loc)
+../messagingbr/emailbr/clientmtms/loc/imcm_default_charset.loc OS_LAYER_LOC_EXPORT_PATH(imcm_default_charset.loc)
+../messagingbr/frameworkbr/server/loc/msgs.loc OS_LAYER_LOC_EXPORT_PATH(msgs.loc)
PRJ_MMPFILES
./msgbranched.mmp
--- a/msgbranched/group/msgbranched.mmp Fri Apr 16 15:27:42 2010 +0300
+++ b/msgbranched/group/msgbranched.mmp Mon May 03 12:58:18 2010 +0300
@@ -24,13 +24,13 @@
TARGETTYPE lib
UID 0x0 0x0
-START RESOURCE ../messaging/email/clientmtms/group/imcm.rss
+START RESOURCE ../messagingbr/emailbr/clientmtms/group/imcm.rss
LANGUAGE_IDS
HEADER
TARGETPATH resource/messaging
END
-START RESOURCE ../messaging/framework/server/group/msgs.rss
+START RESOURCE ../messagingbr/frameworkbr/server/group/msgs.rss
LANGUAGE_IDS
HEADER
TARGETPATH resource/messaging
@@ -44,8 +44,8 @@
SOURCE dummy.cpp
-USERINCLUDE ../messaging/email/clientmtms/group
-USERINCLUDE ../messaging/framework/server/group
+USERINCLUDE ../messagingbr/emailbr/clientmtms/group
+USERINCLUDE ../messagingbr/frameworkbr/server/group
USERINCLUDE ../nbprotocols/smsstack/smsu/group
OS_LAYER_SYSTEMINCLUDE
--- a/msgbranched/messaging/email/clientmtms/group/imcm.rls Fri Apr 16 15:27:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2004-2005 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: imcm.rls*
-*/
-
-
-
-rls_string STRING_forward_formatting_string1 "Fwd: %S"
-rls_string STRING_reply_formatting_string1 "Re: %S"
-rls_string STRING_receipt_formatting_string1 "Receipt of message: %S"
-rls_string STRING_email_address_formatting_string1 "\"%S\" <%S>"
-rls_string STRING_forward_body_header1 <0x2029><0x2029>"_______________ Forward Header _______________"<0x2029> // Header used in Body for Forwarded message
-rls_string STRING_forward_body_header2 "Subject:"<0x0009>"%S"<0x2029>
-rls_string STRING_forward_body_header3 "Author:"<0x0009>"%S"<0x2029>
-rls_string STRING_forward_body_header4 "Date:"<0x0009><0x0009>"%S"<0x2029>
-rls_string STRING_forward_body_header5 "To:"<0x0009><0x0009>"%S"<0x2029>
-rls_string STRING_forward_body_header6 "CC:"<0x0009><0x0009>"%S"<0x2029>
-rls_string STRING_reply_body_header1 <0x2029><0x2029>"________________ Reply Header ________________"<0x2029> // Header used in Body for Replied message
-rls_string STRING_reply_body_header2 "Subject:"<0x0009>"%S"<0x2029>
-rls_string STRING_reply_body_header3 "Author:"<0x0009>"%S"<0x2029>
-rls_string STRING_reply_body_header4 "Date:"<0x0009><0x0009>"%S"<0x2029>
-rls_string STRING_reply_body_header5 "To:"<0x0009><0x0009>"%S"<0x2029>
-rls_string STRING_reply_body_header6 "CC:"<0x0009><0x0009>"%S"<0x2029>
-rls_string STRING_body_header1 <0x2029><0x2029>"_______________ Message Header _______________"<0x2029> // Header used in Body for message
-rls_string STRING_body_header2 "Subject:"<0x0009>"%S"<0x2029>
-rls_string STRING_body_header3 "Author:"<0x0009>"%S"<0x2029>
-rls_string STRING_body_header4 "Recipient:"<0x0009>"%S"<0x2029>
-rls_string STRING_body_header5 "Date:"<0x0009><0x0009>"%S"<0x2029>
-rls_string STRING_removed_attachment_tag1 "Attachment not available : "
-rls_string STRING_retained_attachment_tag1 "Attached file : "
-rls_string STRING_default_attachment_name1 "Attachment"
-rls_string STRING_product_name1 "EPOC Email Version 2.10"
-rls_string STRING_timeout_dialog_title1 "Remote mailbox closed automatically"
-rls_string STRING_timeout_dialog_text1 "Remote mailbox has been idle for specified time"
-rls_string STRING_default_vcard_name1 "vcard"
-rls_string STRING_body_header_datetime_format "%D%X%N%Y%1 %2 %3 %-B%:0%J%:1%T%:3%+B" // DateTime format used in forward/reply body header. This string is substituted in the %s paramter in STRING_forward_body_header4 and STRING_reply_body_header4.
-rls_string STRING_partial_download_footer_message "This message has not been fully downloaded. There is still %d KB of text to be retrieved."
-rls_string STRING_default_system_charset "ISO-8859-1"
--- a/msgbranched/messaging/email/clientmtms/group/imcm.rss Fri Apr 16 15:27:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +0,0 @@
-/*
-* Copyright (c) 1998-2005 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: imcm.rss*
-*/
-
-
-
-#include "imcm.rls"
-#include <imcm.loc>
-#include <imcm_default_charset.loc>
-
-
-#define PARABREAK 8233
-#define TABCHAR 9
-
-STRUCT LBUF
- {
- LTEXT buffer; // non-zero terminated text string
- }
-
-STRUCT L8BUF
- {
- LTEXT8 buffer;
- }
-
-STRUCT INT8
- {
- BYTE value;
- }
-
-RESOURCE LBUF forward_formatting_string
- {
- buffer=qtn_mail_fwd"%S";
- }
-
-RESOURCE LBUF reply_formatting_string
- {
- buffer=qtn_mail_re"%S";
- }
-
-RESOURCE LBUF receipt_formatting_string
- {
- buffer=STRING_receipt_formatting_string1;
- }
-
-RESOURCE LBUF email_address_formatting_string
- {
- buffer="%S <%S>";//STRING_email_address_formatting_string1;
- }
-
-
-// Headers used in Body for Forwarded/Replyed message
-
-RESOURCE LBUF forward_body_header
- {
- buffer=<PARABREAK><PARABREAK>qtn_mail_forward_separator<PARABREAK>
- qtn_mail_copy_subject" %S"<PARABREAK>
- qtn_mail_copy_sender" %S"<PARABREAK>
- qtn_mail_copy_date" %S"<PARABREAK>;
- }
-
-RESOURCE LBUF forward_body_header_toonly
- {
- buffer=STRING_forward_body_header1
- STRING_forward_body_header2
- STRING_forward_body_header3
- STRING_forward_body_header5
- STRING_forward_body_header4;
- }
-
-RESOURCE LBUF forward_body_header_cconly
- {
- buffer=STRING_forward_body_header1
- STRING_forward_body_header2
- STRING_forward_body_header3
- STRING_forward_body_header6
- STRING_forward_body_header4;
- }
-
-RESOURCE LBUF forward_body_header_tocc
- {
- buffer=STRING_forward_body_header1
- STRING_forward_body_header2
- STRING_forward_body_header3
- STRING_forward_body_header5
- STRING_forward_body_header6
- STRING_forward_body_header4;
- }
-
-RESOURCE LBUF reply_body_header
- {
- buffer=<PARABREAK><PARABREAK>qtn_mail_reply_separator<PARABREAK>
- qtn_mail_copy_subject" %S"<PARABREAK>
- qtn_mail_copy_sender" %S"<PARABREAK>
- qtn_mail_copy_date" %S"<PARABREAK>;
- }
-
-RESOURCE LBUF reply_body_header_toonly
- {
- buffer=STRING_reply_body_header1
- STRING_reply_body_header2
- STRING_reply_body_header3
- STRING_reply_body_header5
- STRING_reply_body_header4;
- }
-
-RESOURCE LBUF reply_body_header_cconly
- {
- buffer=STRING_reply_body_header1
- STRING_reply_body_header2
- STRING_reply_body_header3
- STRING_reply_body_header6
- STRING_reply_body_header4;
- }
-
-RESOURCE LBUF reply_body_header_tocc
- {
- buffer=STRING_reply_body_header1
- STRING_reply_body_header2
- STRING_reply_body_header3
- STRING_reply_body_header5
- STRING_reply_body_header6
- STRING_reply_body_header4;
- }
-
-RESOURCE LBUF body_header
- {
- buffer=STRING_body_header1
- STRING_body_header2
- STRING_body_header3
- STRING_body_header4
- STRING_body_header5;
- }
-
-RESOURCE LBUF removed_attachment_tag
- {
- buffer=STRING_removed_attachment_tag1;
- }
-
-RESOURCE LBUF retained_attachment_tag
- {
- buffer=STRING_retained_attachment_tag1;
- }
-
-RESOURCE LBUF default_attachment_name
- {
- buffer=STRING_default_attachment_name1;
- }
-
-RESOURCE LBUF product_name
- {
- buffer=STRING_product_name1;
- }
-
-RESOURCE LBUF timeout_dialog_title
- {
- buffer=STRING_timeout_dialog_title1;
- }
-
-RESOURCE LBUF timeout_dialog_text
- {
- buffer=STRING_timeout_dialog_text1;
- }
-
-RESOURCE LBUF default_vcard_name
- {
- buffer=STRING_default_vcard_name1;
- }
-
-// List of available character sets in Charconv.h
-// at some point flags should be removed and only qtn_default_charset be used for all builds.
-RESOURCE L8BUF default_system_charset
- {
- buffer = qtn_default_email_charset;
- }
-
-// If this value is set to 1, 8 bit body text data and character set information will be stored
-// when downloaded via IMPS and POPS. The body text will be decoded to the correct character set
-// when opened. If this value is set to 0, the body text is decoded and stored when downloading.
-RESOURCE INT8 store_8bit_body_text
- {
- value = 1;
- }
-
-// Used for localised date time formatting for email forward and reply body headers
-RESOURCE LBUF body_header_datetime_format
- {
- buffer="%D%M%Y%/0%1%/1%2%/2%3%/3 %-B%:0%J%:1%T%:3%+B"; //STRING_body_header_datetime_format;
- }
-
-RESOURCE LBUF partial_download_footer_message
- {
- buffer=qtn_mail_rest_of_mail_not_fetched;
- }
-
-// If this value is set to 1,body text data will be stored when downloaded via IMPS and POPS using chunk storage option.
-// If this value is set to 0, the body text is stored by creating entire message in RAM.
-
-RESOURCE INT8 store_plain_body_text
- {
- value = 1;
- }
--- a/msgbranched/messaging/email/clientmtms/loc/imcm.loc Fri Apr 16 15:27:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-* Copyright (c) 2002 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* This is a localisation file for imcm.dll
-* A .loc file is the one and only place where the logical strings
-* to be localised are defined.
-* >>>
-* The text between >>> and <<< is just to document the syntax and
-* you can remove it if you like.
-*
-*/
-
-
-
-
-// LOCALISATION STRINGS
-
-// d: Added in the beginning of the subject line when replying
-// l: mce_header_field_pane_t1
-#define qtn_mail_re "RE: "
-
-// d: Added in the beginning of the subject line when forwarding
-// l: mce_header_field_pane_t1
-#define qtn_mail_fwd "FWD: "
-
-// d: Text to be inserted into a message when replying
-// d: Inerted in the beginning of the original message
-// l: msg_header_pane_t2
-#define qtn_mail_reply_separator "--- original message ---"
-
-// d: Text to be inserted into a message when forwarding
-// d: Inserted in the beginning of the original message
-// l: msg_header_pane_t2
-#define qtn_mail_forward_separator "--- original message ---"
-
-// d: Text to be inserted into a message when forwarding or replying
-// d: Inserted in the beginning of the original message
-// l: msg_header_pane_t2
-#define qtn_mail_copy_subject "Subject:"
-
-// d: Text to be inserted into a message when forwarding or replying
-// d: Inserted in the beginning of the original message
-// l: msg_header_pane_t2
-#define qtn_mail_copy_sender "Sender:"
-
-// d: Text to be inserted into a message when forwarding or replying
-// d: Inserted in the beginning of the original message
-// l: msg_header_pane_t2
-#define qtn_mail_copy_date "Date:"
-
-// d: Text to be inserted into a message body if part of message body is filtered out
-// l:none
-#define qtn_mail_rest_of_mail_not_fetched "- - - Retrieve total mail selecting Retrieve from Options list. - - -"
-
-// End of File
--- a/msgbranched/messaging/email/clientmtms/loc/imcm_default_charset.loc Fri Apr 16 15:27:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2002 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* !!!!!!!LOCALISATION INSTRUCTIONS, IMPORTANT!!!!!!!
-* These default charsets are used to define correct default charsets for different builds.
-*
-*/
-
-
-
-// d: This is not visible to the user!
-// l: None
-#define qtn_default_email_charset "ISO-8859-1"
-
-// End of File
--- a/msgbranched/messaging/framework/server/group/msgs.rss Fri Apr 16 15:27:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/*
-* Copyright (c) 1998-2003 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: msgs.rss*
-*/
-
-
-
-#include <msgs.loc>
-#include <msvstd.hrh>
-
-// Flags - defined in TMsvEntry
-
-#define KMsvEntryLowPriority 0x0000
-#define KMsvEntryMediumPriority 0x0001
-#define KMsvEntryHighPriority 0x0002
-
-//#define KMsvEntryStoreFlag 0x0004 // Not used
-#define KMsvEntryNotCompleteFlag 0x0008 // the netry is marked as incomplete
-#define KMsvEntryNewFlag 0x0010
-#define KMsvEntryUnreadFlag 0x0020
-#define KMsvEntryInvisibleFlag 0x0200 // will be invisible to the user
-#define KMsvEntryMultipleRecipientFlag 0x0400
-//#define KMsvEntryFileFlag 0x0800 // Not used
-#define KMsvEntryReadOnlyFlag 0x1000 // the entry or store cannot be altered
-#define KMsvEntryStandardFolder 0x4000 // the entry will be place at beginning of a selection
-
-
-
-STRUCT SERVERENTRY
- {
- LONG id;
- LONG parent;
- LONG service=KMsvLocalServiceIndexEntryIdValue;
- LONG type;
- LONG mtm=KUidMsvLocalServiceMtmValue;
- LONG flags=KMsvEntryMediumPriority;
- LTEXT description="";
- LTEXT details="";
- }
-
-STRUCT SERVERSTARTUPINDEX
- {
- STRUCT entries[]; // must be SERVERENTRY's
- }
-
-RESOURCE SERVERSTARTUPINDEX r_server_index_startup
- {
- entries=
- {
- SERVERENTRY { id=KMsvLocalServiceIndexEntryIdValue;
- parent=KMsvRootIndexEntryIdValue;
- type=KUidMsvServiceEntryValue;
- flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder;
- details="Local"; },
- SERVERENTRY { id=KMsvGlobalInBoxIndexEntryIdValue;
- parent=KMsvLocalServiceIndexEntryIdValue;
- type=KUidMsvFolderEntryValue;
- flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder;
- details=qtn_mce_inbox; },
- SERVERENTRY { id=KMsvGlobalOutBoxIndexEntryIdValue;
- parent=KMsvLocalServiceIndexEntryIdValue;
- type=KUidMsvFolderEntryValue;
- flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder;
- details=qtn_mce_outbox; },
- SERVERENTRY { id=KMsvDraftEntryIdValue;
- parent=KMsvLocalServiceIndexEntryIdValue;
- type=KUidMsvFolderEntryValue;
- flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder;
- details=qtn_mce_drafts; },
- SERVERENTRY { id=KMsvSentEntryIdValue;
- parent=KMsvLocalServiceIndexEntryIdValue;
- type=KUidMsvFolderEntryValue;
- flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder;
- details=qtn_mce_sent_items; },
- SERVERENTRY { id=0x1008;
- parent=KMsvLocalServiceIndexEntryIdValue;
- type=KUidMsvFolderEntryValue;
- flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder;
- details=qtn_mce_documents; },
- SERVERENTRY { id=0x1009;
- parent=0x1008;
- type=KUidMsvFolderEntryValue;
- flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder;
- details=qtn_mce_doc_temp_folder; },
- SERVERENTRY { id=KMsvDeletedEntryFolderEntryIdValue;
- parent=KMsvLocalServiceIndexEntryIdValue;
- type=KUidMsvFolderEntryValue;
- flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder|KMsvEntryInvisibleFlag;
- details="Deleted"; }
- };
- }
-
-// end of file
--- a/msgbranched/messaging/framework/server/loc/msgs.loc Fri Apr 16 15:27:42 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2000 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* This file contains the localised strings for msgs
-*
-*/
-
-
-
-// LOCALISATION STRINGS
-
-// d: Main view list item.
-// d: Inbox
-// l: list_single_large_graphic_pane_t1
-//
-#define qtn_mce_inbox "Inbox"
-
-// d: Main view list item.
-// d: Documents
-// l: list_single_large_graphic_pane_t1
-//
-#define qtn_mce_documents "Documents"
-
-// d: Main view list item.
-// d: Drafts
-// l: list_single_large_graphic_pane_t1
-//
-#define qtn_mce_drafts "Drafts"
-
-// d: Main view list item.
-// d: Sent items
-// l: list_single_large_graphic_pane_t1
-//
-#define qtn_mce_sent_items "Sent items"
-
-// d: Main view list item.
-// d: Outbox
-// l: list_single_large_graphic_pane_t1
-//
-#define qtn_mce_outbox "Outbox"
-
-// d: Documents view list item. First item of the list when Documents folder is opened.
-// l: list_double_graphic_pane_t1
-//
-#define qtn_mce_doc_temp_folder "Templates"
-
-
-// End of File
-
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/msgbranched/messagingbr/emailbr/clientmtms/group/imcm.rls Mon May 03 12:58:18 2010 +0300
@@ -0,0 +1,49 @@
+/*
+* Copyright (c) 2004-2005 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".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: imcm.rls*
+*/
+
+
+
+rls_string STRING_forward_formatting_string1 "Fwd: %S"
+rls_string STRING_reply_formatting_string1 "Re: %S"
+rls_string STRING_receipt_formatting_string1 "Receipt of message: %S"
+rls_string STRING_email_address_formatting_string1 "\"%S\" <%S>"
+rls_string STRING_forward_body_header1 <0x2029><0x2029>"_______________ Forward Header _______________"<0x2029> // Header used in Body for Forwarded message
+rls_string STRING_forward_body_header2 "Subject:"<0x0009>"%S"<0x2029>
+rls_string STRING_forward_body_header3 "Author:"<0x0009>"%S"<0x2029>
+rls_string STRING_forward_body_header4 "Date:"<0x0009><0x0009>"%S"<0x2029>
+rls_string STRING_forward_body_header5 "To:"<0x0009><0x0009>"%S"<0x2029>
+rls_string STRING_forward_body_header6 "CC:"<0x0009><0x0009>"%S"<0x2029>
+rls_string STRING_reply_body_header1 <0x2029><0x2029>"________________ Reply Header ________________"<0x2029> // Header used in Body for Replied message
+rls_string STRING_reply_body_header2 "Subject:"<0x0009>"%S"<0x2029>
+rls_string STRING_reply_body_header3 "Author:"<0x0009>"%S"<0x2029>
+rls_string STRING_reply_body_header4 "Date:"<0x0009><0x0009>"%S"<0x2029>
+rls_string STRING_reply_body_header5 "To:"<0x0009><0x0009>"%S"<0x2029>
+rls_string STRING_reply_body_header6 "CC:"<0x0009><0x0009>"%S"<0x2029>
+rls_string STRING_body_header1 <0x2029><0x2029>"_______________ Message Header _______________"<0x2029> // Header used in Body for message
+rls_string STRING_body_header2 "Subject:"<0x0009>"%S"<0x2029>
+rls_string STRING_body_header3 "Author:"<0x0009>"%S"<0x2029>
+rls_string STRING_body_header4 "Recipient:"<0x0009>"%S"<0x2029>
+rls_string STRING_body_header5 "Date:"<0x0009><0x0009>"%S"<0x2029>
+rls_string STRING_removed_attachment_tag1 "Attachment not available : "
+rls_string STRING_retained_attachment_tag1 "Attached file : "
+rls_string STRING_default_attachment_name1 "Attachment"
+rls_string STRING_product_name1 "EPOC Email Version 2.10"
+rls_string STRING_timeout_dialog_title1 "Remote mailbox closed automatically"
+rls_string STRING_timeout_dialog_text1 "Remote mailbox has been idle for specified time"
+rls_string STRING_default_vcard_name1 "vcard"
+rls_string STRING_body_header_datetime_format "%D%X%N%Y%1 %2 %3 %-B%:0%J%:1%T%:3%+B" // DateTime format used in forward/reply body header. This string is substituted in the %s paramter in STRING_forward_body_header4 and STRING_reply_body_header4.
+rls_string STRING_partial_download_footer_message "This message has not been fully downloaded. There is still %d KB of text to be retrieved."
+rls_string STRING_default_system_charset "ISO-8859-1"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/msgbranched/messagingbr/emailbr/clientmtms/group/imcm.rss Mon May 03 12:58:18 2010 +0300
@@ -0,0 +1,213 @@
+/*
+* Copyright (c) 1998-2005 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".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: imcm.rss*
+*/
+
+
+
+#include "imcm.rls"
+#include <imcm.loc>
+#include <imcm_default_charset.loc>
+
+
+#define PARABREAK 8233
+#define TABCHAR 9
+
+STRUCT LBUF
+ {
+ LTEXT buffer; // non-zero terminated text string
+ }
+
+STRUCT L8BUF
+ {
+ LTEXT8 buffer;
+ }
+
+STRUCT INT8
+ {
+ BYTE value;
+ }
+
+RESOURCE LBUF forward_formatting_string
+ {
+ buffer=qtn_mail_fwd"%S";
+ }
+
+RESOURCE LBUF reply_formatting_string
+ {
+ buffer=qtn_mail_re"%S";
+ }
+
+RESOURCE LBUF receipt_formatting_string
+ {
+ buffer=STRING_receipt_formatting_string1;
+ }
+
+RESOURCE LBUF email_address_formatting_string
+ {
+ buffer="%S <%S>";//STRING_email_address_formatting_string1;
+ }
+
+
+// Headers used in Body for Forwarded/Replyed message
+
+RESOURCE LBUF forward_body_header
+ {
+ buffer=<PARABREAK><PARABREAK>qtn_mail_forward_separator<PARABREAK>
+ qtn_mail_copy_subject" %S"<PARABREAK>
+ qtn_mail_copy_sender" %S"<PARABREAK>
+ qtn_mail_copy_date" %S"<PARABREAK>;
+ }
+
+RESOURCE LBUF forward_body_header_toonly
+ {
+ buffer=STRING_forward_body_header1
+ STRING_forward_body_header2
+ STRING_forward_body_header3
+ STRING_forward_body_header5
+ STRING_forward_body_header4;
+ }
+
+RESOURCE LBUF forward_body_header_cconly
+ {
+ buffer=STRING_forward_body_header1
+ STRING_forward_body_header2
+ STRING_forward_body_header3
+ STRING_forward_body_header6
+ STRING_forward_body_header4;
+ }
+
+RESOURCE LBUF forward_body_header_tocc
+ {
+ buffer=STRING_forward_body_header1
+ STRING_forward_body_header2
+ STRING_forward_body_header3
+ STRING_forward_body_header5
+ STRING_forward_body_header6
+ STRING_forward_body_header4;
+ }
+
+RESOURCE LBUF reply_body_header
+ {
+ buffer=<PARABREAK><PARABREAK>qtn_mail_reply_separator<PARABREAK>
+ qtn_mail_copy_subject" %S"<PARABREAK>
+ qtn_mail_copy_sender" %S"<PARABREAK>
+ qtn_mail_copy_date" %S"<PARABREAK>;
+ }
+
+RESOURCE LBUF reply_body_header_toonly
+ {
+ buffer=STRING_reply_body_header1
+ STRING_reply_body_header2
+ STRING_reply_body_header3
+ STRING_reply_body_header5
+ STRING_reply_body_header4;
+ }
+
+RESOURCE LBUF reply_body_header_cconly
+ {
+ buffer=STRING_reply_body_header1
+ STRING_reply_body_header2
+ STRING_reply_body_header3
+ STRING_reply_body_header6
+ STRING_reply_body_header4;
+ }
+
+RESOURCE LBUF reply_body_header_tocc
+ {
+ buffer=STRING_reply_body_header1
+ STRING_reply_body_header2
+ STRING_reply_body_header3
+ STRING_reply_body_header5
+ STRING_reply_body_header6
+ STRING_reply_body_header4;
+ }
+
+RESOURCE LBUF body_header
+ {
+ buffer=STRING_body_header1
+ STRING_body_header2
+ STRING_body_header3
+ STRING_body_header4
+ STRING_body_header5;
+ }
+
+RESOURCE LBUF removed_attachment_tag
+ {
+ buffer=STRING_removed_attachment_tag1;
+ }
+
+RESOURCE LBUF retained_attachment_tag
+ {
+ buffer=STRING_retained_attachment_tag1;
+ }
+
+RESOURCE LBUF default_attachment_name
+ {
+ buffer=STRING_default_attachment_name1;
+ }
+
+RESOURCE LBUF product_name
+ {
+ buffer=STRING_product_name1;
+ }
+
+RESOURCE LBUF timeout_dialog_title
+ {
+ buffer=STRING_timeout_dialog_title1;
+ }
+
+RESOURCE LBUF timeout_dialog_text
+ {
+ buffer=STRING_timeout_dialog_text1;
+ }
+
+RESOURCE LBUF default_vcard_name
+ {
+ buffer=STRING_default_vcard_name1;
+ }
+
+// List of available character sets in Charconv.h
+// at some point flags should be removed and only qtn_default_charset be used for all builds.
+RESOURCE L8BUF default_system_charset
+ {
+ buffer = qtn_default_email_charset;
+ }
+
+// If this value is set to 1, 8 bit body text data and character set information will be stored
+// when downloaded via IMPS and POPS. The body text will be decoded to the correct character set
+// when opened. If this value is set to 0, the body text is decoded and stored when downloading.
+RESOURCE INT8 store_8bit_body_text
+ {
+ value = 1;
+ }
+
+// Used for localised date time formatting for email forward and reply body headers
+RESOURCE LBUF body_header_datetime_format
+ {
+ buffer="%D%M%Y%/0%1%/1%2%/2%3%/3 %-B%:0%J%:1%T%:3%+B"; //STRING_body_header_datetime_format;
+ }
+
+RESOURCE LBUF partial_download_footer_message
+ {
+ buffer=qtn_mail_rest_of_mail_not_fetched;
+ }
+
+// If this value is set to 1,body text data will be stored when downloaded via IMPS and POPS using chunk storage option.
+// If this value is set to 0, the body text is stored by creating entire message in RAM.
+
+RESOURCE INT8 store_plain_body_text
+ {
+ value = 1;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/msgbranched/messagingbr/emailbr/clientmtms/loc/imcm.loc Mon May 03 12:58:18 2010 +0300
@@ -0,0 +1,66 @@
+/*
+* Copyright (c) 2002 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".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* This is a localisation file for imcm.dll
+* A .loc file is the one and only place where the logical strings
+* to be localised are defined.
+* >>>
+* The text between >>> and <<< is just to document the syntax and
+* you can remove it if you like.
+*
+*/
+
+
+
+
+// LOCALISATION STRINGS
+
+// d: Added in the beginning of the subject line when replying
+// l: mce_header_field_pane_t1
+#define qtn_mail_re "RE: "
+
+// d: Added in the beginning of the subject line when forwarding
+// l: mce_header_field_pane_t1
+#define qtn_mail_fwd "FWD: "
+
+// d: Text to be inserted into a message when replying
+// d: Inerted in the beginning of the original message
+// l: msg_header_pane_t2
+#define qtn_mail_reply_separator "--- original message ---"
+
+// d: Text to be inserted into a message when forwarding
+// d: Inserted in the beginning of the original message
+// l: msg_header_pane_t2
+#define qtn_mail_forward_separator "--- original message ---"
+
+// d: Text to be inserted into a message when forwarding or replying
+// d: Inserted in the beginning of the original message
+// l: msg_header_pane_t2
+#define qtn_mail_copy_subject "Subject:"
+
+// d: Text to be inserted into a message when forwarding or replying
+// d: Inserted in the beginning of the original message
+// l: msg_header_pane_t2
+#define qtn_mail_copy_sender "Sender:"
+
+// d: Text to be inserted into a message when forwarding or replying
+// d: Inserted in the beginning of the original message
+// l: msg_header_pane_t2
+#define qtn_mail_copy_date "Date:"
+
+// d: Text to be inserted into a message body if part of message body is filtered out
+// l:none
+#define qtn_mail_rest_of_mail_not_fetched "- - - Retrieve total mail selecting Retrieve from Options list. - - -"
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/msgbranched/messagingbr/emailbr/clientmtms/loc/imcm_default_charset.loc Mon May 03 12:58:18 2010 +0300
@@ -0,0 +1,26 @@
+/*
+* Copyright (c) 2002 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".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* !!!!!!!LOCALISATION INSTRUCTIONS, IMPORTANT!!!!!!!
+* These default charsets are used to define correct default charsets for different builds.
+*
+*/
+
+
+
+// d: This is not visible to the user!
+// l: None
+#define qtn_default_email_charset "ISO-8859-1"
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/msgbranched/messagingbr/frameworkbr/server/group/msgs.rss Mon May 03 12:58:18 2010 +0300
@@ -0,0 +1,104 @@
+/*
+* Copyright (c) 1998-2003 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".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: msgs.rss*
+*/
+
+
+
+#include <msgs.loc>
+#include <msvstd.hrh>
+
+// Flags - defined in TMsvEntry
+
+#define KMsvEntryLowPriority 0x0000
+#define KMsvEntryMediumPriority 0x0001
+#define KMsvEntryHighPriority 0x0002
+
+//#define KMsvEntryStoreFlag 0x0004 // Not used
+#define KMsvEntryNotCompleteFlag 0x0008 // the netry is marked as incomplete
+#define KMsvEntryNewFlag 0x0010
+#define KMsvEntryUnreadFlag 0x0020
+#define KMsvEntryInvisibleFlag 0x0200 // will be invisible to the user
+#define KMsvEntryMultipleRecipientFlag 0x0400
+//#define KMsvEntryFileFlag 0x0800 // Not used
+#define KMsvEntryReadOnlyFlag 0x1000 // the entry or store cannot be altered
+#define KMsvEntryStandardFolder 0x4000 // the entry will be place at beginning of a selection
+
+
+
+STRUCT SERVERENTRY
+ {
+ LONG id;
+ LONG parent;
+ LONG service=KMsvLocalServiceIndexEntryIdValue;
+ LONG type;
+ LONG mtm=KUidMsvLocalServiceMtmValue;
+ LONG flags=KMsvEntryMediumPriority;
+ LTEXT description="";
+ LTEXT details="";
+ }
+
+STRUCT SERVERSTARTUPINDEX
+ {
+ STRUCT entries[]; // must be SERVERENTRY's
+ }
+
+RESOURCE SERVERSTARTUPINDEX r_server_index_startup
+ {
+ entries=
+ {
+ SERVERENTRY { id=KMsvLocalServiceIndexEntryIdValue;
+ parent=KMsvRootIndexEntryIdValue;
+ type=KUidMsvServiceEntryValue;
+ flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder;
+ details="Local"; },
+ SERVERENTRY { id=KMsvGlobalInBoxIndexEntryIdValue;
+ parent=KMsvLocalServiceIndexEntryIdValue;
+ type=KUidMsvFolderEntryValue;
+ flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder;
+ details=qtn_mce_inbox; },
+ SERVERENTRY { id=KMsvGlobalOutBoxIndexEntryIdValue;
+ parent=KMsvLocalServiceIndexEntryIdValue;
+ type=KUidMsvFolderEntryValue;
+ flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder;
+ details=qtn_mce_outbox; },
+ SERVERENTRY { id=KMsvDraftEntryIdValue;
+ parent=KMsvLocalServiceIndexEntryIdValue;
+ type=KUidMsvFolderEntryValue;
+ flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder;
+ details=qtn_mce_drafts; },
+ SERVERENTRY { id=KMsvSentEntryIdValue;
+ parent=KMsvLocalServiceIndexEntryIdValue;
+ type=KUidMsvFolderEntryValue;
+ flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder;
+ details=qtn_mce_sent_items; },
+ SERVERENTRY { id=0x1008;
+ parent=KMsvLocalServiceIndexEntryIdValue;
+ type=KUidMsvFolderEntryValue;
+ flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder;
+ details=qtn_mce_documents; },
+ SERVERENTRY { id=0x1009;
+ parent=0x1008;
+ type=KUidMsvFolderEntryValue;
+ flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder;
+ details=qtn_mce_doc_temp_folder; },
+ SERVERENTRY { id=KMsvDeletedEntryFolderEntryIdValue;
+ parent=KMsvLocalServiceIndexEntryIdValue;
+ type=KUidMsvFolderEntryValue;
+ flags=KMsvEntryReadOnlyFlag|KMsvEntryStandardFolder|KMsvEntryInvisibleFlag;
+ details="Deleted"; }
+ };
+ }
+
+// end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/msgbranched/messagingbr/frameworkbr/server/loc/msgs.loc Mon May 03 12:58:18 2010 +0300
@@ -0,0 +1,61 @@
+/*
+* Copyright (c) 2000 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".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* This file contains the localised strings for msgs
+*
+*/
+
+
+
+// LOCALISATION STRINGS
+
+// d: Main view list item.
+// d: Inbox
+// l: list_single_large_graphic_pane_t1
+//
+#define qtn_mce_inbox "Inbox"
+
+// d: Main view list item.
+// d: Documents
+// l: list_single_large_graphic_pane_t1
+//
+#define qtn_mce_documents "Documents"
+
+// d: Main view list item.
+// d: Drafts
+// l: list_single_large_graphic_pane_t1
+//
+#define qtn_mce_drafts "Drafts"
+
+// d: Main view list item.
+// d: Sent items
+// l: list_single_large_graphic_pane_t1
+//
+#define qtn_mce_sent_items "Sent items"
+
+// d: Main view list item.
+// d: Outbox
+// l: list_single_large_graphic_pane_t1
+//
+#define qtn_mce_outbox "Outbox"
+
+// d: Documents view list item. First item of the list when Documents folder is opened.
+// l: list_double_graphic_pane_t1
+//
+#define qtn_mce_doc_temp_folder "Templates"
+
+
+// End of File
+
+
--- a/package_definition.xml Fri Apr 16 15:27:42 2010 +0300
+++ b/package_definition.xml Mon May 03 12:58:18 2010 +0300
@@ -7,15 +7,15 @@
</component>
</collection>
<collection id="messagingfw" name="Messaging Framework" level="fw">
- <component id="alwaysonline" filter="s60" name="Always Online Server">
+ <component id="alwaysonline" filter="s60" name="Always Online Server" introduced="^2">
<!-- <unit bldFile="messagingfw/alwaysonline/alwaysonlinemanager/group"/> -->
<!-- <unit bldFile="messagingfw/alwaysonline/alwaysonlinestarterapp/group"/> -->
<unit bldFile="messagingfw/alwaysonline/group"/>
</component>
- <component id="msgcommonutils" filter="s60" name="Messaging Common Utils">
+ <component id="msgcommonutils" filter="s60" name="Messaging Common Utils" introduced="^2">
<unit bldFile="messagingfw/msgcommonutils/group"/>
</component>
- <component id="senduiservices" filter="s60" name="Send UI Services">
+ <component id="senduiservices" filter="s60" name="Send UI Services" introduced="^2">
<unit bldFile="messagingfw/senduiservices/group"/>
<!-- <unit bldFile="messagingfw/senduiservices/datautils/group"/> -->
<!-- <unit bldFile="messagingfw/senduiservices/launcher/group"/> -->
@@ -31,7 +31,7 @@
<component id="biomsgfw" name="BIO Messaging Framework" introduced="6.0" purpose="optional">
<unit bldFile="messagingfw/biomsgfw/group" mrp="messagingfw/biomsgfw/group/messaging_biomsg.mrp"/>
</component>
- <component id="msgconf" name="Messaging Config" introduced="tb91" purpose="optional" class="config">
+ <component id="msgconf" name="Messaging Config" introduced="^2" purpose="optional" class="config">
<unit bldFile="messagingfw/msgconf/group" mrp="messagingfw/msgconf/group/messaging_config.mrp"/>
</component>
<component id="watcherfw" name="Watcher Framework" purpose="optional">
@@ -40,14 +40,14 @@
<component id="msgtest" name="Messaging Test" purpose="development">
<unit bldFile="messagingfw/msgtest/group" mrp="messagingfw/msgtest/group/messaging_test.mrp"/>
</component>
- <component id="msgtests" name="Messaging Tests" purpose="development">
- <unit mrp="messagingfw/msgtests/group/messaging.mrp"/>
+ <component id="msgtests" name="Messaging Tests" purpose="development" filter="test">
+ <unit mrp="messagingfw/msgtests/group/messaging.mrp" bldFile="messagingfw/msgtests/group"/>
</component>
- <component id="msgtestfw" name="Messaging Test Framework" deprecated="tb92" purpose="development">
- <unit mrp="messagingfw/msgtestfw/group/messaging_testframework.mrp"/>
+ <component id="msgtestfw" name="Messaging Test Framework" deprecated="^3" purpose="development" filter="test">
+ <unit mrp="messagingfw/msgtestfw/group/messaging_testframework.mrp" bldFile="messagingfw/msgtestfw/group"/>
</component>
- <component id="msgtestproduct" name="Messaging Test Product" purpose="development">
- <unit mrp="messagingfw/msgtestproduct/group/messaging_testproduct.mrp"/>
+ <component id="msgtestproduct" name="Messaging Test Product" purpose="development" filter="test">
+ <unit mrp="messagingfw/msgtestproduct/group/messaging_testproduct.mrp" bldFile="messagingfw/msgtestproduct/group"/>
</component>
<component id="sendas" name="Send As" purpose="optional">
<unit bldFile="messagingfw/sendas/group" mrp="messagingfw/sendas/group/messaging_sendas2.mrp"/>
@@ -58,10 +58,10 @@
<component id="wappushfw" name="WAP Push Framework" introduced="6.1" purpose="optional">
<unit bldFile="messagingfw/wappushfw/group" mrp="messagingfw/wappushfw/group/wap-browser_wappush.mrp"/>
</component>
- <component id="suplsmshandler" name="SUPL SMS Handler" introduced="tb91" purpose="development" class="plugin">
+ <component id="suplsmshandler" name="SUPL SMS Handler" introduced="^2" purpose="development" class="plugin">
<unit bldFile="messagingfw/suplsmshandler/group" mrp="messagingfw/suplsmshandler/group/lbs_suplsmstrigger.mrp"/>
</component>
- <component id="suplwappushhandler" name="SUPL WAP Push Handler" introduced="tb91" purpose="optional" class="plugin">
+ <component id="suplwappushhandler" name="SUPL WAP Push Handler" introduced="^2" purpose="optional" class="plugin">
<unit bldFile="messagingfw/suplwappushhandler/group" mrp="messagingfw/suplwappushhandler/group/lbs_suplwappush.mrp"/>
</component>
</collection>
@@ -75,7 +75,7 @@
<unit bldFile="msgfw_plat/group"/>
<unit bldFile="msgfw_plat/send_ui_plugin_api/tsrc/group"/>
</component>
- <component id="messagingmw_metadata" name="Messaging Middleware Metadata" class="config" introduced="tb91" purpose="development" target="desktop">
+ <component id="messagingmw_metadata" name="Messaging Middleware Metadata" class="config" introduced="^2" purpose="development" target="desktop">
<unit mrp="messagingmw_info/messagingmw_metadata/messagingmw_metadata.mrp"/>
</component>
</collection>