tweak icons, make things work more

src/sip/jreen/googlewrapper/CMakeLists.txt

@@ -19,8 +19,8 @@ add_definitions(-DGOOGLE_WRAPPER)
 
 qt4_add_resources( RCX_SRCS "resources.qrc" )
 
-qt4_wrap_cpp( googleMoc googlewrapper.h )
+qt4_wrap_cpp( googleMoc ../jabber.h ../avatarmanager.h googlewrapper.h )
-add_library( tomahawk_sipgoogle SHARED ${googleSources} ${googleMoc} ${jabberMoc} ${RCX_SRCS} )
+add_library( tomahawk_sipgoogle SHARED ${googleSources} ${googleMoc} ${googleMoc} ${RCX_SRCS} )
 
 target_link_libraries( tomahawk_sipgoogle
     ${QT_LIBRARIES}

src/sip/jreen/googlewrapper/googlewrapper.cpp

@@ -31,7 +31,7 @@ GoogleWrapperFactory::createPlugin( const QString& pluginId )
 QIcon
 GoogleWrapperFactory::icon() const
 {
-    return QIcon( ":/gmail-logo.jpg" );
+    return QIcon( ":/gmail-logo.png" );
 }
 
 GoogleWrapper::GoogleWrapper ( const QString& pluginID )
@@ -45,7 +45,7 @@ GoogleWrapper::GoogleWrapper ( const QString& pluginID )
 QIcon
 GoogleWrapper::icon() const
 {
-    return QIcon( ":/gmail-logo.jpg" );
+    return QIcon( ":/gmail-logo.png" );
 }
 
 

src/sip/jreen/googlewrapper/resources.qrc

@@ -1,5 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-<file>gmail-logo.jpg</file>
+<file>gmail-logo.png</file>
 </qresource>
 </RCC>

src/sip/twitter/resources.qrc

@@ -1,5 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-<file>twitter-icon.jpg</file>
+<file>twitter-icon.png</file>
 </qresource>
 </RCC>

src/sip/twitter/twitter.cpp

@@ -43,7 +43,7 @@ TwitterFactory::createPlugin( const QString& pluginId )
 
 QIcon TwitterFactory::icon() const
 {
-    return QIcon( ":/twitter-icon.jpg" );
+    return QIcon( ":/twitter-icon.png" );
 }
 
 
@@ -124,7 +124,7 @@ TwitterPlugin::accountName() const
 QIcon
 TwitterPlugin::icon() const
 {
-    return QIcon( ":/twitter-icon.jpg" );
+    return QIcon( ":/twitter-icon.png" );
 }
 
 

src/sip/zeroconf/resources.qrc

@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+<file>zeroconf-icon.png</file>
+</qresource>
+</RCC>

src/sip/zeroconf/zeroconf.cpp

@@ -52,6 +52,12 @@ ZeroconfPlugin::connectionState() const
     return m_state;
 }
 
+QIcon
+ZeroconfFactory::icon() const
+{
+    return QIcon( ":/zeroconf-icon.png" );
+}
+
 
 bool
 ZeroconfPlugin::connectPlugin( bool /*startup*/ )
@@ -82,6 +88,13 @@ ZeroconfPlugin::disconnectPlugin()
     m_zeroconf = 0;
 }
 
+QIcon
+ZeroconfPlugin::icon() const
+{
+    return QIcon( ":/zeroconf-icon.png" );
+}
+
+
 void
 ZeroconfPlugin::lanHostFound( const QString& host, int port, const QString& name, const QString& nodeid )
 {

src/sip/zeroconf/zeroconf.h

@@ -38,6 +38,7 @@ public:
     virtual QString prettyName() const { return "Local Network"; }
     virtual bool isCreatable() const { return false; };
     virtual SipPlugin* createPlugin ( const QString& pluginId = QString() );
+    virtual QIcon icon() const;
 };
 
 class SIPDLLEXPORT ZeroconfPlugin : public SipPlugin
@@ -64,6 +65,7 @@ public:
     virtual const QString accountName() const;
     virtual ConnectionState connectionState() const;
     virtual bool isValid() const { return true; };
+    virtual QIcon icon() const;
 
 public slots:
     virtual bool connectPlugin( bool startup );