[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kioslave/file
From:       Adriaan de Groot <groot () kde ! org>
Date:       2009-06-15 20:07:54
Message-ID: 1245096474.790300.25744.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 982412 by adridg:

Minor Solaris stuff in kio file:
- support NO_ASCII_CAST, construct err string explicitly
- drop the QFile::remove() which isn't needed

BUG: 191543
(based on the patch attached to that bug)


 M  +5 -4      file.cpp  


--- trunk/KDE/kdelibs/kioslave/file/file.cpp #982411:982412
@@ -1065,7 +1065,7 @@
 			<< _point.toLocal8Bit();
 
 		if( (mnttab = KDE_fopen( MNTTAB, "r" )) == NULL ) {
-			err = "could not open mnttab";
+			err = QLatin1String("could not open mnttab");
 			kDebug(7101) << "VOLMGT: " << err;
 			error( KIO::ERR_COULD_NOT_UNMOUNT, err );
 			return;
@@ -1088,7 +1088,7 @@
 		fclose( mnttab );
 
 		if( devname == NULL ) {
-			err = "not in mnttab";
+			err = QLatin1String("not in mnttab");
 			kDebug(7101) << "VOLMGT: "
 				<< QFile::encodeName(_point).data()
 				<< ": " << err;
@@ -1114,9 +1114,10 @@
 		if( WEXITSTATUS( system( buffer.constData() )) == 4 ) {
 			/*
 			 *  this is not an error, so skip "testLogFile()"
-			 *  to avoid wrong/confusing error popup
+			 *  to avoid wrong/confusing error popup. The 
+			 *  temporary file is removed by KTemporaryFile's
+			 *  destructor, so don't do that manually.
 			 */
-			QFile::remove( tmpFileName );
 			finished();
 			return;
 		}
[prev in list] [next in list] [prev in thread] [next in thread]