Hello community, here is the log from the commit of package amarok for openSUSE:Factory checked in at Fri Nov 20 14:25:49 CET 2009. -------- --- KDE/amarok/amarok.changes 2009-11-14 17:02:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/amarok/amarok.changes 2009-11-16 13:46:42.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 16 12:44:55 UTC 2009 - tittiatcoke@gmail.com + +- Added fix for the default playlist layout + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- playlist_default_layout_fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.pdAiGq/_old 2009-11-20 14:21:35.000000000 +0100 +++ /var/tmp/diff_new_pack.pdAiGq/_new 2009-11-20 14:21:35.000000000 +0100 @@ -43,10 +43,11 @@ Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE Version: 2.2.1 -Release: 1 +Release: 2 Source0: %{name}-2.2.1.tar.bz2 Source100: %{name}-rpmlintrc Patch: cmakelist.diff +Patch1: playlist_default_layout_fix.diff Patch2: link-mysql-embedded.diff Patch3: errmsg-mysql-embedded.diff Patch4: errmsg-mysql51-embedded.diff @@ -86,6 +87,7 @@ %prep %setup -q -n %name-2.2.1 %patch +%patch1 -p1 %patch2 %if %suse_version > 1110 %patch4 ++++++ playlist_default_layout_fix.diff ++++++ diff --git a/src/playlist/layouts/LayoutManager.cpp b/src/playlist/layouts/LayoutManager.cpp index b2903ee..541f989 100644 --- a/src/playlist/layouts/LayoutManager.cpp +++ b/src/playlist/layouts/LayoutManager.cpp @@ -55,6 +55,8 @@ LayoutManager::LayoutManager() KConfigGroup config = Amarok::config("Playlist Layout"); m_activeLayout = config.readEntry( "CurrentLayout", "Default" ); + if( !layouts().contains( m_activeLayout ) ) + m_activeLayout = "Default"; Playlist::ModelStack::instance()->top()->setGroupingCategory( activeLayout().groupBy() ); } diff --git a/src/playlist/layouts/PlaylistLayoutEditDialog.cpp b/src/playlist/layouts/PlaylistLayoutEditDialog.cpp index 166879c..03fd529 100644 --- a/src/playlist/layouts/PlaylistLayoutEditDialog.cpp +++ b/src/playlist/layouts/PlaylistLayoutEditDialog.cpp @@ -440,7 +440,10 @@ void PlaylistLayoutEditDialog::reject() //SLOT DEBUG_BLOCK debug() << "Applying initial layout: " << m_firstActiveLayout; - LayoutManager::instance()->setActiveLayout( m_firstActiveLayout ); + if( layoutListWidget->findItems( m_firstActiveLayout, Qt::MatchExactly ).isEmpty() ) + LayoutManager::instance()->setActiveLayout( "Default" ); + else + LayoutManager::instance()->setActiveLayout( m_firstActiveLayout ); QDialog::reject(); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org