[gnome-disk-utility] lvm2: Make it possible to get the LV name and use it

[David Zeuthen <davidz src gnome org>]

commit 57be609d360bfbb324e383fba5a0dfd8b071644c
Author: David Zeuthen <davidz redhat com>
Date:   Fri Feb 19 12:48:57 2010 -0500

    lvm2: Make it possible to get the LV name and use it
    
    As per the last commit, this is no longer the same name as what
    get_name() on GduPresentable returns.
    
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 src/gdu/gdu-linux-lvm2-volume.c      |    6 ++++++
 src/gdu/gdu-linux-lvm2-volume.h      |    5 +++--
 src/palimpsest/gdu-section-volumes.c |   12 +++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/src/gdu/gdu-linux-lvm2-volume.c b/src/gdu/gdu-linux-lvm2-volume.c
index 490a581..84c8e48 100644
--- a/src/gdu/gdu-linux-lvm2-volume.c
+++ b/src/gdu/gdu-linux-lvm2-volume.c
@@ -505,6 +505,12 @@ _gdu_linux_lvm2_volume_rewrite_enclosing_presentable (GduLinuxLvm2Volume *volume
 /* ---------------------------------------------------------------------------------------------------- */
 
 const gchar *
+gdu_linux_lvm2_volume_get_name (GduLinuxLvm2Volume *volume)
+{
+        return volume->priv->name;
+}
+
+const gchar *
 gdu_linux_lvm2_volume_get_uuid (GduLinuxLvm2Volume *volume)
 {
         return volume->priv->uuid;
diff --git a/src/gdu/gdu-linux-lvm2-volume.h b/src/gdu/gdu-linux-lvm2-volume.h
index 018a6d9..d5532be 100644
--- a/src/gdu/gdu-linux-lvm2-volume.h
+++ b/src/gdu/gdu-linux-lvm2-volume.h
@@ -54,8 +54,9 @@ struct _GduLinuxLvm2VolumeClass
         GduVolumeClass parent_class;
 };
 
-GType        gdu_linux_lvm2_volume_get_type (void);
-const gchar *gdu_linux_lvm2_volume_get_uuid (GduLinuxLvm2Volume *volume);
+GType        gdu_linux_lvm2_volume_get_type       (void);
+const gchar *gdu_linux_lvm2_volume_get_name       (GduLinuxLvm2Volume *volume);
+const gchar *gdu_linux_lvm2_volume_get_uuid       (GduLinuxLvm2Volume *volume);
 const gchar *gdu_linux_lvm2_volume_get_group_uuid (GduLinuxLvm2Volume *volume);
 
 G_END_DECLS
diff --git a/src/palimpsest/gdu-section-volumes.c b/src/palimpsest/gdu-section-volumes.c
index e7fa7e2..4f73466 100644
--- a/src/palimpsest/gdu-section-volumes.c
+++ b/src/palimpsest/gdu-section-volumes.c
@@ -1700,7 +1700,7 @@ on_lvm2_lv_edit_name_button_clicked (GduButtonElement *button_element,
         GduPool *pool;
         const gchar *group_uuid;
         const gchar *uuid;
-        gchar *lv_name;
+        const gchar *lv_name;
         GtkWindow *toplevel;
         GtkWidget *dialog;
         gint response;
@@ -1709,11 +1709,10 @@ on_lvm2_lv_edit_name_button_clicked (GduButtonElement *button_element,
         volume = GDU_LINUX_LVM2_VOLUME (gdu_volume_grid_get_selected (GDU_VOLUME_GRID (section->priv->grid)));
         pool = gdu_presentable_get_pool (GDU_PRESENTABLE (volume));
 
+        lv_name = gdu_linux_lvm2_volume_get_name (volume);
         group_uuid = gdu_linux_lvm2_volume_get_group_uuid (volume);
         uuid = gdu_linux_lvm2_volume_get_uuid (volume);
 
-        lv_name = gdu_presentable_get_name (GDU_PRESENTABLE (volume));
-
         toplevel = GTK_WINDOW (gdu_shell_get_toplevel (gdu_section_get_shell (GDU_SECTION (section))));
         dialog = gdu_edit_name_dialog_new (toplevel,
                                            GDU_PRESENTABLE (volume),
@@ -1737,7 +1736,6 @@ on_lvm2_lv_edit_name_button_clicked (GduButtonElement *button_element,
         gtk_widget_destroy (dialog);
 
         g_object_unref (pool);
-        g_free (lv_name);
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
@@ -1979,10 +1977,10 @@ gdu_section_volumes_update (GduSection *_section)
         /* reset all elements */
 
         if (GDU_IS_LINUX_LVM2_VOLUME (v)) {
-                gchar *lv_name;
-                lv_name = gdu_presentable_get_name (v);
+                const gchar *lv_name;
+                lv_name = gdu_linux_lvm2_volume_get_name (GDU_LINUX_LVM2_VOLUME (v));
                 gdu_details_element_set_text (section->priv->lvm2_name_element, lv_name);
-                g_free (lv_name);
+
                 gdu_details_element_set_text (section->priv->lvm2_state_element,
                                               d != NULL ?
                                               C_("LVM2 LV State", "Running") :