Hello community, here is the log from the commit of package kdebase3 checked in at Wed Jun 14 18:47:29 CEST 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-06-12 17:29:06.000000000 +0200 +++ kdebase3/kdebase3.changes 2006-06-14 16:57:18.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 14 16:56:43 CEST 2006 - coolo@suse.de + +- update 3_5_BRANCH.diff and media_suse.diff to follow the upstream + merge of our media:/ changes + +------------------------------------------------------------------- New: ---- media_suse.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.Nxk9Yp/_old 2006-06-14 18:44:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Nxk9Yp/_new 2006-06-14 18:44:09.000000000 +0200 @@ -37,7 +37,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.3 -Release: 7 +Release: 8 %define kde_version 3.5.3 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -74,8 +74,7 @@ Patch16: kfontinst.diff Patch17: nsplugin-Preference.diff Patch20: ksplashml.patch -# svn diff $BASE/branches/KDE/3.5/kdebase/kioslave/media@501904 $BASE/branches/work/coolos_media -#Patch21: media_hal.diff +Patch21: media_suse.diff Patch22: libkonq-kdemm.diff Patch39: kdesktop_icons.diff Patch40: suse_default_move.diff @@ -307,7 +306,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 96 +Release: 97 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -342,10 +341,8 @@ %patch15 %patch17 %patch20 +%patch21 %if %suse_version > 1000 -#cd kioslave/media -#%patch21 -#cd ../.. %patch85 %endif %patch39 @@ -1350,6 +1347,9 @@ %endif %changelog -n kdebase3 +* Wed Jun 14 2006 - coolo@suse.de +- update 3_5_BRANCH.diff and media_suse.diff to follow the upstream + merge of our media:/ changes * Mon Jun 12 2006 - stbinner@suse.de - update 3_5_BRANCH.diff to fix build (OpenEXR configure check) - obey chosen k menu item format when collapsing menus (#183244) ++++++ 3_5_BRANCH.diff ++++++ ++++ 6926 lines (skipped) ++++ between KDE/kdebase3/3_5_BRANCH.diff ++++ and kdebase3/3_5_BRANCH.diff ++++++ media_suse.diff ++++++ Index: kioslave/media/mediamanager/halbackend.cpp =================================================================== --- kioslave/media/mediamanager/halbackend.cpp (Revision 551304) +++ kioslave/media/mediamanager/halbackend.cpp (Arbeitskopie) @@ -269,6 +269,12 @@ m_mediaList.addMedium(medium, allowNotification); return; } + + if ( allowNotification ) { + KProcess proc; + proc << "suseplugger" << udi; + proc.start(KProcess::DontCare); + } } void HALBackend::RemoveDevice(const char *udi) @@ -762,8 +768,12 @@ bool 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; + QString drive_type = libhal_device_get_property_QString( m_halContext, drive_udi.latin1(), "storage.drive_type" ); + value |= ( drive_type == "cdrom" ); + config.setGroup(drive_udi); - bool value = config.readBoolEntry("automount", false); + value = config.readBoolEntry("automount", false); config.setGroup(name); if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org