diff --git a/ChangeLog b/ChangeLog
index 740dd4a9..140138ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-09-11 Bart Hakvoort <hakvoort@cvs.gnome.org>
+
+	* src/GParted_Core.cc: reverted back to parted probing after i heard
+	  patches to fix some issues with it are underway. (skipping of floppy
+	  and cdrom)
+	* src/reiser4.cc,
+	  src/reiserfs.cc: added --quiet to the fschecks to prevent the
+	  detailswindow from dying under the load. I should find a solution
+	  for that anyway.
+
 2006-09-10 Bart Hakvoort <hakvoort@cvs.gnome.org>
 
 	* src/GParted_Core.cc: display total sector info in copy_filesystem()
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index ee53fcae..0d2fcb1e 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -151,27 +151,22 @@ void GParted_Core::set_devices( std::vector<Device> & devices )
 		device_paths .clear() ;
 		
 		//try to find all available devices
-		std::ifstream proc_partitions( "/proc/partitions" ) ;
-        	if ( proc_partitions )
-        	{
-        	        std::string line ;
-        	        while ( getline( proc_partitions, line ) )
-        	        {
-        	                int minor ;
-        	                char device[512] ;
-        	                if ( sscanf( line .c_str(), "%*d %d %*d %s", &minor, device ) == 2 && minor == 0 )
-        	                        device_paths .push_back( "/dev/" + Glib::ustring( device ) ) ;
-        	        }
-
-        	        proc_partitions .close() ;
-        	}
+		ped_device_probe_all();
+		lp_device = ped_device_get_next( NULL );
+		while ( lp_device ) 
+		{
+			device_paths .push_back( lp_device ->path ) ;
+			
+			lp_device = ped_device_get_next( lp_device ) ;
+		}
+		close_device_and_disk() ;
 
 		std::sort( device_paths .begin(), device_paths .end() ) ;
 	}
 	
 	for ( unsigned int t = 0 ; t < device_paths .size() ; t++ ) 
 	{ 
-		if ( open_device_and_disk( device_paths[ t ], false ) )
+		if ( device_paths[ t ] .length() > 6 && device_paths[ t ] .is_ascii() && open_device_and_disk( device_paths[ t ], false ) )
 		{
 			temp_device .Reset() ;
 			
diff --git a/src/reiser4.cc b/src/reiser4.cc
index 05fca12d..dc7e7460 100644
--- a/src/reiser4.cc
+++ b/src/reiser4.cc
@@ -96,7 +96,7 @@ bool reiser4::copy( const Glib::ustring & src_part_path,
 
 bool reiser4::check_repair( const Partition & partition, OperationDetail & operationdetail )
 {
-	return ! execute_command( "fsck.reiser4 --yes --fix " + partition .get_path(), operationdetail ) ;
+	return ! execute_command( "fsck.reiser4 --yes --fix --quiet " + partition .get_path(), operationdetail ) ;
 }
 
 } //GParted
diff --git a/src/reiserfs.cc b/src/reiserfs.cc
index 022b34eb..e504902a 100644
--- a/src/reiserfs.cc
+++ b/src/reiserfs.cc
@@ -112,7 +112,7 @@ bool reiserfs::copy( const Glib::ustring & src_part_path,
 
 bool reiserfs::check_repair( const Partition & partition, OperationDetail & operationdetail )
 {
-	exit_status = execute_command( "reiserfsck --y --fix-fixable " + partition .get_path(), operationdetail ) ;
+	exit_status = execute_command( "reiserfsck --yes --fix-fixable --quiet " + partition .get_path(), operationdetail ) ;
 	
 	return ( exit_status == 0 || exit_status == 1 || exit_status == 256 ) ;
 }