Also show interfaces+properties when an object is added

 $ udisks monitor
 Monitoring the udisks daemon. Press Ctrl+C to exit.
 18:04:29.489: The udisks-daemon is running (name-owner :1.267).
 18:04:30.845: Added /org/freedesktop/UDisks/devices/mmcblk0
   org.freedesktop.UDisks.BlockDevice:
     Device:             /dev/mmcblk0
     Major:              179
     Minor:              0
     Size:               1015808000
     Symlinks:           /dev/block/179:0
                         /dev/disk/by-id/mmc-SD01G_0x50882907
                         /dev/disk/by-path/pci-0000:05:00.2
   org.freedesktop.UDisks.LinuxSysfsDevice:
     Subsystem:          block
     SysfsPath:          /sys/devices/pci0000:00/0000:00:1e.0/0000:05:00.2/mmc_host/mmc0/mmc0:9ffc/block/mmcblk0
 18:04:30.912: Added /org/freedesktop/UDisks/devices/mmcblk0p1
   org.freedesktop.UDisks.BlockDevice:
     Device:             /dev/mmcblk0p1
     Major:              179
     Minor:              1
     Size:               499998720
     Symlinks:           /dev/block/179:1
                         /dev/disk/by-id/mmc-SD01G_0x50882907-part1
                         /dev/disk/by-path/pci-0000:05:00.2-part1
   org.freedesktop.UDisks.LinuxSysfsDevice:
     Subsystem:          block
     SysfsPath:          /sys/devices/pci0000:00/0000:00:1e.0/0000:05:00.2/mmc_host/mmc0/mmc0:9ffc/block/mmcblk0/mmcblk0p1

Signed-off-by: David Zeuthen <davidz@redhat.com>

diff --git a/tools/udisks.c b/tools/udisks.c
index 16328f7..41bd122 100644 (file)
--- a/tools/udisks.c
+++ b/tools/udisks.c
@@ -162,9 +162,6 @@ print_object (GDBusObjectProxy *proxy,
 
   g_return_if_fail (G_IS_DBUS_OBJECT_PROXY (proxy));
 
-  g_print ("%*s%s:\n",
-           indent, "", g_dbus_object_proxy_get_object_path (proxy));
-
   interface_proxies = g_dbus_object_proxy_get_all (proxy);
 
   /* We want to print the interfaces in order */
@@ -174,8 +171,8 @@ print_object (GDBusObjectProxy *proxy,
     {
       GDBusProxy *iproxy = G_DBUS_PROXY (l->data);
       g_print ("%*s%s:\n",
-               indent + 2, "", g_dbus_proxy_get_interface_name (iproxy));
-      print_interface_properties (iproxy, indent + 4);
+               indent, "", g_dbus_proxy_get_interface_name (iproxy));
+      print_interface_properties (iproxy, indent + 2);
     }
   g_list_foreach (interface_proxies, (GFunc) g_object_unref, NULL);
   g_list_free (interface_proxies);
@@ -388,7 +385,8 @@ handle_command_info (gint        *argc,
       goto out;
     }
 
-  print_object (object_proxy, 0);
+  g_print ("%s:\n", g_dbus_object_proxy_get_object_path (object_proxy));
+  print_object (object_proxy, 2);
   g_object_unref (object_proxy);
 
   ret = 0;
@@ -466,7 +464,8 @@ handle_command_dump (gint        *argc,
       if (!first)
         g_print ("\n");
       first = FALSE;
-      print_object (object_proxy, 0);
+      g_print ("%s:\n", g_dbus_object_proxy_get_object_path (object_proxy));
+      print_object (object_proxy, 2);
     }
   g_list_foreach (object_proxies, (GFunc) g_object_unref, NULL);
   g_list_free (object_proxies);
@@ -538,6 +537,7 @@ monitor_on_object_proxy_added (GDBusProxyManager  *manager,
   monitor_print_timestamp ();
   g_print ("Added %s\n",
            g_dbus_object_proxy_get_object_path (object_proxy));
+  print_object (object_proxy, 2);
  out:
   ;
 }