mirror of
https://gitlab.gnome.org/GNOME/gparted
synced 2024-08-27 11:40:03 +00:00
aa49b763e4
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
65 lines
1.9 KiB
C++
65 lines
1.9 KiB
C++
/* Copyright (C) 2015 Mike Fleetwood
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
|
|
#ifndef GPARTED_PARTITIONLUKS_H
|
|
#define GPARTED_PARTITIONLUKS_H
|
|
|
|
#include "Partition.h"
|
|
#include "Utils.h"
|
|
|
|
#include <glibmm/ustring.h>
|
|
|
|
namespace GParted
|
|
{
|
|
|
|
class PartitionLUKS : public Partition
|
|
{
|
|
public:
|
|
PartitionLUKS();
|
|
virtual ~PartitionLUKS();
|
|
virtual PartitionLUKS * clone() const;
|
|
|
|
void set_luks( const Glib::ustring & path,
|
|
FILESYSTEM fstype,
|
|
Sector header_size,
|
|
Sector mapping_size,
|
|
Byte_Value sector_size,
|
|
bool busy );
|
|
|
|
Partition & get_encrypted() { return encrypted; };
|
|
const Partition & get_encrypted() const { return encrypted; };
|
|
|
|
virtual bool sector_usage_known() const;
|
|
virtual Sector estimated_min_size() const;
|
|
virtual Sector get_sectors_used() const;
|
|
virtual Sector get_sectors_unused() const;
|
|
virtual Sector get_sectors_unallocated() const;
|
|
virtual bool have_messages() const;
|
|
virtual std::vector<Glib::ustring> get_messages() const;
|
|
virtual void clear_messages();
|
|
|
|
virtual const Partition & get_filesystem_partition() const;
|
|
|
|
private:
|
|
Partition encrypted;
|
|
Sector header_size; // Size of the LUKS header (everything up to the start of the mapping)
|
|
};
|
|
|
|
}//GParted
|
|
|
|
#endif /* GPARTED_PARTITIONLUKS_H */
|