Merge pull request #440 from rhbvkleef/439-annotations-on-interfaces-…

…not-shown Show annotations for interfaces in introspection
diwic · Jun 17, 2023 · 1580702 · 1580702
2 parents 321a6ee + 1e8d8fa
commit 1580702
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/dbus-crossroads/src/ifacedesc.rs b/dbus-crossroads/src/ifacedesc.rs
@@ -116,7 +116,7 @@ impl Registry {
                     r += &format!(">\n{}    </property>\n",  x.annotations.introspect("      "));
                 }
             }
-            desc.annotations.introspect("    ");
+            r += &desc.annotations.introspect("    ");
             r += "  </interface>\n";
         };
         r

diff --git a/dbus-crossroads/src/test.rs b/dbus-crossroads/src/test.rs
@@ -114,6 +114,7 @@ const INTROSPECT: &str = r###"<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS O
       <arg name="new_value" type="b"/>
     </signal>
     <property name="Bar" type="y" access="readwrite"/>
+    <annotation name="com.example.SampleAnnotation" value="TestValue"/>
   </interface>
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">
@@ -163,6 +164,7 @@ fn introspect() {
         });
         b.signal::<(bool,), _>("Changed", ("new_value",));
         b.property("Bar").get(|_,_| Ok(0u8)).set(|_,_,_| Ok(None));
+        b.annotate("com.example.SampleAnnotation", "TestValue");
     });
     cr.insert("/com/example/sample_object0", &[token], ());
     cr.insert("/com/example/sample_object0/child_of_sample_object", &[], ());