Hello community,
here is the log from the commit of package bluedevil for openSUSE:Factory
checked in at 2011-10-28 19:15:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bluedevil (Old)
and /work/SRC/openSUSE:Factory/.bluedevil.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bluedevil", Maintainer is ""
Changes:
--------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluedevil-obexsession-iterators.diff ++++++
--- /var/tmp/diff_new_pack.eiKLQ7/_old 2011-10-28 19:22:33.000000000 +0200
+++ /var/tmp/diff_new_pack.eiKLQ7/_new 2011-10-28 19:22:33.000000000 +0200
@@ -1,30 +1,27 @@
diff --git a/src/daemon/obexftpkded/ObexFtpDaemon.cpp
b/src/daemon/obexftpkded/ObexFtpDaemon.cpp
-index ce7e675..3d97d40 100644
+index ce7e675..f4d70ad 100644
--- a/src/daemon/obexftpkded/ObexFtpDaemon.cpp
+++ b/src/daemon/obexftpkded/ObexFtpDaemon.cpp
-@@ -337,17 +337,20 @@ void ObexFtpDaemon::SessionConnected(QDBusObjectPath
path)
+@@ -337,17 +337,18 @@ void ObexFtpDaemon::SessionConnected(QDBusObjectPath
path)
void ObexFtpDaemon::SessionClosed(QDBusObjectPath path)
{
kDebug();
- QHash<QString, ObexSession*>::const_iterator i =
d->m_sessionMap.constBegin();
+- while (i != d->m_sessionMap.constEnd()) {
+ QHash<QString, ObexSession*>::iterator i = d->m_sessionMap.begin();
- while (i != d->m_sessionMap.constEnd()) {
++ while (i != d->m_sessionMap.end()) {
//If the session is connected, so not 0
if (i.value()->path() == path.path()) {
kDebug() << "Removing : " << i.key();
emit sessionClosed(i.key());
- d->m_sessionMap.remove(i.key());
-- delete i.value();
-+ // hang on, if this is a const_iterator then is it valid after it
is removed
-+ ObexSession * closedSession = i.value();
+ delete i.value();
+ i = d->m_sessionMap.erase(i);
-+ delete closedSession;
return;
-- }
-- ++i;
+ } else {
+ ++i;
-+ }
+ }
+- ++i;
}
kDebug() << "Attempt to remove a nto existing session";
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
