[gnome-disk-utility/new-ui] Use _get_enclosing_presentable(), not _get_toplevel() to get the drive



commit aff737fbe25b6bcb3750d4979f5c327ee44543cb
Author: David Zeuthen <davidz redhat com>
Date:   Fri Nov 27 20:47:06 2009 -0500

    Use _get_enclosing_presentable(), not _get_toplevel() to get the drive
    
    Otherwise it won't work now that top-levels can be HBAs.

 src/gdu/gdu-volume-hole.c |    2 +-
 src/gdu/gdu-volume.c      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/gdu/gdu-volume-hole.c b/src/gdu/gdu-volume-hole.c
index 91794a8..484d8c8 100644
--- a/src/gdu/gdu-volume-hole.c
+++ b/src/gdu/gdu-volume-hole.c
@@ -186,7 +186,7 @@ gdu_volume_hole_get_icon (GduPresentable *presentable)
         name = NULL;
         is_removable = FALSE;
 
-        p = gdu_presentable_get_toplevel (presentable);
+        p = gdu_presentable_get_enclosing_presentable (presentable);
         if (p == NULL)
                 goto out;
 
diff --git a/src/gdu/gdu-volume.c b/src/gdu/gdu-volume.c
index 5b64333..cb1240a 100644
--- a/src/gdu/gdu-volume.c
+++ b/src/gdu/gdu-volume.c
@@ -226,7 +226,7 @@ get_names_and_desc (GduPresentable  *presentable,
         drive_media = NULL;
         strsize = NULL;
 
-        drive_presentable = gdu_presentable_get_toplevel (presentable);
+        drive_presentable = gdu_presentable_get_enclosing_presentable (presentable);
         if (drive_presentable != NULL) {
                 drive_device = gdu_presentable_get_device (drive_presentable);
                 drive_media = gdu_device_drive_get_media (drive_device);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]