commit bluedevil for openSUSE:12.1

Hello community, here is the log from the commit of package bluedevil for openSUSE:12.1 checked in at 2011-10-27 19:31:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/bluedevil (Old) and /work/SRC/openSUSE:12.1/.bluedevil.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bluedevil", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.1/bluedevil/bluedevil.changes 2011-10-24 12:30:02.000000000 +0200 +++ /work/SRC/openSUSE:12.1/.bluedevil.new/bluedevil.changes 2011-10-28 15:36:08.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Oct 27 09:40:03 UTC 2011 - wstephenson@suse.com + +- Update to 1.2.2: + * Fix crash in wizard if scanned devices disappear + (kde#280908, kde#270064) + * Fix crash in wizard if no default BT adaptor (kde#281420) + * Fix crash upon removing USB BT adaptor (kde#282280) + * Fix crash when different BT client software starts a session + (kde#269814) + * Fix crash when scanned BT device changes externally during + editing (kde#272230) + * Don't report uninformative errors from obex + (kde#274772, kde#273144) +- Fix crash when browsing device contents with obexftp + (bnc#725962, kde#284717) + +------------------------------------------------------------------- Old: ---- bluedevil-1.2.1.tar.bz2 New: ---- bluedevil-1.2.2.tar.bz2 bluedevil-dont-install-headers.diff bluedevil-obexsession-iterators.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluedevil.spec ++++++ --- /var/tmp/diff_new_pack.Mowd2n/_old 2011-10-28 15:36:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Mowd2n/_new 2011-10-28 15:36:08.000000000 +0200 @@ -19,7 +19,7 @@ Name: bluedevil -Version: 1.2.1 +Version: 1.2.2 Release: 1 Summary: Bluetooth Manager for KDE License: GPLv2+ @@ -29,6 +29,8 @@ #Source0: ftp://ftp.kde.org/pub/kde/stable/bluedevil/%{version}/src/%{name}-%{version}.tar.bz2 Source1: preferences-system-bluetooth.png Patch0: typo2.diff +Patch1: bluedevil-dont-install-headers.diff +Patch2: bluedevil-obexsession-iterators.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libbluedevil-devel @@ -57,6 +59,8 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %cmake_kde4 -d build @@ -96,7 +100,7 @@ %{_kde4_appsdir}/bluedevilwizard/ %{_kde4_bindir}/bluedevil-* %{_kde4_iconsdir}/hicolor/64x64/apps/preferences-system-bluetooth.png -%{_kde4_includedir}/actionplugin.h +#%{_kde4_includedir}/actionplugin.h %{_kde4_libdir}/libbluedevilaction.so %{_kde4_libexecdir}/bluedevil-* %{_kde4_modulesdir}/bluedevil*.so ++++++ bluedevil-1.2.1.tar.bz2 -> bluedevil-1.2.2.tar.bz2 ++++++ ++++ 19562 lines of diff (skipped) ++++++ bluedevil-dont-install-headers.diff ++++++ Index: bluedevil-1.2.2/src/actionplugins/CMakeLists.txt =================================================================== --- bluedevil-1.2.2.orig/src/actionplugins/CMakeLists.txt +++ bluedevil-1.2.2/src/actionplugins/CMakeLists.txt @@ -10,4 +10,4 @@ target_link_libraries(bluedevilaction ${ install(TARGETS bluedevilaction ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES actionplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) -install(FILES actionplugin.h DESTINATION include/) +#install(FILES actionplugin.h DESTINATION include/) ++++++ bluedevil-obexsession-iterators.diff ++++++ diff --git a/src/daemon/obexftpkded/ObexFtpDaemon.cpp b/src/daemon/obexftpkded/ObexFtpDaemon.cpp index ce7e675..3d97d40 100644 --- a/src/daemon/obexftpkded/ObexFtpDaemon.cpp +++ b/src/daemon/obexftpkded/ObexFtpDaemon.cpp @@ -337,17 +337,20 @@ void ObexFtpDaemon::SessionConnected(QDBusObjectPath path) void ObexFtpDaemon::SessionClosed(QDBusObjectPath path) { kDebug(); - QHash::const_iterator i = d->m_sessionMap.constBegin(); + QHash::iterator i = d->m_sessionMap.begin(); while (i != d->m_sessionMap.constEnd()) { //If the session is connected, so not 0 if (i.value()->path() == path.path()) { kDebug() << "Removing : " << i.key(); emit sessionClosed(i.key()); - d->m_sessionMap.remove(i.key()); - delete i.value(); + // hang on, if this is a const_iterator then is it valid after it is removed + ObexSession * closedSession = i.value(); + i = d->m_sessionMap.erase(i); + delete closedSession; return; - } - ++i; + } else { + ++i; + } } kDebug() << "Attempt to remove a nto existing session"; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org