1 files changed, 14 insertions, 10 deletions

diff --git a/core/launcher/launchertab.cpp b/core/launcher/launchertab.cpp
index 710f259..72ebf59 100644
--- a/core/launcher/launchertab.cpp
+++ b/core/launcher/launchertab.cpp
@@ -99,6 +99,6 @@ void LauncherTabBar::layoutTabs()
             if ( t->iconSet() != 0 )
-                available -= t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
+                available -= t->iconSet()->pixmap().width();
         }
         if ( t->iconSet() != 0 )
-            iw += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
+            iw += t->iconSet()->pixmap().width();
         required += iw;
@@ -118,4 +118,4 @@ void LauncherTabBar::layoutTabs()
             if ( t->iconSet() != 0 ) {
-                w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
-                ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+                w += t->iconSet()->pixmap().width();
+                ih = t->iconSet()->pixmap().height();
             }
@@ -136,4 +136,4 @@ void LauncherTabBar::layoutTabs()
             if ( t->iconSet() != 0 ) {
-                w += t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width();
-                ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+                w += t->iconSet()->pixmap().width();
+                ih = t->iconSet()->pixmap().height();
             }
@@ -151,3 +151,3 @@ void LauncherTabBar::layoutTabs()
             if ( t->iconSet() != 0 ) {
-                ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+                ih = t->iconSet()->pixmap().height();
             }
@@ -222,4 +222,4 @@ void LauncherTabBar::paint( QPainter * p, QTab * t, bool selected ) const
     if ( t->iconSet() != 0 ) {
-        iw = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 2;
-        ih = t->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).height();
+        iw = t->iconSet()->pixmap().width() + 2;
+        ih = t->iconSet()->pixmap().height();
     }
@@ -253,3 +253,7 @@ void LauncherTabBar::paintLabel( QPainter* p, const QRect&,
             mode = QIconSet::Active;
-        QPixmap pixmap = t->iconSet()->pixmap( QIconSet::Small, mode );
+    QPixmap pixmap;
+    if ( mode == QIconSet::Disabled )
+        pixmap = t->iconSet()->pixmap( QIconSet::Automatic, mode );
+    else
+        pixmap = t->iconSet()->pixmap();
         int pixw = pixmap.width();