diff --git a/amarok/src/Options8.ui b/amarok/src/Options8.ui
index 82e4fb70..afca4c76 100644
--- a/amarok/src/Options8.ui
+++ b/amarok/src/Options8.ui
@@ -72,8 +72,8 @@
- -1
- -1
+ 0
+ 0
diff --git a/amarok/src/engine/xine/xine-config.cpp b/amarok/src/engine/xine/xine-config.cpp
index 1972fb09..2f72a55d 100644
--- a/amarok/src/engine/xine/xine-config.cpp
+++ b/amarok/src/engine/xine/xine-config.cpp
@@ -155,9 +155,9 @@ XineEnumEntry::XineEnumEntry(TQComboBox* input, const TQCString & key, xine_t *x
for( int i = 0; ent.enum_values[i]; ++i )
{
input->insertItem( TQString(TQString::fromLocal8Bit( ent.enum_values[i] )) );
- input->setCurrentItem( ent.num_value );
- m_val = ent.num_value;
}
+ input->setCurrentItem( ent.num_value );
+ m_val = ent.num_value;
}
connect( input, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( entryChanged( int ) ) );
}
diff --git a/amarok/src/playlistitem.cpp b/amarok/src/playlistitem.cpp
index bfacc9ee..284c4917 100644
--- a/amarok/src/playlistitem.cpp
+++ b/amarok/src/playlistitem.cpp
@@ -42,8 +42,10 @@
#include
#include
#include
+#include
#include
#include
+#include
#include "playlistitem.h"
@@ -986,6 +988,10 @@ void PlaylistItem::imageTransparency( TQImage& image, float factor ) //static
c = data[i]; // Memory access is slow, so do it only once
data[i] = tqRgba( tqRed( c ), tqGreen( c ), tqBlue( c ), table[tqAlpha( c )] );
}
+
+ if (kapp->isX11CompositionAvailable()) {
+ image = KImageEffect::convertToPremultipliedAlpha(image);
+ }
}
AtomicString PlaylistItem::artist_album() const