Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Adding changes for abortsync api and default configuration.
  • Loading branch information
Amit committed Feb 3, 2011
1 parent 0e55fdd commit bafa892
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 14 deletions.
3 changes: 2 additions & 1 deletion debian/changelog
@@ -1,8 +1,9 @@
libmeegosyncml (0.4.12) stable; urgency=low

* Fixes: NB#223952 - Not all the contacts are syncd from DUT to S60
* Adding changes to remove default configuration and abort sync to take parameter.

-- Deepak Kodihalli <deepak.kodihalli@nokia.com> Thu, 03 Feb 2011 14:40:03 +0530
-- Amit <amit.5.aggarwal@nokia.com> Thu, 03 Feb 2011 14:40:03 +0530

libmeegosyncml (0.4.11) stable; urgency=low

Expand Down
8 changes: 4 additions & 4 deletions src/SyncAgent.cpp
Expand Up @@ -160,12 +160,12 @@ bool SyncAgent::resumeSync()

}

bool SyncAgent::abort()
bool SyncAgent::abort(DataSync::SyncState aState)
{
FUNCTION_CALL_TRACE

if( iHandler ) {
abortSession();
abortSession(aState);
return true;
}
else if( iListener ) {
Expand Down Expand Up @@ -407,13 +407,13 @@ bool SyncAgent::startServerInitiatedSession( const SyncAgentConfig& aConfig )
return true;
}

void SyncAgent::abortSession()
void SyncAgent::abortSession(DataSync::SyncState aState)
{
FUNCTION_CALL_TRACE

Q_ASSERT( iHandler );

QMetaObject::invokeMethod( iHandler, "abortSync", Q_ARG( DataSync::SyncState, ABORTED ),
QMetaObject::invokeMethod( iHandler, "abortSync", Q_ARG( DataSync::SyncState, aState ),
Q_ARG( QString, "User aborted synchronization" ) );
}

Expand Down
6 changes: 3 additions & 3 deletions src/SyncAgent.h
Expand Up @@ -636,11 +636,11 @@ Q_OBJECT
bool isListening() const;

/*! \ brief Aborts listening for requests or an ongoing synchronization
*
* \param abort state
*
* @return True if there was some operation ongoing which was aborted, otherwise false
*/
bool abort();
bool abort(DataSync::SyncState aState = DataSync::ABORTED);

/*! \brief Pause synchronization
*
Expand Down Expand Up @@ -738,7 +738,7 @@ private slots:
bool startClientInitiatedSession( const SyncAgentConfig& aConfig );
bool startServerInitiatedSession( const SyncAgentConfig& aConfig );

void abortSession();
void abortSession(DataSync::SyncState aState);
void cleanSession();

bool initiateListen( const SyncAgentConfig& aConfig );
Expand Down
7 changes: 1 addition & 6 deletions src/transport/HTTPTransport.cpp
Expand Up @@ -50,12 +50,7 @@ HTTPTransport::HTTPTransport( const ProtocolContext& aContext, QObject* aParent

iManager = new QNetworkAccessManager;

QNetworkConfigurationManager confmanager;
iManager->setConfiguration(confmanager.defaultConfiguration());

connect( &confmanager, SIGNAL(onlineStateChanged(bool)),
this, SLOT(slotNetworkStateChanged(bool)));

iManager->setConfiguration(QNetworkConfiguration());
iManager->proxy().setType( QNetworkProxy::NoProxy );
}

Expand Down

0 comments on commit bafa892

Please sign in to comment.