rev 4763 - in trunk/packages/kdebase/debian: . patches
Modestas Vainius
modax-guest at costa.debian.org
Mon Oct 23 00:59:56 UTC 2006
Author: modax-guest
Date: 2006-10-23 00:59:55 +0000 (Mon, 23 Oct 2006)
New Revision: 4763
Added:
trunk/packages/kdebase/debian/patches/32_camera_icon_from_mimetype.diff
trunk/packages/kdebase/debian/patches/33_mounthelper_find_medium_by_url.diff
Modified:
trunk/packages/kdebase/debian/changelog
trunk/packages/kdebase/debian/patches/29_halbackend_fstab_improvements.diff
Log:
2 new patches, typo correction and changelog update
Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog 2006-10-22 21:13:57 UTC (rev 4762)
+++ trunk/packages/kdebase/debian/changelog 2006-10-23 00:59:55 UTC (rev 4763)
@@ -1,21 +1,30 @@
kdebase (4:3.5.5a.dfsg.1-1) UNRELEASED; urgency=medium
- * Add two new patches. Thanks to Sune Vuorela for investigating and
+ * Add 4 new patches. Thanks to Sune Vuorela for investigating and
to Modestas Vainius for creating them:
* 29_halbackend_fstab_improvements
- * fixes HALBackend::inInFstab() to correctly match a fstab device node
+ * fixes HALBackend::inInFstab() to correctly match the fstab device node
that is a symlink.
- * If unmounting the device that is in fstab fails, include the list of
- processes using the device in the error message (in the same way as for
- HAL mounted devices).
- * Make the umount error message steal focus from other active window.
- * Improve wording of the fstab umount error message and make it
- translatable.
- * Improve HAL umount error messages.
- * Revert patch from KDE bug #116209 to make KDE display informative
- errors in case umount/eject fails.
+ * Improve error messages for HAL/fstab unmount failures. Include a list
+ of processes using the device in them (if there are any).
+ * When handling fstab devices, make HALBackend::mount() and
+ HALBackend::umount() calls block until the operation actually
+ completes (the same behaviour as with HAL devices).
+ * In mounthelper always unmount a device before ejecting it. However,
+ if unmount fails, still try to eject the device. In case of failure,
+ display the unmount error message which is more informative.
* 30_mediamanager_followsymlinks
* MediaManager::properties() follows symlinks on local paths.
+ * 32_camera_icon_from_mimetype
+ * Do not set icons for cameras explicitly, because they can be
+ determined from the mimetype. In addition, always reset a medium icon
+ when properties of the medium change. This fixes a problem when the
+ camera_mounted icon is not reset once the camera storage has been
+ unmounted.
+ * 33_mounthelper_find_medium_by_url
+ * Mounthelper should search for the medium by the whole url in addition
+ to just the filename. This unbreaks krusader 1.70.x media:/
+ unmount/eject commands.
* Add psmisc to Depends of kdebase-kio-plugins since it provides 'fuser'
utility, needed for listUsingProcesses() function added in
@@ -31,7 +40,7 @@
* Drop thunderbird and mozilla icons from the tarball, as they are non-free.
(Closes: #394045)
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 22 Oct 2006 14:08:55 -0400
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 23 Oct 2006 02:32:16 +0300
kdebase (4:3.5.5a-2) unstable; urgency=low
Modified: trunk/packages/kdebase/debian/patches/29_halbackend_fstab_improvements.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/29_halbackend_fstab_improvements.diff 2006-10-22 21:13:57 UTC (rev 4762)
+++ trunk/packages/kdebase/debian/patches/29_halbackend_fstab_improvements.diff 2006-10-23 00:59:55 UTC (rev 4763)
@@ -41,8 +41,8 @@
+ if (counter) {
+ fullmsg = i18n("Moreover, programs still using the device "
+ "have been detected. They are listed below. You have to "
-+ "close them or change their working before attempting to "
-+ "unmount the device again.");
++ "close them or change their working directory before "
++ "attempting to unmount the device again.");
+ fullmsg += "<br>" + proclist;
+ return fullmsg;
+ } else {
Added: trunk/packages/kdebase/debian/patches/32_camera_icon_from_mimetype.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/32_camera_icon_from_mimetype.diff (rev 0)
+++ trunk/packages/kdebase/debian/patches/32_camera_icon_from_mimetype.diff 2006-10-23 00:59:55 UTC (rev 4763)
@@ -0,0 +1,26 @@
+--- kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.cpp 2006-10-22 22:25:37.000000000 +0300
++++ kdebase-3.5.5a.dfsg.1/kioslave/media/mediamanager/halbackend.cpp 2006-10-22 22:29:09.000000000 +0300
+@@ -503,6 +503,7 @@
+ else
+ {
+ mimeType = "media/hdd" + MOUNT_SUFFIX;
++ medium->setIconName(QString::null); // reset icon
+ if (libhal_drive_is_hotpluggable(halDrive))
+ {
+ mimeType = "media/removable" + MOUNT_SUFFIX;
+@@ -528,7 +529,6 @@
+ case LIBHAL_DRIVE_TYPE_CAMERA:
+ {
+ mimeType = "media/camera" + MOUNT_SUFFIX;
+- medium->setIconName("camera" + MOUNT_ICON_SUFFIX);
+ const char *physdev = libhal_drive_get_physical_device_udi(halDrive);
+ // get model from camera
+ if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL))
+@@ -550,7 +550,6 @@
+ if (medium->isMounted() && QFile::exists(medium->mountPoint() + "/dcim"))
+ {
+ mimeType = "media/camera" + MOUNT_SUFFIX;
+- medium->setIconName("camera" + MOUNT_ICON_SUFFIX);
+ }
+ }
+ }
Added: trunk/packages/kdebase/debian/patches/33_mounthelper_find_medium_by_url.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/33_mounthelper_find_medium_by_url.diff (rev 0)
+++ trunk/packages/kdebase/debian/patches/33_mounthelper_find_medium_by_url.diff 2006-10-23 00:59:55 UTC (rev 4763)
@@ -0,0 +1,62 @@
+--- kdebase-3.5.5a.dfsg.1/kioslave/media/mounthelper/kio_media_mounthelper.cpp 2006-10-23 02:26:27.000000000 +0300
++++ kdebase-3.5.5a.dfsg.1/kioslave/media/mounthelper/kio_media_mounthelper.cpp 2006-10-23 03:24:12.000000000 +0300
+@@ -35,17 +35,28 @@
+
+ #include "kio_media_mounthelper.h"
+
+-const Medium MountHelper::findMedium(const QString &name)
++const Medium MountHelper::findMedium(const KURL &url)
+ {
+ DCOPRef mediamanager("kded", "mediamanager");
+- DCOPReply reply = mediamanager.call( "properties", name );
+
+- if ( !reply.isValid() )
+- {
++ // Try filename first
++ DCOPReply reply = mediamanager.call( "properties", url.fileName() );
++ if ( !reply.isValid() ) {
+ m_errorStr = i18n("The KDE mediamanager is not running.")+"\n";
++ return Medium(QString::null, QString::null);
++ }
++ const Medium& medium = Medium::create(reply);
++ if ( medium.id().isEmpty() ) {
++ // Try full URL now
++ reply = mediamanager.call( "properties", url.prettyURL() );
++ if ( !reply.isValid() ) {
++ m_errorStr = i18n("Internal Error");
++ return Medium(QString::null, QString::null);
+ }
+-
+ return Medium::create(reply);
++ } else {
++ return medium;
++ }
+ }
+
+ MountHelper::MountHelper() : KApplication()
+@@ -55,11 +66,12 @@
+ m_errorStr = "";
+
+ KURL url(args->url(0));
+- const Medium medium = findMedium(url.fileName());
++ const Medium medium = findMedium(url);
+
+ if ( medium.id().isEmpty() )
+ {
+- m_errorStr+= i18n("%1 cannot be found.").arg(url.prettyURL());
++ if (m_errorStr.isEmpty())
++ m_errorStr+= i18n("%1 cannot be found.").arg(url.prettyURL());
+ QTimer::singleShot(0, this, SLOT(error()) );
+ return;
+ }
+--- kdebase-3.5.5a.dfsg.1/kioslave/media/mounthelper/kio_media_mounthelper.h 2006-10-22 22:50:28.000000000 +0300
++++ kdebase-3.5.5a.dfsg.1/kioslave/media/mounthelper/kio_media_mounthelper.h 2006-10-22 22:51:45.000000000 +0300
+@@ -35,7 +35,7 @@
+ MountHelper();
+
+ private:
+- const Medium findMedium(const QString &name);
++ const Medium findMedium(const KURL &url);
+ void invokeEject(const QString &device, bool quiet=false);
+ QString m_errorStr;
+ QString m_device;
More information about the pkg-kde-commits
mailing list