[gparted] Use cached method first to read UUID to shorten scan time

[Curtis Gedak <gedakc src gnome org>]

commit 1f1ea3f12e50c71c7c10d4fd1d79ef8da0447bc2
Author: Curtis Gedak <gedakc gmail com>
Date:   Sun Mar 25 10:10:47 2012 -0600

    Use cached method first to read UUID to shorten scan time

 src/GParted_Core.cc |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index 7df29ac..62be59e 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -1042,6 +1042,8 @@ void GParted_Core::set_device_partitions( Device & device )
 		if ( partition_temp .get_path() != "" )
 		{
 			//Retrieve file system label
+			//  Use file system specific method first in an effort to ensure multi-byte
+			//  character sets are properly displayed.
 			read_label( partition_temp ) ;
 			if ( partition_temp .label .empty() )
 			{
@@ -1050,10 +1052,11 @@ void GParted_Core::set_device_partitions( Device & device )
 			}
 
 			//Retrieve file system UUID
-			read_uuid( partition_temp ) ;
+			//  Use cached method first in an effort to speed up device scanning.
+			partition_temp .uuid = fs_info .get_uuid( partition_temp .get_path() ) ;
 			if ( partition_temp .uuid .empty() )
 			{
-				partition_temp .uuid = fs_info .get_uuid( partition_temp .get_path() ) ;
+				read_uuid( partition_temp ) ;
 			}
 		}