equal
deleted
inserted
replaced
40 ****************************************************************************/ |
40 ****************************************************************************/ |
41 #include "qmessageaccount.h" |
41 #include "qmessageaccount.h" |
42 #include "qmessageaccount_p.h" |
42 #include "qmessageaccount_p.h" |
43 #include "qmessagemanager.h" |
43 #include "qmessagemanager.h" |
44 #include "qmtmengine_symbian_p.h" |
44 #include "qmtmengine_symbian_p.h" |
|
45 #ifdef FREESTYLEMAILUSED |
|
46 #include "qfsengine_symbian_p.h" |
|
47 #endif |
45 |
48 |
46 QTM_BEGIN_NAMESPACE |
49 QTM_BEGIN_NAMESPACE |
47 |
50 |
48 QMessageAccount QMessageAccountPrivate::from(const QMessageAccountId &id, const QString &name, long int service1EntryId, long int service2EntryId, const QMessage::TypeFlags &types) |
51 QMessageAccount QMessageAccountPrivate::from(const QMessageAccountId &id, const QString &name, long int service1EntryId, long int service2EntryId, const QMessage::TypeFlags &types) |
49 { |
52 { |
103 return d_ptr->_types; |
106 return d_ptr->_types; |
104 } |
107 } |
105 |
108 |
106 QMessageAccountId QMessageAccount::defaultAccount(QMessage::Type type) |
109 QMessageAccountId QMessageAccount::defaultAccount(QMessage::Type type) |
107 { |
110 { |
108 return CMTMEngine::instance()->defaultAccount(type); |
111 #ifdef FREESTYLEMAILUSED |
109 // or return CFSEngine::instance()->defaultAccount(type); |
112 if (type == QMessage::Email) { |
|
113 QMessageAccountId id = CFSEngine::instance()->defaultAccount(type); |
|
114 if (id.isValid()) |
|
115 return id; |
|
116 else return CMTMEngine::instance()->defaultAccount(type); |
|
117 } |
|
118 #endif // FREESTYLEMAILUSED |
|
119 return CMTMEngine::instance()->defaultAccount(type); |
110 } |
120 } |
111 |
121 |
112 QTM_END_NAMESPACE |
122 QTM_END_NAMESPACE |