From a36672a3b1367b524be94d5c1a9d668afd45a8b5 Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwelk@xhochy.com>
Date: Sat, 21 Sep 2013 00:12:45 +0200
Subject: [PATCH] Add missing metadata so that Hatchet is shown in the
 Diagnostics dialog

---
 src/accounts/hatchet/account/HatchetAccount.cpp | 6 ++++++
 src/accounts/hatchet/account/HatchetAccount.h   | 3 ---
 src/libtomahawk/accounts/Account.h              | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/accounts/hatchet/account/HatchetAccount.cpp b/src/accounts/hatchet/account/HatchetAccount.cpp
index 6756f58b8..c1fe41d2e 100644
--- a/src/accounts/hatchet/account/HatchetAccount.cpp
+++ b/src/accounts/hatchet/account/HatchetAccount.cpp
@@ -83,6 +83,10 @@ HatchetAccount::HatchetAccount( const QString& accountId )
 {
     s_instance = this;
 
+    setAccountServiceName( "Hatchet" );
+    // We're connecting peers.
+    setTypes( SipType );
+
     QFile pemFile( ":/hatchet-account/mandella.pem" );
     pemFile.open( QIODevice::ReadOnly );
     tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "certs/mandella.pem: " << pemFile.readAll();
@@ -133,9 +137,11 @@ HatchetAccount::authenticate()
         qDebug() << "Have saved credentials with auth token:" << authToken();
         if ( sipPlugin() )
             sipPlugin()->connectPlugin();
+        setAccountFriendlyName( username() );
     }
     else if ( !username().isEmpty() )
     {
+        setAccountFriendlyName( username() );
         // Need to re-prompt for password, since we don't save it!
     }
 }
diff --git a/src/accounts/hatchet/account/HatchetAccount.h b/src/accounts/hatchet/account/HatchetAccount.h
index 5951f281d..a3c767a67 100644
--- a/src/accounts/hatchet/account/HatchetAccount.h
+++ b/src/accounts/hatchet/account/HatchetAccount.h
@@ -52,10 +52,7 @@ public:
     virtual bool isUnique() const { return true; }
     AccountTypes types() const { return AccountTypes( SipType ); }
 //    virtual bool allowUserCreation() const { return false; }
-#ifndef ENABLE_HEADLESS
     virtual QPixmap icon() const;
-#endif
-
 
     virtual Account* createAccount ( const QString& pluginId = QString() );
 };
diff --git a/src/libtomahawk/accounts/Account.h b/src/libtomahawk/accounts/Account.h
index 6c2eb8767..fd9f0bb4d 100644
--- a/src/libtomahawk/accounts/Account.h
+++ b/src/libtomahawk/accounts/Account.h
@@ -56,7 +56,7 @@ enum AccountType
 
 DLLEXPORT QString accountTypeToString( AccountType type );
 
-Q_DECLARE_FLAGS(AccountTypes, AccountType);
+Q_DECLARE_FLAGS( AccountTypes, AccountType )
 
 inline QString generateId( const QString& factoryId )
 {