Hello community, here is the log from the commit of package kdebase3 checked in at Sat Nov 25 20:11:48 CET 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-11-24 10:44:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/STABLE/kdebase3/kdebase3.changes 2006-11-25 13:34:17.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Nov 25 13:32:52 CET 2006 - coolo@suse.de + +- correctly handle media mounted on startup (#223413) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.Y4MOqj/_old 2006-11-25 20:11:30.000000000 +0100 +++ /var/tmp/diff_new_pack.Y4MOqj/_new 2006-11-25 20:11:30.000000000 +0100 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.5 -Release: 70 +Release: 72 %define kde_version 3.5.5 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -382,7 +382,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 199 +Release: 201 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -1520,6 +1520,8 @@ %endif %changelog -n kdebase3 +* Sat Nov 25 2006 - coolo@suse.de +- correctly handle media mounted on startup (#223413) * Fri Nov 24 2006 - coolo@suse.de - correctly follow font sizes in the logout dialog (#222496) * Fri Nov 24 2006 - stbinner@suse.de ++++++ media_suse.diff ++++++ --- /var/tmp/diff_new_pack.Y4MOqj/_old 2006-11-25 20:11:33.000000000 +0100 +++ /var/tmp/diff_new_pack.Y4MOqj/_new 2006-11-25 20:11:33.000000000 +0100 @@ -1,9 +1,13 @@ Index: kioslave/media/mediamanager/halbackend.cpp =================================================================== ---- kioslave/media/mediamanager/halbackend.cpp (Revision 593835) +--- kioslave/media/mediamanager/halbackend.cpp (Revision 607627) +++ kioslave/media/mediamanager/halbackend.cpp (Arbeitskopie) -@@ -250,7 +250,7 @@ +@@ -256,14 +256,15 @@ + return; + } } ++ m_mediaList.addMedium(medium, allowNotification); ++ QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); kdDebug() << "automount " << options["automount"] << endl; - if (options["automount"] == "true" && allowNotification ) { @@ -11,7 +15,12 @@ QString error = mount(medium); if (!error.isEmpty()) kdDebug() << "error " << error << endl; -@@ -287,6 +287,12 @@ + } +- m_mediaList.addMedium(medium, allowNotification); + + return; + } +@@ -295,6 +296,12 @@ m_mediaList.addMedium(medium, allowNotification); return; } @@ -24,8 +33,8 @@ } void HALBackend::RemoveDevice(const char *udi) -@@ -784,8 +790,12 @@ - bool removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) +@@ -794,8 +801,12 @@ + removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL); + bool value = removable; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org