Hello community, here is the log from the commit of package kdemultimedia4 checked in at Mon Apr 21 18:46:14 CEST 2008. -------- --- KDE/kdemultimedia4/kdemultimedia4.changes 2008-04-14 16:08:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdemultimedia4/kdemultimedia4.changes 2008-04-21 11:37:27.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 18 11:40:01 CEST 2008 - dmueller@suse.de + +- another 4_0_BRANCH.diff update: + * hopefully fixes kmix crash on exit (bnc#373639) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdemultimedia4.spec ++++++ --- /var/tmp/diff_new_pack.f28230/_old 2008-04-21 18:45:49.000000000 +0200 +++ /var/tmp/diff_new_pack.f28230/_new 2008-04-21 18:45:49.000000000 +0200 @@ -19,7 +19,7 @@ Summary: kdemultimedia base package Url: http://www.kde.org Version: 4.0.3 -Release: 6 +Release: 11 %define rversion 4.0.3 Source0: kdemultimedia-%rversion.tar.bz2 Source1: _upstream @@ -272,6 +272,9 @@ %doc COPYING COPYING-DOCS README %changelog +* Fri Apr 18 2008 dmueller@suse.de +- another 4_0_BRANCH.diff update: + * hopefully fixes kmix crash on exit (bnc#373639) * Mon Apr 14 2008 dmueller@suse.de - 4_0_BRANCH.diff update * Fri Mar 28 2008 dmueller@suse.de ++++++ 4_0_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.f28230/_old 2008-04-21 18:45:49.000000000 +0200 +++ /var/tmp/diff_new_pack.f28230/_new 2008-04-21 18:45:49.000000000 +0200 @@ -3,8 +3,52 @@ --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 796755 ++current HEAD: 798406 +svn di between //tags/KDE/4.0.3/kdemultimedia and //branches/KDE/4.0/kdemultimedia +--- libkcddb/cddb.cpp ++++ libkcddb/cddb.cpp +@@ -54,6 +54,8 @@ + { + // Taken from version by Michael Matz in kio_audiocd. + unsigned int id = 0; ++ if ( list.isEmpty() ) ++ return QString(); + int numTracks = list.count() - 1; + + // The last two in the list are disc begin and disc end. +--- kmix/kmixerwidget.h ++++ kmix/kmixerwidget.h +@@ -47,7 +47,7 @@ + // KMix experimental + + +-class KMixerWidget : public QWidget ++class KMixerWidget : public QWidget + { + Q_OBJECT + +@@ -56,7 +56,7 @@ + QWidget *parent=0, const char *name=0, ViewBase::ViewFlags vflags=0, KActionCollection* coll = 0 ); + ~KMixerWidget(); + +- Mixer *mixer() const { return _mixer; } ++ Mixer *mixer() { return _mixer; } + ViewBase* currentView(); + + signals: +--- kmix/kmix.cpp ++++ kmix/kmix.cpp +@@ -652,8 +652,8 @@ + + void KMixWindow::newMixerShown(int /*tabIndex*/ ) { + KMixerWidget* mw = (KMixerWidget*)m_wsMixers->currentWidget(); +- Mixer* mixer = mw->mixer(); +- setWindowTitle( mixer->readableName() ); ++ if (mw) ++ setWindowTitle( mw->mixer()->readableName() ); + // As switching the tab does NOT mean switching the mixer, we do not need to update dock icon here. + // It would lead to unnecesary flickering of the (complete) dock area. + } --- kmix/kmixdockwidget.cpp +++ kmix/kmixdockwidget.cpp @@ -296,12 +296,7 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org