mirror of
https://gitlab.gnome.org/GNOME/gparted
synced 2024-08-27 11:40:03 +00:00
Remove virtual PartitionLUKS::get_filesystem_label() (#774818)
The previous commit changed how the code behind the main window retrieved the file system label for display. This is the relevant changes in TreeView_Detail::create_row(): + const Partition & filesystem_ptn = partition.get_filesystem_partition(); ... - Glib::ustring temp_filesystem_label = partition.get_filesystem_label(); + Glib::ustring temp_filesystem_label = filesystem_ptn.get_filesystem_label(); treerow[treeview_detail_columns.label] = temp_filesystem_label; In the case of an encrypted file system get_filesystem_label() is now called on the Partition object directly rather than on the outer Partition object containing the LUKS encryption. The code behind the Information dialog always obtained and used the Partition object directly containing the file system to call get_filesystem_label() since read-only LUKS support was added. Therefore the virtualised PartitionLUKS::get_filesystem_label() is no longer needed, so remove it. Bug 774818 - Implement LUKS read-write actions NOT requiring a passphrase
This commit is contained in:
parent
53fd80e6ca
commit
aa49b763e4
|
@ -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.
|
||||
|
|
|
@ -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<Glib::ustring> get_messages() const;
|
||||
virtual void clear_messages();
|
||||
|
|
|
@ -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 )
|
||||
|
|
Loading…
Reference in a new issue