From a6b4ca13b41e3c1321432a62c298806aba768eb4 Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Thu, 27 Jul 2023 15:03:05 -0700
Subject: [PATCH] sysprof: add indicator to dbus section

---
 src/sysprof/sysprof-dbus-section.c  | 10 ++++++++++
 src/sysprof/sysprof-dbus-section.ui | 11 +++++++++++
 src/sysprof/sysprof-greeter.ui      | 29 +++++++++++++++++++++++++++++
 src/sysprof/sysprof-window.ui       |  2 +-
 4 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/sysprof/sysprof-dbus-section.c b/src/sysprof/sysprof-dbus-section.c
index 7646a65c..2228306f 100644
--- a/src/sysprof/sysprof-dbus-section.c
+++ b/src/sysprof/sysprof-dbus-section.c
@@ -144,6 +144,15 @@ cast_bus_type (gpointer data,
   return bus_type;
 }
 
+static char *
+format_number (gpointer unused,
+               guint    number)
+{
+  if (number == 0)
+    return NULL;
+  return g_strdup_printf ("%'u", number);
+}
+
 static void
 sysprof_dbus_section_dispose (GObject *object)
 {
@@ -171,6 +180,7 @@ sysprof_dbus_section_class_init (SysprofDBusSectionClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, format_flags);
   gtk_widget_class_bind_template_callback (widget_class, format_serial);
   gtk_widget_class_bind_template_callback (widget_class, format_size);
+  gtk_widget_class_bind_template_callback (widget_class, format_number);
   gtk_widget_class_bind_template_callback (widget_class, format_message_type);
 
   g_type_ensure (SYSPROF_TYPE_CHART);
diff --git a/src/sysprof/sysprof-dbus-section.ui b/src/sysprof/sysprof-dbus-section.ui
index a042b32e..e77f8a09 100644
--- a/src/sysprof/sysprof-dbus-section.ui
+++ b/src/sysprof/sysprof-dbus-section.ui
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <template class="SysprofDBusSection" parent="SysprofSection">
+    <binding name="indicator">
+      <closure type="gchararray" function="format_number">
+        <lookup name="n-items" type="SysprofDocumentBitsetIndex">
+          <lookup name="dbus-messages" type="SysprofDocument">
+            <lookup name="document" type="SysprofSession">
+              <lookup name="session">SysprofDBusSection</lookup>
+            </lookup>
+          </lookup>
+        </lookup>
+      </closure>
+    </binding>
     <child>
       <object class="GtkBox">
         <property name="orientation">vertical</property>
diff --git a/src/sysprof/sysprof-greeter.ui b/src/sysprof/sysprof-greeter.ui
index 61d2cd34..a889891c 100644
--- a/src/sysprof/sysprof-greeter.ui
+++ b/src/sysprof/sysprof-greeter.ui
@@ -169,6 +169,35 @@
                         </child>
                       </object>
                     </child>
+                    <child>
+                      <object class="AdwPreferencesGroup">
+                        <property name="title" translatable="yes">D-Bus Profiler</property>
+                        <child>
+                          <object class="AdwActionRow">
+                            <property name="activatable-widget">record_session_bus</property>
+                            <property name="title" translatable="yes">D-Bus Session Bus</property>
+                            <property name="subtitle" translatable="yes">Record messages on the D-Bus user session bus</property>
+                            <child type="suffix">
+                              <object class="GtkSwitch" id="record_session_bus">
+                                <property name="valign">center</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                        <child>
+                          <object class="AdwActionRow">
+                            <property name="activatable-widget">record_system_bus</property>
+                            <property name="title" translatable="yes">D-Bus System Bus</property>
+                            <property name="subtitle" translatable="yes">Record messages on the D-Bus system bus</property>
+                            <child type="suffix">
+                              <object class="GtkSwitch" id="record_system_bus">
+                                <property name="valign">center</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
                     <child>
                       <object class="AdwPreferencesGroup">
                         <property name="title" translatable="yes">Counters</property>
diff --git a/src/sysprof/sysprof-window.ui b/src/sysprof/sysprof-window.ui
index 4b8c0485..568419df 100644
--- a/src/sysprof/sysprof-window.ui
+++ b/src/sysprof/sysprof-window.ui
@@ -208,7 +208,7 @@
                         </child>
                         <child>
                           <object class="SysprofDBusSection">
-                            <property name="title" translatable="yes">D-Bus Messages</property>
+                            <property name="title" translatable="yes">D-Bus</property>
                             <property name="category">processes</property>
                             <property name="icon-name">dbus-symbolic</property>
                             <binding name="session">