From 132552ca4e97cccc6a0872af89b8edcf3efa38a9 Mon Sep 17 00:00:00 2001 From: Jens Georg Date: Mon, 20 Feb 2012 15:05:53 +0200 Subject: [PATCH] core: Get rid of ItemCreatorError --- src/rygel/rygel-item-creator.vala | 7 ++----- tests/rygel-item-creator-test.vala | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/rygel/rygel-item-creator.vala b/src/rygel/rygel-item-creator.vala index 879d2a9..38c7938 100644 --- a/src/rygel/rygel-item-creator.vala +++ b/src/rygel/rygel-item-creator.vala @@ -23,10 +23,6 @@ using GUPnP; using Gst; -private errordomain Rygel.ItemCreatorError { - PARSE -} - /** * CreateObject action implementation. */ @@ -143,7 +139,8 @@ internal class Rygel.ItemCreator: GLib.Object, Rygel.StateMachine { if (this.didl_item == null) { var message = _("No items in DIDL-Lite from client: '%s'"); - throw new ItemCreatorError.PARSE (message, this.elements); + throw new ContentDirectoryError.BAD_METADATA + (message, this.elements); } if (didl_item.id == null || didl_item.id != "") { diff --git a/tests/rygel-item-creator-test.vala b/tests/rygel-item-creator-test.vala index aa5ec0c..5fd5f0e 100644 --- a/tests/rygel-item-creator-test.vala +++ b/tests/rygel-item-creator-test.vala @@ -316,7 +316,7 @@ public class Rygel.HTTPItemCreatorTest : GLib.Object { // test empty DIDL item_node->unlink (); didl_node->set_content (" "); - this.test_didl_parsing_step (xml, 701); + this.test_didl_parsing_step (xml, bad_metadata.code); // test item node with missing restricted attribute var tmp = item_node->copy (1); -- 2.7.4