fix display of own vCard

3 files changed, 8 insertions, 5 deletions

diff --git a/examples/GuiClient/mainDialog.cpp b/examples/GuiClient/mainDialog.cpp
index 06480505..dab9da2c 100644
--- a/examples/GuiClient/mainDialog.cpp
+++ b/examples/GuiClient/mainDialog.cpp
@@ -431,13 +431,16 @@ void mainDialog::avatarChanged(const QImage& image)
 
 void mainDialog::updateStatusWidget()
 {
-    // fetch selfVCard
-    m_xmppClient.vCardManager().requestVCard();
+    const QString bareJid = m_xmppClient.configuration().jidBare();
 
-    m_statusWidget.setDisplayName(m_xmppClient.configuration().jidBare());
+    // initialise status widget
+    updateVCard(bareJid);
     m_statusWidget.setStatusText(presenceToStatusText(m_xmppClient.clientPresence()));
     m_statusWidget.setPresenceAndStatusType(m_xmppClient.clientPresence().type(),
                                             m_xmppClient.clientPresence().availableStatusType());
+
+    // fetch own vCard
+    m_vCardCache.requestVCard(bareJid);
 }
 
 void mainDialog::signIn()
diff --git a/examples/GuiClient/vCardCache.cpp b/examples/GuiClient/vCardCache.cpp
index 6b1935d2..83a0779d 100644
--- a/examples/GuiClient/vCardCache.cpp
+++ b/examples/GuiClient/vCardCache.cpp
@@ -52,7 +52,7 @@ void vCardCache::vCardReceived(const QXmppVCardIq& vcard)
     emit vCardReadyToUse(from);
 }
 
-bool vCardCache::isVCardAvailable(const QString& bareJid)
+bool vCardCache::isVCardAvailable(const QString& bareJid) const
 {
     return m_mapBareJidVcard.contains(bareJid);
 }
diff --git a/examples/GuiClient/vCardCache.h b/examples/GuiClient/vCardCache.h
index f8586d47..a2b69d1f 100644
--- a/examples/GuiClient/vCardCache.h
+++ b/examples/GuiClient/vCardCache.h
@@ -39,7 +39,7 @@ class vCardCache : public QObject
 public:
     vCardCache(QXmppClient* client);
 
-    bool isVCardAvailable(const QString& bareJid);
+    bool isVCardAvailable(const QString& bareJid) const;
     void requestVCard(const QString& bareJid);
     QXmppVCardIq& getVCard(const QString& bareJid);
     QImage getAvatar(const QString& bareJid) const;