diff --git a/include/Partition.h b/include/Partition.h index 1f893972..8078dd1d 100644 --- a/include/Partition.h +++ b/include/Partition.h @@ -113,7 +113,7 @@ public: Sector get_sector() const ; bool test_overlap( const Partition & partition ) const ; bool filesystem_label_known() const; - virtual Glib::ustring get_filesystem_label() const; + Glib::ustring get_filesystem_label() const; void set_filesystem_label( const Glib::ustring & filesystem_label ); // Message accessors. Messages are stored locally and accessed globally. diff --git a/include/PartitionLUKS.h b/include/PartitionLUKS.h index feb9bd38..65c4277c 100644 --- a/include/PartitionLUKS.h +++ b/include/PartitionLUKS.h @@ -48,7 +48,6 @@ public: virtual Sector get_sectors_used() const; virtual Sector get_sectors_unused() const; virtual Sector get_sectors_unallocated() const; - virtual Glib::ustring get_filesystem_label() const; virtual bool have_messages() const; virtual std::vector get_messages() const; virtual void clear_messages(); diff --git a/src/PartitionLUKS.cc b/src/PartitionLUKS.cc index c16fd790..72c45bb6 100644 --- a/src/PartitionLUKS.cc +++ b/src/PartitionLUKS.cc @@ -168,14 +168,6 @@ Sector PartitionLUKS::get_sectors_unallocated() const return Partition::get_sectors_unallocated(); } -// Return the label of the encrypted file system within, or "" if no open mapping. -Glib::ustring PartitionLUKS::get_filesystem_label() const -{ - if ( busy ) - return encrypted.get_filesystem_label(); - return ""; -} - bool PartitionLUKS::have_messages() const { if ( busy )