summaryrefslogtreecommitdiffstats
path: root/kioslave
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-05-25 22:05:06 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-05-25 22:05:06 -0500
commite13c01e6863b7384e70f10068c6b76c1d24d9945 (patch)
treeab0ce94f927b81b0c1fc6b963bb11145f33f9ac7 /kioslave
parentf70bd6c7c09395d93474424371b40b0db7a76bd2 (diff)
downloadtdebase-e13c01e6863b7384e70f10068c6b76c1d24d9945.tar.gz
tdebase-e13c01e6863b7384e70f10068c6b76c1d24d9945.zip
Clean up ugly error message
Diffstat (limited to 'kioslave')
-rw-r--r--kioslave/media/mediamanager/halbackend.cpp2
-rw-r--r--kioslave/media/mounthelper/kio_media_mounthelper.cpp10
2 files changed, 9 insertions, 3 deletions
diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp
index 8d4d6f0a..575d7f72 100644
--- a/kioslave/media/mediamanager/halbackend.cpp
+++ b/kioslave/media/mediamanager/halbackend.cpp
@@ -1272,7 +1272,7 @@ static TQString mount_priv(const char *udi, const char *mount_point, const char
if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType"))
qerror = i18n("Invalid filesystem type");
else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied"))
- qerror = i18n("Permissions denied<p>Please ensure that:<br>1. You have permission to access this device.<br>2. This device node is not listed in /etc/fstab.</p>");
+ qerror = i18n("Permission denied<p>Please ensure that:<br>1. You have permission to access this device.<br>2. This device node is not listed in /etc/fstab.</p>");
else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.PermissionDeniedByPolicy"))
qerror = privilegedMount(udi, mount_point, poptions, noptions);
else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted"))
diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.cpp b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
index 07588e86..7a2b2b78 100644
--- a/kioslave/media/mounthelper/kio_media_mounthelper.cpp
+++ b/kioslave/media/mounthelper/kio_media_mounthelper.cpp
@@ -208,7 +208,7 @@ void MountHelper::ejectFinished(KProcess* proc)
else
m_errorStr = i18n("The device was successfully unmounted, but could not be ejected");
}
-//X Comment this because the error is useless as long as the unmount is successfull.
+//X Comment this because the error is useless as long as the unmount is successful.
//X TQTimer::singleShot(0, this, TQT_SLOT(error()));
::exit(0);
}
@@ -216,7 +216,13 @@ void MountHelper::ejectFinished(KProcess* proc)
void MountHelper::error()
{
- KMessageBox::error(0, m_errorStr);
+ TQString prettyErrorString = m_errorStr;
+ if (m_errorStr.contains("<") && m_errorStr.contains(">")) {
+ if (!m_errorStr.contains("<qt>")) {
+ prettyErrorString = TQString("<qt>%1</qt>").arg(m_errorStr);
+ }
+ }
+ KMessageBox::error(0, prettyErrorString);
::exit(1);
}