[gnome-disk-utility] Include parent id in the id for GduHub



commit 5407e52e6a8ca377deb381672e1c0082e2940864
Author: David Zeuthen <davidz redhat com>
Date:   Mon Dec 14 14:57:59 2009 -0500

    Include parent id in the id for GduHub
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 src/gdu/gdu-hub.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/src/gdu/gdu-hub.c b/src/gdu/gdu-hub.c
index 3aa42e3..60247df 100644
--- a/src/gdu/gdu-hub.c
+++ b/src/gdu/gdu-hub.c
@@ -144,10 +144,15 @@ _gdu_hub_new (GduPool        *pool,
         hub->priv->pool = g_object_ref (pool);
         hub->priv->enclosing_presentable =
                 enclosing_presentable != NULL ? g_object_ref (enclosing_presentable) : NULL;
-        if (expander != NULL)
-                hub->priv->id = g_strdup (gdu_expander_get_native_path (hub->priv->expander));
-        else
-                hub->priv->id = g_strdup (gdu_adapter_get_native_path (hub->priv->adapter));
+        if (expander != NULL) {
+                hub->priv->id = g_strdup_printf ("%s__enclosed_by_%s",
+                                                 gdu_expander_get_native_path (hub->priv->expander),
+                                                 enclosing_presentable != NULL ? gdu_presentable_get_id (enclosing_presentable) : "(none)");
+        } else {
+                hub->priv->id = g_strdup_printf ("%s__enclosed_by_%s",
+                                                 gdu_adapter_get_native_path (hub->priv->adapter),
+                                                 enclosing_presentable != NULL ? gdu_presentable_get_id (enclosing_presentable) : "(none)");
+        }
         g_signal_connect (adapter, "changed", (GCallback) adapter_changed, hub);
         if (expander != NULL)
                 g_signal_connect (expander, "changed", (GCallback) expander_changed, hub);



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