From 8d5688abf2c695f384ef5acf6fa2eeecf1b702c1 Mon Sep 17 00:00:00 2001
From: Manjeet Dahiya <manjeetdahiya@gmail.com>
Date: Sat, 12 Sep 2009 05:57:39 +0000
Subject: bug fixes

---
 source/QXmppRoster.cpp | 2 +-
 source/QXmppStream.cpp | 3 +++
 source/QXmppUtils.cpp  | 4 ++--
 source/QXmppUtils.h    | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'source')

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
-- 
cgit v1.2.3