--- a/emailservices/emailserver/cmailhandlerplugin/src/cmailcpshandler.cpp Wed Sep 15 11:52:37 2010 +0300
+++ b/emailservices/emailserver/cmailhandlerplugin/src/cmailcpshandler.cpp Wed Oct 13 14:11:15 2010 +0300
@@ -43,8 +43,6 @@
#include "cmailpluginproxy.h"
#include "cmailhandlerpluginpanic.h"
-#include "fsemailserverpskeys.h"
-
using namespace EmailInterface;
// ---------------------------------------------------------
@@ -100,18 +98,6 @@
InitializeExternalAccountsL();
iSettings->StartObservingL( this );
-
- TInt err = RProperty::Define( KPSUidEmailServerCategory,
- KIntMailboxCount,
- RProperty::EInt );
- if ( err != KErrAlreadyExists && err != KErrNone )
- {
- User::LeaveIfError( err );
- }
-
- // set mailbox initial count
- TInt intCount = TotalIntMailboxCount();
- User::LeaveIfError( RProperty::Set( KPSUidEmailServerCategory, KIntMailboxCount, intCount ) );
}
// ---------------------------------------------------------
@@ -484,7 +470,7 @@
// Use localisation format when displaying also unread messages
// Arrays must be used when loc string contains indexed parameters
- CDesCArrayFlat* strings = new( ELeave) CDesCArrayFlat( 1 );
+ CDesCArrayFlat* strings = new CDesCArrayFlat( 1 );
CleanupStack::PushL( strings );
strings->AppendL( accountName ); // replace "%0U" with mailbox name
@@ -945,10 +931,6 @@
{
iLiwIf->AddWidgetToHomescreenL( aMailbox );
}
-
- // update total mailbox count.
- TInt intCount = TotalIntMailboxCount();
- User::LeaveIfError( RProperty::Set( KPSUidEmailServerCategory, KIntMailboxCount, intCount ) );
}
// ---------------------------------------------------------
@@ -998,9 +980,6 @@
break;
}
}
- // update total mailbox count.
- TInt intCount = TotalIntMailboxCount();
- User::LeaveIfError( RProperty::Set( KPSUidEmailServerCategory, KIntMailboxCount, intCount ) );
}
@@ -1824,6 +1803,17 @@
}
// ----------------------------------------------------------------------------
+// CMailCpsHandler::GetWidgetSetupBrandIconVariant()
+// Get widget setup brand icon variant
+// ----------------------------------------------------------------------------
+//
+TInt CMailCpsHandler::GetWidgetSetupBrandIconVariant()
+ {
+ FUNC_LOG;
+ return iSettings->GetWidgetSetupBrandIconVariant();
+ }
+
+// ----------------------------------------------------------------------------
// class CMailCpsUpdateHelper : public CTimer
// Used to limit the rate of updates to Homescreen widget
// ----------------------------------------------------------------------------