Hello community, here is the log from the commit of package kdebase3 checked in at Thu Nov 23 16:21:01 CET 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-11-21 13:54:08.000000000 +0100 +++ kdebase3/kdebase3.changes 2006-11-22 04:51:48.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 22 04:50:20 CET 2006 - ltinkl@suse.cz + +- implement two requested DCOp functions for +#215262 - Suspend to disk with attached usb storage not working + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.A5foh3/_old 2006-11-23 16:20:20.000000000 +0100 +++ /var/tmp/diff_new_pack.A5foh3/_new 2006-11-23 16:20:20.000000000 +0100 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.5 -Release: 62 +Release: 64 %define kde_version 3.5.5 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -379,7 +379,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 191 +Release: 193 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -1515,6 +1515,9 @@ %endif %changelog -n kdebase3 +* Wed Nov 22 2006 - ltinkl@suse.cz +- implement two requested DCOp functions for + [#215262] - Suspend to disk with attached usb storage not working * Tue Nov 21 2006 - dmueller@suse.de - fix another typo (#222686) * Tue Nov 21 2006 - dmueller@suse.de ++++++ suspend-unmount.diff ++++++ --- /var/tmp/diff_new_pack.A5foh3/_old 2006-11-23 16:20:22.000000000 +0100 +++ /var/tmp/diff_new_pack.A5foh3/_new 2006-11-23 16:20:22.000000000 +0100 @@ -1,15 +1,15 @@ Index: kioslave/media/mediamanager/mediamanager.cpp =================================================================== ---- kioslave/media/mediamanager/mediamanager.cpp.orig -+++ kioslave/media/mediamanager/mediamanager.cpp -@@ -326,6 +326,28 @@ void MediaManager::slotMediumChanged(con +--- kioslave/media/mediamanager/mediamanager.cpp (revision 595653) ++++ kioslave/media/mediamanager/mediamanager.cpp (working copy) +@@ -326,7 +326,54 @@ emit mediumChanged(name); } -+QString MediaManager::unmountAllManual() ++QString MediaManager::unmountAllSuspend() +{ + QPtrList<Medium> list = m_mediaList.list(); -+ + + QPtrList<Medium>::const_iterator it = list.begin(); + QPtrList<Medium>::const_iterator end = list.end(); + @@ -20,27 +20,82 @@ + if ( (*it)->isMounted() ) + { + QString tmp = unmount( (*it)->id() ); -+ if ( !tmp.isEmpty() ) ++ if ( !tmp.isEmpty() ) // umount failed + result = tmp; ++ else ++ m_suspendResumeMountList.append( *it ); + } + } + + // return last error + return result; +} - ++ ++QString MediaManager::remountAllResume() ++{ ++ QPtrList<Medium>::const_iterator it = m_suspendResumeMountList.begin(); ++ QPtrList<Medium>::const_iterator end = m_suspendResumeMountList.end(); ++ ++ QString result; ++ ++ for (; it!=end; ++it) ++ { ++ if ( (*it)->needMounting() ) ++ { ++ QString tmp = mount( (*it)->id() ); ++ if ( !tmp.isEmpty() ) // mount failed ++ result = tmp; ++ else ++ m_suspendResumeMountList.remove(); // remove the media from the list when remount succeeds ++ } ++ } ++ ++ // return last error ++ return result; ++} ++ extern "C" { KDE_EXPORT KDEDModule *create_mediamanager(const QCString &obj) + { Index: kioslave/media/mediamanager/mediamanager.h =================================================================== ---- kioslave/media/mediamanager/mediamanager.h.orig -+++ kioslave/media/mediamanager/mediamanager.h -@@ -57,6 +57,8 @@ k_dcop: - bool removablePlug(const QString &devNode, const QString &label); +--- kioslave/media/mediamanager/mediamanager.h (revision 598657) ++++ kioslave/media/mediamanager/mediamanager.h (working copy) +@@ -58,6 +58,20 @@ bool removableUnplug(const QString &devNode); bool removableCamera(const QString &devNode); -+ -+ QString unmountAllManual(); ++ /** ++ * Unmount manually all partitions when going to suspend ++ * ++ * @return last error if any ++ */ ++ QString unmountAllSuspend(); ++ ++ /** ++ * Remount previously unmounted partitions in unmountAllSuspend() ++ * ++ * @return last error if any ++ */ ++ QString remountAllResume(); ++ k_dcop_signals: void mediumAdded(const QString &name, bool allowNotification); + void mediumRemoved(const QString &name, bool allowNotification); +@@ -70,7 +84,7 @@ + + private slots: + void loadBackends(); +- ++ + void slotMediumAdded(const QString &id, const QString &name, + bool allowNotification); + void slotMediumRemoved(const QString &id, const QString &name, +@@ -85,6 +99,7 @@ + HALBackend *m_halbackend; + MediaDirNotify m_dirNotify; + FstabBackend *m_fstabbackend; ++ QPtrList<Medium> m_suspendResumeMountList; + }; + + #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de