--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagdaemon.cpp Fri Mar 19 09:35:30 2010 +0200
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagdaemon.cpp Fri Apr 16 15:16:16 2010 +0300
@@ -85,8 +85,6 @@
#endif
InitializeL();
-
- iReconnect = CPeriodic::NewL(CActive::EPriorityIdle);
TN_DEBUG1( "CThumbAGDaemon::ConstructL() - end" );
}
@@ -128,6 +126,12 @@
iProcessor = CThumbAGProcessor::NewL();
+ // MDS session reconnect timer
+ if (!iReconnect)
+ {
+ iReconnect = CPeriodic::NewL(CActive::EPriorityIdle);
+ }
+
TN_DEBUG1( "CThumbAGDaemon::InitializeL() - connect to MDS" );
if(iMdESession)
@@ -190,7 +194,7 @@
#endif
//present observer
- TRAP_IGNORE(iMdESession->RemoveObjectPresentObserverL( * this ));
+ TRAP_IGNORE( iMdESession->RemoveObjectPresentObserverL( *this ) );
delete iMdESession;
iMdESession = NULL;
@@ -306,7 +310,7 @@
// -----------------------------------------------------------------------------
//
-void CThumbAGDaemon::HandleUriObjectNotification(CMdESession& aSession,
+void CThumbAGDaemon::HandleUriObjectNotification(CMdESession& /*aSession*/,
TObserverNotificationType aType,
const RArray<TItemId>& aObjectIdArray,
const RPointerArray<HBufC>& aObjectUriArray)
@@ -510,7 +514,9 @@
iMdESession->AddObjectObserverL( *this, addCondition, ENotifyAdd );
// modify observer
- //iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify );
+#ifdef MDS_MODIFY_OBSERVER
+ iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify );
+#endif
#ifdef MDS_URI_OBSERVER
// remove observer with uri