diff options
| author | Manjeet Dahiya <manjeetdahiya@gmail.com> | 2009-09-12 05:57:39 +0000 |
|---|---|---|
| committer | Manjeet Dahiya <manjeetdahiya@gmail.com> | 2009-09-12 05:57:39 +0000 |
| commit | 8d5688abf2c695f384ef5acf6fa2eeecf1b702c1 (patch) | |
| tree | 9e4c448a00d5e3a37db6083604ec19a5483ccd45 /source | |
| parent | f281e53af318f951c42bd701fc5634cd8aa1b33e (diff) | |
| download | qxmpp-8d5688abf2c695f384ef5acf6fa2eeecf1b702c1.tar.gz | |
bug fixes
Diffstat (limited to 'source')
| -rw-r--r-- | source/QXmppRoster.cpp | 2 | ||||
| -rw-r--r-- | source/QXmppStream.cpp | 3 | ||||
| -rw-r--r-- | source/QXmppUtils.cpp | 4 | ||||
| -rw-r--r-- | source/QXmppUtils.h | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/source/QXmppRoster.cpp b/source/QXmppRoster.cpp index 0eade27c..13f38925 100644 --- a/source/QXmppRoster.cpp +++ b/source/QXmppRoster.cpp @@ -60,7 +60,7 @@ void QXmppRoster::rosterIqReceived(const QXmppRosterIq& rosterIq) {
QString bareJid = items.at(i).getBareJid();
m_entries[bareJid].setBareJid(bareJid);
- m_entries[bareJid].setName(items.at(i).getSubscriptionStatus());
+ m_entries[bareJid].setName(items.at(i).getName());
m_entries[bareJid].setSubscriptionType(
static_cast<QXmppRosterEntry::SubscriptionType>(
items.at(i).getSubscriptionType()));
diff --git a/source/QXmppStream.cpp b/source/QXmppStream.cpp index 95cc929a..c967321f 100644 --- a/source/QXmppStream.cpp +++ b/source/QXmppStream.cpp @@ -310,11 +310,14 @@ void QXmppStream::parser(const QByteArray& data) while(!itemElement.isNull())
{
QXmppRosterIq::Item item;
+ item.setName(itemElement.attribute("name"));
item.setBareJid(itemElement.attribute("jid"));
item.setSubscriptionTypeFromStr(
itemElement.attribute("subscription"));
item.setSubscriptionStatus(
itemElement.attribute("ask"));
+ item.addGroup(
+ itemElement.firstChildElement("group").firstChildElement().text());
rosterIq.addItem(item);
itemElement = itemElement.nextSiblingElement();
}
diff --git a/source/QXmppUtils.cpp b/source/QXmppUtils.cpp index b5339985..0b16da03 100644 --- a/source/QXmppUtils.cpp +++ b/source/QXmppUtils.cpp @@ -122,9 +122,9 @@ QString getImageType(const QByteArray& image) return "image/unknown";
}
-QByteArray getImageHash(const QByteArray& image)
+QString getImageHash(const QByteArray& image)
{
- return QCryptographicHash::hash(image, QCryptographicHash::Sha1);
+ return QString(QCryptographicHash::hash(image, QCryptographicHash::Sha1).toHex());
}
QImage getImageFromByteArray(const QByteArray& image)
diff --git a/source/QXmppUtils.h b/source/QXmppUtils.h index 635b80b8..cb753003 100644 --- a/source/QXmppUtils.h +++ b/source/QXmppUtils.h @@ -50,7 +50,7 @@ QString escapeString(const QString& str); QString unescapeString(const QString& str);
QString getImageType(const QByteArray& image);
-QByteArray getImageHash(const QByteArray& image);
+QString getImageHash(const QByteArray& image);
QImage getImageFromByteArray(const QByteArray& image);
#endif // QXMPPUTILS_H
|