Hello community, here is the log from the commit of package k3b checked in at Thu Nov 16 22:59:16 CET 2006. -------- --- KDE/k3b/k3b.changes 2006-11-13 18:03:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/k3b/k3b.changes 2006-11-16 18:49:24.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 16 18:49:05 CET 2006 - ltinkl@suse.cz + +- fix #211873 - k3b show uncloseable dialog + +------------------------------------------------------------------- New: ---- k3b-emptydiscwaiter.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k3b.spec ++++++ --- /var/tmp/diff_new_pack.4dFuki/_old 2006-11-16 22:58:52.000000000 +0100 +++ /var/tmp/diff_new_pack.4dFuki/_new 2006-11-16 22:58:52.000000000 +0100 @@ -20,12 +20,12 @@ BuildRequires: taglib %endif URL: http://k3b.sourceforge.net/ -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: Productivity/Multimedia/CD/Record Summary: A Universal CD and DVD Burning Application Requires: /usr/bin/cdrecord /usr/bin/mkisofs /usr/bin/cdrdao dvd+rw-tools Version: 0.12.17 -Release: 24 +Release: 26 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%version.tar.bz2 Source1: %name-i18n-%version.tar.bz2 @@ -42,6 +42,7 @@ Patch8: use-kdeeject.diff Patch9: %name-fix_mountpoint.diff Patch10: install-dvd-desktops.diff +Patch11: k3b-emptydiscwaiter.diff %if %suse_version > 930 Requires: hal-resmgr %endif @@ -118,6 +119,7 @@ %patch8 %patch9 %patch10 +%patch11 cp %{SOURCE2} %{SOURCE3} src/konqi/ . /etc/opt/kde3/common_options update_admin @@ -218,6 +220,8 @@ %endif %changelog -n k3b +* Thu Nov 16 2006 - ltinkl@suse.cz +- fix #211873 - k3b show uncloseable dialog * Mon Nov 13 2006 - wstephenson@suse.de - Don't warn the user about cdrecord setuid root bit - not needed (#220194) * Wed Aug 23 2006 - stbinner@suse.de ++++++ k3b-emptydiscwaiter.diff ++++++ diff -ur k3b-orig/src/k3bemptydiscwaiter.cpp k3b-0.12.17/src/k3bemptydiscwaiter.cpp --- src/k3bemptydiscwaiter.cpp 2006-08-23 09:32:12.000000000 +0200 +++ src/k3bemptydiscwaiter.cpp 2006-11-16 18:40:14.000000000 +0100 @@ -748,7 +748,11 @@ void K3bEmptyDiscWaiter::slotEjectingWrongMediumDone( K3bDevice::DeviceHandler* dh ) { if( !dh->success() ) + { KMessageBox::sorry( parentWidgetToUse(), i18n("Unable to eject media.") ); + // if the user doesn't want to erase the disc nor the disc can be ejected, cancel the discwaiter to avoid endless loop + slotCancel(); + } continueWaiting(); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org