[gparted] Rename FS_LVM2 -> FS_LVM2_PV (#160787)

[Curtis Gedak <gedakc src gnome org>]

commit 391e5e12f98740fa8078b2921a42177867cc08e3
Author: Mike Fleetwood <mike fleetwood googlemail com>
Date:   Sat Jan 28 11:23:21 2012 +0000

    Rename FS_LVM2 -> FS_LVM2_PV (#160787)
    
    This is the first step of adding support for just LVM2 Phyiscal Volumes,
    a subset of full LVM2 support.
    
    Make it clear that it is only LVM2 PVs being treated like a file system.
    
    Bug #160787 - lvm support

 include/Utils.h             |    6 +++---
 src/DialogFeatures.cc       |    4 ++--
 src/Dialog_Partition_New.cc |    2 +-
 src/GParted_Core.cc         |   10 +++++-----
 src/Utils.cc                |    4 ++--
 src/Win_GParted.cc          |    4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/include/Utils.h b/include/Utils.h
index 4cdad54..6bcca41 100644
--- a/include/Utils.h
+++ b/include/Utils.h
@@ -72,11 +72,11 @@ enum FILESYSTEM
 	FS_HFSPLUS	= 18,
 	FS_UFS		= 19,
 	FS_NILFS2	= 20,
+	FS_LVM2_PV	= 21,
 
-	FS_USED		= 21,
-	FS_UNUSED	= 22,
+	FS_USED		= 22,
+	FS_UNUSED	= 23,
 
-	FS_LVM2		= 23,
 	FS_LUKS		= 24
 } ;
 
diff --git a/src/DialogFeatures.cc b/src/DialogFeatures.cc
index 890123c..65b194e 100644
--- a/src/DialogFeatures.cc
+++ b/src/DialogFeatures.cc
@@ -125,8 +125,8 @@ void DialogFeatures::load_filesystems( const std::vector<FS> & FILESYSTEMS )
 	{
 		//Skip luks, lvm2, and unknown because these are not file systems
 		if (
-		     FILESYSTEMS[ t ] .filesystem == GParted::FS_LUKS ||
-		     FILESYSTEMS[ t ] .filesystem == GParted::FS_LVM2 ||
+		     FILESYSTEMS[ t ] .filesystem == GParted::FS_LUKS    ||
+		     FILESYSTEMS[ t ] .filesystem == GParted::FS_LVM2_PV ||
 		     FILESYSTEMS[ t ] .filesystem == GParted::FS_UNKNOWN
 		   )
 			continue ;
diff --git a/src/Dialog_Partition_New.cc b/src/Dialog_Partition_New.cc
index 495ddf7..4d3647d 100644
--- a/src/Dialog_Partition_New.cc
+++ b/src/Dialog_Partition_New.cc
@@ -49,7 +49,7 @@ void Dialog_Partition_New::Set_Data( const Partition & partition,
 	for ( unsigned int t = this ->FILESYSTEMS .size( ) ; t > 0 ; t-- )
 	{
 		if ( this ->FILESYSTEMS[ t ] .filesystem == GParted::FS_UNKNOWN ||
-		     this ->FILESYSTEMS[ t ] .filesystem == GParted::FS_LVM2 ||
+		     this ->FILESYSTEMS[ t ] .filesystem == GParted::FS_LVM2_PV ||
 		     this ->FILESYSTEMS[ t ] .filesystem == GParted::FS_LUKS
 		   )
 			this ->FILESYSTEMS .erase( this->FILESYSTEMS .begin() + t ) ;
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index 8ae89a0..9e11770 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -146,7 +146,7 @@ void GParted_Core::find_supported_filesystems()
 	FILESYSTEMS .push_back( fs_xfs .get_filesystem_support() ) ;
 
 	//lvm2 physical volume -- not a file system
-	fs_notsupp .filesystem = GParted::FS_LVM2 ;
+	fs_notsupp .filesystem = GParted::FS_LVM2_PV ;
 	FILESYSTEMS .push_back( fs_notsupp ) ;
 
 	//luks encryption-- not a file system
@@ -1197,7 +1197,7 @@ GParted::FILESYSTEM GParted_Core::get_filesystem()
 			temp = _( "Logical Volume Management is not yet supported." ) ;
 			temp += "\n" ;
 			partition_temp .messages .push_back( temp ) ;
-			return GParted::FS_LVM2 ;
+			return GParted::FS_LVM2_PV ;
 		}
 	}
 
@@ -1344,7 +1344,7 @@ void GParted_Core::set_mountpoints( std::vector<Partition> & partitions )
 		       partitions[ t ] .type == GParted::TYPE_LOGICAL
 		     ) &&
 		     partitions[ t ] .filesystem != GParted::FS_LINUX_SWAP &&
-		     partitions[ t ] .filesystem != GParted::FS_LVM2 &&
+		     partitions[ t ] .filesystem != GParted::FS_LVM2_PV    &&
 		     partitions[ t ] .filesystem != GParted::FS_LUKS
 		   )
 		{
@@ -1411,8 +1411,8 @@ void GParted_Core::set_used_sectors( std::vector<Partition> & partitions )
 	for ( unsigned int t = 0 ; t < partitions .size() ; t++ )
 	{
 		if ( partitions[ t ] .filesystem != GParted::FS_LINUX_SWAP &&
-		     partitions[ t ] .filesystem != GParted::FS_LUKS &&
-		     partitions[ t ] .filesystem != GParted::FS_LVM2 &&
+		     partitions[ t ] .filesystem != GParted::FS_LUKS       &&
+		     partitions[ t ] .filesystem != GParted::FS_LVM2_PV    &&
 		     partitions[ t ] .filesystem != GParted::FS_UNKNOWN
 		   )
 		{
diff --git a/src/Utils.cc b/src/Utils.cc
index a2941d8..8a14802 100644
--- a/src/Utils.cc
+++ b/src/Utils.cc
@@ -93,7 +93,7 @@ Glib::ustring Utils::get_color( FILESYSTEM filesystem )
 		case FS_UFS			: return "#D1940C" ;	//accent yellow dark
 		case FS_USED		: return "#F8F8BA" ;	// ~ light tan yellow
 		case FS_UNUSED		: return "#FFFFFF" ;	//white
-		case FS_LVM2		: return "#CC9966" ;	// ~ medium brown
+		case FS_LVM2_PV		: return "#CC9966" ;	// ~ medium brown
 		case FS_LUKS		: return "#625B81" ;	//purple dark
 
 		default				: return "#000000" ;
@@ -160,7 +160,7 @@ Glib::ustring Utils::get_filesystem_string( FILESYSTEM filesystem )
 		case FS_UFS		: return "ufs" ;
 		case FS_USED		: return _("used") ;
 		case FS_UNUSED		: return _("unused") ;
-		case FS_LVM2		: return "lvm2" ;
+		case FS_LVM2_PV		: return "lvm2" ;
 		case FS_LUKS		: return "crypt-luks" ;
 
 		default			: return "" ;
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index b2d16e8..c4cc096 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -407,8 +407,8 @@ Gtk::Menu * Win_GParted::create_format_menu()
 	{
 		//Skip luks, lvm2, and unknown because these are not file systems
 		if (
-		     gparted_core .get_filesystems()[ t ] .filesystem == GParted::FS_LUKS ||
-		     gparted_core .get_filesystems()[ t ] .filesystem == GParted::FS_LVM2 ||
+		     gparted_core .get_filesystems()[ t ] .filesystem == GParted::FS_LUKS    ||
+		     gparted_core .get_filesystems()[ t ] .filesystem == GParted::FS_LVM2_PV ||
 		     gparted_core .get_filesystems()[ t ] .filesystem == GParted::FS_UNKNOWN
 		   )
 			continue ;