[telepathy-qt4/master] Fix Bug 23040, running connection managers appear twice in ConnectionManager::listNames result.
George Goldberg
george.goldberg at collabora.co.uk
Thu Jul 30 06:41:37 PDT 2009
---
TelepathyQt4/connection-manager-internal.h | 3 ++-
TelepathyQt4/connection-manager.cpp | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/TelepathyQt4/connection-manager-internal.h b/TelepathyQt4/connection-manager-internal.h
index b9d77df..a919c36 100644
--- a/TelepathyQt4/connection-manager-internal.h
+++ b/TelepathyQt4/connection-manager-internal.h
@@ -27,6 +27,7 @@
#include <QDBusConnection>
#include <QLatin1String>
#include <QQueue>
+#include <QSet>
#include <QString>
namespace Tp
@@ -85,7 +86,7 @@ private:
void parseResult(const QStringList &names);
QQueue<QLatin1String> mMethodsQueue;
- QStringList mResult;
+ QSet<QString> mResult;
QDBusConnection mBus;
};
diff --git a/TelepathyQt4/connection-manager.cpp b/TelepathyQt4/connection-manager.cpp
index 7876f92..3cec376 100644
--- a/TelepathyQt4/connection-manager.cpp
+++ b/TelepathyQt4/connection-manager.cpp
@@ -297,7 +297,7 @@ void ConnectionManager::Private::PendingNames::continueProcessing()
}
else {
debug() << "Success: list" << mResult;
- setResult(mResult);
+ setResult(mResult.toList());
setFinished();
}
}
--
1.5.6.5
More information about the telepathy-commits
mailing list