[gparted] Cleanup btrfs code

[Curtis Gedak <gedakc src gnome org>]

commit 2bcd5d295498a1675afba974e91ad19f09b42a76
Author: Curtis Gedak <gedakc gmail com>
Date:   Sat Oct 22 10:44:29 2011 -0600

    Cleanup btrfs code
    
    Move btrfs higher up the file system list.
    Remove btrfs skip references as btrfs is now supported.

 include/Utils.h             |   42 +++++++++++++++++++++---------------------
 src/Dialog_Partition_New.cc |    5 ++---
 2 files changed, 23 insertions(+), 24 deletions(-)
---
diff --git a/include/Utils.h b/include/Utils.h
index e154d6f..c255d81 100644
--- a/include/Utils.h
+++ b/include/Utils.h
@@ -50,28 +50,28 @@ enum FILESYSTEM
 {
 	FS_UNALLOCATED	= 0,
 	FS_UNKNOWN	= 1,
-	FS_UNFORMATTED	= 2, 
+	FS_UNFORMATTED	= 2,
 	FS_EXTENDED	= 3,
-	
-	FS_EXT2		= 4,
-	FS_EXT3		= 5,
-	FS_EXT4		= 6,
-	FS_LINUX_SWAP	= 7,
-	FS_FAT16	= 8,
-	FS_FAT32	= 9,
-	FS_NTFS		= 10,
-	FS_REISERFS	= 11,
-	FS_REISER4	= 12,
-	FS_XFS		= 13,
-	FS_JFS		= 14,
-	FS_HFS		= 15,
-	FS_HFSPLUS	= 16,
-	FS_UFS		= 17,
-
-	FS_USED		= 18,
-	FS_UNUSED	= 19,
-
-	FS_BTRFS	= 20,  /* FIXME: Move this higher up list when full support added */
+
+	FS_BTRFS	= 4,
+	FS_EXT2		= 5,
+	FS_EXT3		= 6,
+	FS_EXT4		= 7,
+	FS_LINUX_SWAP	= 8,
+	FS_FAT16	= 9,
+	FS_FAT32	= 10,
+	FS_NTFS		= 11,
+	FS_REISERFS	= 12,
+	FS_REISER4	= 13,
+	FS_XFS		= 14,
+	FS_JFS		= 15,
+	FS_HFS		= 16,
+	FS_HFSPLUS	= 17,
+	FS_UFS		= 18,
+
+	FS_USED		= 19,
+	FS_UNUSED	= 20,
+
 	FS_LVM2		= 21,
 	FS_LUKS		= 22
 } ;
diff --git a/src/Dialog_Partition_New.cc b/src/Dialog_Partition_New.cc
index 0a73368..495ddf7 100644
--- a/src/Dialog_Partition_New.cc
+++ b/src/Dialog_Partition_New.cc
@@ -50,8 +50,7 @@ void Dialog_Partition_New::Set_Data( const Partition & partition,
 	{
 		if ( this ->FILESYSTEMS[ t ] .filesystem == GParted::FS_UNKNOWN ||
 		     this ->FILESYSTEMS[ t ] .filesystem == GParted::FS_LVM2 ||
-		     this ->FILESYSTEMS[ t ] .filesystem == GParted::FS_LUKS ||
-		     this ->FILESYSTEMS[ t ] .filesystem == GParted::FS_BTRFS
+		     this ->FILESYSTEMS[ t ] .filesystem == GParted::FS_LUKS
 		   )
 			this ->FILESYSTEMS .erase( this->FILESYSTEMS .begin() + t ) ;
 	}
@@ -325,7 +324,7 @@ void Dialog_Partition_New::Build_Filesystems_Menu( bool only_unformatted )
 	//fill the file system menu with the file systems (except for extended) 
 	for ( unsigned int t = 0 ; t < FILESYSTEMS .size( ) ; t++ ) 
 	{
-		//skip extended (btrfs, luks, lvm2, and unknown removed in Set_Data())
+		//skip extended (luks, lvm2, and unknown removed in Set_Data())
 		if( FILESYSTEMS[ t ] .filesystem == GParted::FS_EXTENDED )
 			continue ;
 		menu_filesystem .items() .push_back(