[gnome-disk-utility] Check loop interface on main block device, not the partition



commit 164d01656f51d8c8436658ccc38e4e0c0012dd2c
Author: David Zeuthen <davidz redhat com>
Date:   Tue May 1 18:03:21 2012 -0400

    Check loop interface on main block device, not the partition
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 src/palimpsest/gduwindow.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/palimpsest/gduwindow.c b/src/palimpsest/gduwindow.c
index 41283ca..db695e7 100644
--- a/src/palimpsest/gduwindow.c
+++ b/src/palimpsest/gduwindow.c
@@ -1833,6 +1833,8 @@ update_device_page_for_block (GduWindow          *window,
   read_only = udisks_block_get_read_only (block);
   partition = udisks_object_peek_partition (object);
   filesystem = udisks_object_peek_filesystem (object);
+
+  /* loop device of main block device (not partition) */
   loop = udisks_object_peek_loop (window->current_object);
 
   drive_object = (UDisksObject *) g_dbus_object_manager_get_object (udisks_client_get_object_manager (window->client),
@@ -2859,13 +2861,12 @@ on_devtab_loop_autoclear_switch_notify_active (GObject    *gobject,
                                                gpointer    user_data)
 {
   GduWindow *window = GDU_WINDOW (user_data);
-  UDisksObject *object;
   UDisksLoop *loop;
   gboolean sw_value;
 
-  object = gdu_volume_grid_get_selected_device (GDU_VOLUME_GRID (window->volume_grid));
-  g_assert (object != NULL);
-  loop = udisks_object_peek_loop (object);
+  g_return_if_fail (window->current_object != NULL);
+
+  loop = udisks_object_peek_loop (window->current_object);
   if (loop == NULL)
     {
       g_warning ("current object is not a loop object");



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