[gparted] Display GUI column Mount Point correctly for encrypted file systems (#760080)

[Curtis Gedak <gedakc src gnome org>]

commit b45af51a92cfc0ce397245ffdf3cafdabf31889c
Author: Mike Fleetwood <mike fleetwood googlemail com>
Date:   Mon Dec 28 19:11:37 2015 +0000

    Display GUI column Mount Point correctly for encrypted file systems (#760080)
    
    For open dm-crypt mappings get the Mount Point value from the encrypted
    file system Partition object.
    
    Bug 760080 - Implement read-only LUKS support

 src/TreeView_Detail.cc |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/src/TreeView_Detail.cc b/src/TreeView_Detail.cc
index e619d63..e713106 100644
--- a/src/TreeView_Detail.cc
+++ b/src/TreeView_Detail.cc
@@ -189,28 +189,35 @@ void TreeView_Detail::create_row( const Gtk::TreeRow & treerow, const Partition
 
        if ( partition.filesystem == FS_LUKS && partition.busy )
        {
-               FILESYSTEM display_fstype = dynamic_cast< const PartitionLUKS *>( &partition 
)->get_encrypted().filesystem;
+               const Partition & encrypted = dynamic_cast<const PartitionLUKS *>( &partition 
)->get_encrypted();
+
                // file system
-               treerow[treeview_detail_columns.color] = Utils::get_color_as_pixbuf( display_fstype, 16, 16 );
+               treerow[treeview_detail_columns.color] = Utils::get_color_as_pixbuf( encrypted.filesystem, 
16, 16 );
                /* TO TRANSLATORS: means that this is an encrypted file system */
                treerow[treeview_detail_columns.filesystem] = "[" + Glib::ustring( _("Encrypted") ) + "] " +
-                                                             Utils::get_filesystem_string( display_fstype );
+                                                             Utils::get_filesystem_string( 
encrypted.filesystem );
+
+               // mount point
+               treerow[treeview_detail_columns.mountpoint] = Glib::build_path( ", ", 
encrypted.get_mountpoints() );
        }
        else if ( partition.filesystem == FS_LUKS && ! partition.busy )
        {
                // file system
                treerow[treeview_detail_columns.color] = Utils::get_color_as_pixbuf( partition.filesystem, 
16, 16 );
                treerow[treeview_detail_columns.filesystem] = "[" + Glib::ustring( _("Encrypted") ) + "]";
+
+               // mount point
+               treerow[treeview_detail_columns.mountpoint] = Glib::build_path( ", ", 
partition.get_mountpoints() );
        }
        else
        {
                // file system
                treerow[treeview_detail_columns.color] = Utils::get_color_as_pixbuf( partition.filesystem, 
16, 16 );
                treerow[treeview_detail_columns.filesystem] = Utils::get_filesystem_string( 
partition.filesystem );
-       }
 
-       //mount point
-       treerow[ treeview_detail_columns .mountpoint ] = Glib::build_path( ", ", partition .get_mountpoints() 
) ;
+               // mount point
+               treerow[treeview_detail_columns.mountpoint] = Glib::build_path( ", ", 
partition.get_mountpoints() );
+       }
 
        //label
        treerow[ treeview_detail_columns .label ] = partition.get_filesystem_label();