From kde-commits  Sun Aug 24 01:38:50 2003
From: Stefan Gehn <sgehn () gmx ! net>
Date: Sun, 24 Aug 2003 01:38:50 +0000
To: kde-commits
Subject: kdenonbeta/kopete/libkopete
X-MARC-Message: https://marc.info/?l=kde-commits&m=106169104402452

CVS commit by metz: 

use KopetePluginDataObject backend for custom icons in KopeteMetaContact


  M +20 -5     kopetemetacontact.cpp   1.171
  M +1 -1      kopetemetacontact.h   1.82


--- kdenonbeta/kopete/libkopete/kopetemetacontact.cpp  #1.170:1.171
@@ -331,9 +331,21 @@ QString KopeteMetaContact::statusIcon() 
         {
                 case KopeteOnlineStatus::Online:
+                        if( useCustomIcon() )
+                                return icon( KopetePluginDataObject::Online );
+                        else
                         return QString::fromLatin1( "metacontact_online" );
+
                 case KopeteOnlineStatus::Away:
+                        if( useCustomIcon() )
+                                return icon( KopetePluginDataObject::Away );
+                        else
                         return QString::fromLatin1( "metacontact_away" );
+
                 case KopeteOnlineStatus::Unknown:
+                        if( useCustomIcon() )
+                                return icon( KopetePluginDataObject::Unknown );
+                        else
                         return QString::fromLatin1( "metacontact_unknown" );
+
                 case KopeteOnlineStatus::Offline:
                 default:
@@ -338,4 +350,7 @@ QString KopeteMetaContact::statusIcon() 
                 case KopeteOnlineStatus::Offline:
                 default:
+                        if( useCustomIcon() )
+                                return icon( KopetePluginDataObject::Offline );
+                        else
                         return QString::fromLatin1( "metacontact_offline" );
         }
@@ -445,5 +460,5 @@ void KopeteMetaContact::setDisplayName( 
         emit displayNameChanged( d->displayName, name );
 
-        //The name is setted by the user, disable tracking
+        //The name is set by the user, disable tracking
         d->trackChildNameChanges = false;
 

--- kdenonbeta/kopete/libkopete/kopetemetacontact.h  #1.81:1.82
@@ -141,5 +141,5 @@ public:
         bool trackChildNameChanges() const;
         /**
-         * @brief set if the metacontact dysplayname follow subcontacts displayname
+         * @brief set if the metacontact displayname follow subcontacts displayname
          *
          * When setting it to true, it will refresh the dysplayname to the subcontactone instentaneous,