[pulseaudio-commits] 2 commits - src/modules

[Arun Raghavan]

 src/modules/module-rygel-media-server.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 441bd54bdcacba5a341bfbe9b52ef33f55cc2caf
Author: Jens Georg <mail at jensge.org>
Date:   Fri Jul 22 18:25:57 2011 +0200

    rygel: Fix introspection XML for MediaItem2

diff --git a/src/modules/module-rygel-media-server.c b/src/modules/module-rygel-media-server.c
index d0d272c..1856835 100644
--- a/src/modules/module-rygel-media-server.c
+++ b/src/modules/module-rygel-media-server.c
@@ -133,6 +133,7 @@ PA_MODULE_USAGE("display_name=<UPnP Media Server name>");
     " <interface name=\"org.gnome.UPnP.MediaItem2\">"                   \
     "  <property name=\"URLs\" type=\"as\" access=\"read\"/>"           \
     "  <property name=\"MIMEType\" type=\"s\" access=\"read\"/>"        \
+    " </interface>"                                                     \
     " <interface name=\"org.gnome.UPnP.MediaObject2\">"                 \
     "  <property name=\"Parent\" type=\"s\" access=\"read\"/>"          \
     "  <property name=\"Type\" type=\"s\" access=\"read\"/>"            \

commit ed061a3e7338d1d67b24dc83efa187256b9e2b32
Author: Jens Georg <mail at jensge.org>
Date:   Fri Jul 22 18:00:13 2011 +0200

    rygel: Properly close {sv} iters for GetAll
    
    This fixes browsing the PA Sink and Source container.

diff --git a/src/modules/module-rygel-media-server.c b/src/modules/module-rygel-media-server.c
index 2293074..d0d272c 100644
--- a/src/modules/module-rygel-media-server.c
+++ b/src/modules/module-rygel-media-server.c
@@ -909,6 +909,7 @@ static DBusHandlerResult sinks_and_sources_handler(DBusConnection *c, DBusMessag
             dbus_message_iter_init_append(r, &iter);
             pa_assert_se(dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &sub));
             append_sink_or_source_container_mediaobject2_properties(r, &sub, path);
+            pa_assert_se(dbus_message_iter_close_container(&iter, &sub));
 
         } else if (dbus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) {
             pa_strbuf *sb;
@@ -979,6 +980,7 @@ static DBusHandlerResult sinks_and_sources_handler(DBusConnection *c, DBusMessag
 
             pa_assert_se(dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &sub));
             append_sink_or_source_item_mediaobject2_properties(r, &sub, path, sink, source);
+            pa_assert_se(dbus_message_iter_close_container(&iter, &sub));
 
         } else if (message_is_property_get(m, "org.gnome.UPnP.MediaItem2", "MIMEType")) {
             pa_assert_se(r = dbus_message_new_method_return(m));