From bcd03e5c41c5257fbd9b3faf502c5f40e7fbbffd Mon Sep 17 00:00:00 2001 From: Mike Fleetwood Date: Sat, 20 Aug 2016 16:51:06 +0100 Subject: [PATCH] Restore Information dialog display of whole disk devices (#788308) So they display as previously; as all grey in the graphic and with only the correct attributes shown. Fix up following switch from whole_device flag to TYPE_UNPARTITIONED. Bug 788308 - Remove whole_device partition flag --- src/Dialog_Partition_Info.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Dialog_Partition_Info.cc b/src/Dialog_Partition_Info.cc index ee84b369..f19146d0 100644 --- a/src/Dialog_Partition_Info.cc +++ b/src/Dialog_Partition_Info.cc @@ -126,7 +126,7 @@ void Dialog_Partition_Info::drawingarea_on_realize() bool Dialog_Partition_Info::drawingarea_on_expose( GdkEventExpose *ev ) { - if ( partition .type != GParted::TYPE_UNALLOCATED ) + if ( partition.filesystem != FS_UNALLOCATED ) { //used gc ->set_foreground( color_used ); @@ -270,7 +270,7 @@ void Dialog_Partition_Info::Display_Info() top++, bottom++; //label - if ( filesystem_ptn.type != TYPE_UNALLOCATED && filesystem_ptn.type != TYPE_EXTENDED ) + if ( filesystem_ptn.filesystem != FS_UNALLOCATED && filesystem_ptn.type != TYPE_EXTENDED ) { table ->attach( * Utils::mk_label( "" + Glib::ustring( _("Label:") ) + ""), 1, 2, @@ -285,7 +285,7 @@ void Dialog_Partition_Info::Display_Info() } // file system uuid - if ( filesystem_ptn.type != TYPE_UNALLOCATED && filesystem_ptn.type != TYPE_EXTENDED ) + if ( filesystem_ptn.filesystem != FS_UNALLOCATED && filesystem_ptn.type != TYPE_EXTENDED ) { table ->attach( * Utils::mk_label( "" + Glib::ustring( _("UUID:") ) + ""), 1, 2, @@ -309,7 +309,7 @@ void Dialog_Partition_Info::Display_Info() static Glib::ustring luks_closed = _("Closed"); //status - if ( filesystem_ptn.type != TYPE_UNALLOCATED && filesystem_ptn.status != STAT_NEW ) + if ( filesystem_ptn.filesystem != FS_UNALLOCATED && filesystem_ptn.status != STAT_NEW ) { //status Glib::ustring str_temp ; @@ -598,7 +598,7 @@ void Dialog_Partition_Info::Display_Info() top++, bottom++, Gtk::FILL ); - if ( partition .type != GParted::TYPE_UNALLOCATED && partition .status != GParted::STAT_NEW ) + if ( partition.filesystem != FS_UNALLOCATED && partition .status != GParted::STAT_NEW ) { // name table->attach( * Utils::mk_label( "" + Glib::ustring( _("Name:") ) + ""),