From e1cdc4820a8c2b8f9237dcaf26e141074e4ad1a1 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Fri, 6 May 2011 12:17:09 -0400
Subject: [PATCH] change SIP menu entry to friendlyname rather than JREEN

---
 src/sip/jreen/googlewrapper/googlewrapper.h | 7 ++++---
 src/sip/jreen/jabber.cpp                    | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/sip/jreen/googlewrapper/googlewrapper.h b/src/sip/jreen/googlewrapper/googlewrapper.h
index 80fe3290a..7cb89f165 100644
--- a/src/sip/jreen/googlewrapper/googlewrapper.h
+++ b/src/sip/jreen/googlewrapper/googlewrapper.h
@@ -30,7 +30,7 @@ public:
     GoogleWrapperFactory() {}
     virtual ~GoogleWrapperFactory() {}
 
-    virtual QString prettyName() const { return "GMail"; }
+    virtual QString prettyName() const { return "Google"; }
     virtual QString factoryId() const { return "sipgoogle"; }
     virtual QIcon icon() const;
     virtual SipPlugin* createPlugin( const QString& pluginId );
@@ -43,9 +43,10 @@ public:
   GoogleWrapper( const QString& pluginID );
   virtual ~GoogleWrapper() {}
 
-  virtual const QString name() const { return QString( "GMail" ); }
-  virtual const QString friendlyName() const { return "GMail Friends"; }
+  virtual const QString name() const { return QString( "Google" ); }
+  virtual const QString friendlyName() const { return "Google"; }
   virtual QIcon icon() const;
+
 };
 
 #endif // GOOGLEWRAPPER_H
diff --git a/src/sip/jreen/jabber.cpp b/src/sip/jreen/jabber.cpp
index 97eee85a9..b2c67e6d5 100644
--- a/src/sip/jreen/jabber.cpp
+++ b/src/sip/jreen/jabber.cpp
@@ -529,7 +529,7 @@ void JabberPlugin::addMenuHelper()
 {
     if( !m_menu )
     {
-        m_menu = new QMenu( QString( "JREEN (" ).append( accountName() ).append(")" ) );
+        m_menu = new QMenu( QString( "%1 (" ).arg( friendlyName() ).append( accountName() ).append(")" ) );
         m_addFriendAction = m_menu->addAction( "Add Friend..." );
 
         connect( m_addFriendAction, SIGNAL( triggered() ), this, SLOT( showAddFriendDialog() ) );