[gnome-disk-utility/wip/mdraid] GduVolumeGrid: Nuke the container stuff

[David Zeuthen <davidz src gnome org>]

commit bcd12a500bbde3da41490cde3c4ebb82340a21e1
Author: David Zeuthen <zeuthen gmail com>
Date:   Wed Sep 12 12:03:48 2012 -0400

    GduVolumeGrid: Nuke the container stuff
    
    It's not used anymore.
    
    Signed-off-by: David Zeuthen <zeuthen gmail com>

 src/disks/gduvolumegrid.c |   50 ++------------------------------------------
 src/disks/gduvolumegrid.h |    4 ---
 src/disks/gduwindow.c     |    1 -
 3 files changed, 3 insertions(+), 52 deletions(-)
---
diff --git a/src/disks/gduvolumegrid.c b/src/disks/gduvolumegrid.c
index 0398878..299a365 100644
--- a/src/disks/gduvolumegrid.c
+++ b/src/disks/gduvolumegrid.c
@@ -86,9 +86,6 @@ struct _GduVolumeGrid
   UDisksClient *client;
   UDisksObject *block_object;
 
-  gboolean container_visible;
-  gchar *container_markup;
-
   GList *elements;
 
   GridElement *selected;
@@ -109,7 +106,7 @@ enum
 {
   PROP_0,
   PROP_CLIENT,
-  PROP_BLOCK_OBJECT
+  PROP_BLOCK_OBJECT,
 };
 
 enum
@@ -147,8 +144,6 @@ gdu_volume_grid_finalize (GObject *object)
 {
   GduVolumeGrid *grid = GDU_VOLUME_GRID (object);
 
-  g_free (grid->container_markup);
-
   g_signal_handlers_disconnect_by_func (grid->client,
                                         G_CALLBACK (on_client_changed),
                                         grid);
@@ -1283,21 +1278,9 @@ recompute_grid (GduVolumeGrid *grid)
   g_list_free (grid->elements);
   grid->elements = NULL;
 
-  //g_debug ("TODO: recompute grid for %s, container_visible=%d",
+  //g_debug ("TODO: recompute grid for %s",
   //         grid->block_object != NULL ?
-  //         g_dbus_object_get_object_path (grid->block_object) : "<nothing selected>",
-  //         grid->container_visible);
-
-  if (grid->container_visible)
-    {
-      element = g_new0 (GridElement, 1);
-      element->type = GDU_VOLUME_GRID_ELEMENT_TYPE_CONTAINER;
-      element->fixed_width = 40;
-      element->offset = 0;
-      element->size = 0;
-      element->markup = g_strdup (grid->container_markup);
-      grid->elements = g_list_append (grid->elements, element);
-    }
+  //         g_dbus_object_get_object_path (grid->block_object) : "<nothing selected>");
 
   if (grid->block_object == NULL)
     {
@@ -1825,30 +1808,3 @@ on_client_changed (UDisksClient   *client,
   GduVolumeGrid *grid = GDU_VOLUME_GRID (user_data);
   recompute_grid (grid);
 }
-
-/* ---------------------------------------------------------------------------------------------------- */
-
-void
-gdu_volume_grid_set_container_visible (GduVolumeGrid  *grid,
-                                       gboolean        visible)
-{
-  g_return_if_fail (GDU_IS_VOLUME_GRID (grid));
-  if (!!grid->container_visible != !!visible)
-    {
-      grid->container_visible = visible;
-      recompute_grid (grid);
-    }
-}
-
-void
-gdu_volume_grid_set_container_markup (GduVolumeGrid  *grid,
-                                      const gchar    *markup)
-{
-  g_return_if_fail (GDU_IS_VOLUME_GRID (grid));
-  if (g_strcmp0 (grid->container_markup, markup) != 0)
-    {
-      g_free (grid->container_markup);
-      grid->container_markup = g_strdup (markup);
-      recompute_grid (grid);
-    }
-}
diff --git a/src/disks/gduvolumegrid.h b/src/disks/gduvolumegrid.h
index 6f1f667..b749391 100644
--- a/src/disks/gduvolumegrid.h
+++ b/src/disks/gduvolumegrid.h
@@ -24,10 +24,6 @@ GtkWidget*                gdu_volume_grid_new                   (UDisksClient
 void                      gdu_volume_grid_set_block_object      (GduVolumeGrid       *grid,
                                                                  UDisksObject        *block_device);
 UDisksObject             *gdu_volume_grid_get_block_object      (GduVolumeGrid      *grid);
-void                      gdu_volume_grid_set_container_visible (GduVolumeGrid       *grid,
-                                                                 gboolean             visible);
-void                      gdu_volume_grid_set_container_markup  (GduVolumeGrid       *grid,
-                                                                 const gchar         *text);
 
 gboolean                  gdu_volume_grid_includes_object       (GduVolumeGrid       *grid,
                                                                  UDisksObject        *object);
diff --git a/src/disks/gduwindow.c b/src/disks/gduwindow.c
index 3748a21..ff6bcc0 100644
--- a/src/disks/gduwindow.c
+++ b/src/disks/gduwindow.c
@@ -1696,7 +1696,6 @@ setup_device_page (GduWindow     *window,
   mdraid = udisks_object_peek_mdraid (object);
   block = udisks_object_peek_block (object);
 
-  gdu_volume_grid_set_container_visible (GDU_VOLUME_GRID (window->volume_grid), FALSE);
   if (drive != NULL)
     {
       GList *blocks;