--- a/qtmobility/plugins/contacts/wince/qcontactwincebackend.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/plugins/contacts/wince/qcontactwincebackend.cpp	Fri May 14 16:41:33 2010 +0300
@@ -87,14 +87,14 @@
                 if(SUCCEEDED(d->m_app->GetDefaultFolder(olFolderContacts, &d->m_folder))) {
                     if(SUCCEEDED(d->m_folder->get_Items(&d->m_collection))) {
                         // Register/retrieve our custom ids
-                        LPCWSTR customIds[4] = { L"QTCONTACTS_PHONE_META", L"QTCONTACTS_EMAIL_META", L"QTCONTACTS_AVATAR_META",  L"QTCONTACTS_AVATAR_TYPE_META" };
+                        LPCWSTR customIds[4] = { L"QTCONTACTS_PHONE_META", L"QTCONTACTS_EMAIL_META", L"QTCONTACTS_AVATAR_IMAGE_META",  L"QTCONTACTS_AVATAR_VIDEO_META" };
                         CEPROPID outIds[4];
 
                         if (SUCCEEDED(d->m_app->GetIDsFromNames(4, customIds, PIM_CREATE | CEVT_LPWSTR, outIds))) {
                             d->m_phonemeta = outIds[0];
                             d->m_emailmeta = outIds[1];
-                            d->m_avatarmeta = outIds[2];
-                            d->m_avatartypemeta = outIds[3];
+                            d->m_avatarImageMeta = outIds[2];
+                            d->m_avatarVideoMeta = outIds[3];
                         }
 
                         // get an IPOLItems2 pointer for the collection, too
@@ -335,12 +335,6 @@
     // No contexts for these details
     fields =  defns[contactType][QContactAvatar::DefinitionName].fields();
     fields.remove(QContactDetail::FieldContext);
-    fields.remove(QContactDetail::FieldContext);
-    fields.remove(QContactDetail::FieldContext);
-    fields.remove(QContactDetail::FieldContext);
-    fields.remove(QContactDetail::FieldContext);
-    fields.remove(QContactDetail::FieldContext);
-    fields.remove(QContactDetail::FieldContext);
     defns[contactType][QContactAvatar::DefinitionName].setFields(fields);
 
     // Simple phone number types (non multiple)
@@ -433,14 +427,14 @@
 
 
 
-PROPID QContactWinCEEngine::metaAvatar() const
+PROPID QContactWinCEEngine::metaAvatarImage() const
 {
-    return d->m_avatarmeta;
+    return d->m_avatarImageMeta;
 }
 
-PROPID QContactWinCEEngine::metaAvatarType() const
+PROPID QContactWinCEEngine::metaAvatarVideo() const
 {
-    return d->m_avatartypemeta;
+    return d->m_avatarVideoMeta;
 }
 
 PROPID QContactWinCEEngine::metaEmail() const
@@ -471,12 +465,6 @@
 }
 
 /*! \reimp */
-QMap<QString, QString> QContactWinCEEngine::managerParameters() const
-{
-    return QMap<QString, QString>();
-}
-
-/*! \reimp */
 int QContactWinCEEngine::managerVersion() const
 {
     return QTCONTACTS_VERSION;
@@ -496,22 +484,6 @@
 }
 
 /*! \reimp */
-bool QContactWinCEEngine::saveRelationship(QContactRelationship* relationship, QContactManager::Error* error)
-{
-    Q_UNUSED(relationship);
-    *error = QContactManager::NotSupportedError;
-    return false;
-}
-
-/*! \reimp */
-bool QContactWinCEEngine::removeRelationship(const QContactRelationship& relationship, QContactManager::Error* error)
-{
-    Q_UNUSED(relationship);
-    *error = QContactManager::NotSupportedError;
-    return false;
-}
-
-/*! \reimp */
 bool QContactWinCEEngine::saveContacts(QList<QContact>* contacts, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error)
 {
     bool ret = true;
@@ -544,67 +516,6 @@
     return ret;
 }
 
-/*! \reimp */
-bool QContactWinCEEngine::setSelfContactId(const QContactLocalId& contactId, QContactManager::Error* error)
-{
-    Q_UNUSED(contactId);
-    *error = QContactManager::NotSupportedError;
-    return false;
-}
-
-/*! \reimp */
-QContactLocalId QContactWinCEEngine::selfContactId(QContactManager::Error* error) const
-{
-    *error = QContactManager::NotSupportedError;
-    return QContactLocalId();
-}
-
-/*! \reimp */
-QList<QContactRelationship> QContactWinCEEngine::relationships(const QString& relationshipType, const QContactId& participantId, QContactRelationship::Role role, QContactManager::Error* error) const
-{
-    Q_UNUSED(relationshipType);
-    Q_UNUSED(participantId);
-    Q_UNUSED(role);
-    *error = QContactManager::NotSupportedError;
-    return QList<QContactRelationship>();
-}
-
-/*! \reimp */
-bool QContactWinCEEngine::saveRelationships(QList<QContactRelationship>* relationships, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error)
-{
-    Q_UNUSED(relationships);
-    Q_UNUSED(errorMap);
-    *error = QContactManager::NotSupportedError;
-    return false;
-}
-
-/*! \reimp */
-bool QContactWinCEEngine::removeRelationships(const QList<QContactRelationship>& relationships, QMap<int, QContactManager::Error>* errorMap, QContactManager::Error* error)
-{
-    Q_UNUSED(relationships);
-    Q_UNUSED(errorMap);
-    *error = QContactManager::NotSupportedError;
-    return false;
-}
-
-/*! \reimp */
-bool QContactWinCEEngine::saveDetailDefinition(const QContactDetailDefinition& def, const QString& contactType, QContactManager::Error* error)
-{
-    Q_UNUSED(def);
-    Q_UNUSED(contactType);
-    *error = QContactManager::NotSupportedError;
-    return false;
-}
-
-/*! \reimp */
-bool QContactWinCEEngine::removeDetailDefinition(const QString& definitionId, const QString& contactType, QContactManager::Error* error)
-{
-    Q_UNUSED(definitionId);
-    Q_UNUSED(contactType);
-    *error = QContactManager::NotSupportedError;
-    return false;
-}
-
 /*!
  * Returns the list of data types supported by the WinCE engine
  */
@@ -647,4 +558,4 @@
      QMutexLocker locker(&m_mutex);
      m_engine = 0;
  }
-Q_EXPORT_PLUGIN2(contacts_wince, ContactWinceFactory);
+Q_EXPORT_PLUGIN2(qtcontacts_wince, ContactWinceFactory);