summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Georg <mail@jensge.org>2012-02-20 15:05:53 +0200
committerJens Georg <mail@jensge.org>2012-02-21 15:41:44 +0200
commit132552ca4e97cccc6a0872af89b8edcf3efa38a9 (patch)
treeec91c80c092ab9c35b6d26b9cda5d312d594f78b
parent61bf0158ce25306d65fe32f4dd9d6f016e69ddca (diff)
downloadrygel-132552ca4e97cccc6a0872af89b8edcf3efa38a9.tar.gz
core: Get rid of ItemCreatorError
-rw-r--r--src/rygel/rygel-item-creator.vala7
-rw-r--r--tests/rygel-item-creator-test.vala2
2 files changed, 3 insertions, 6 deletions
diff --git a/src/rygel/rygel-item-creator.vala b/src/rygel/rygel-item-creator.vala
index 879d2a9a..38c79382 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 aa5ec0cf..5fd5f0eb 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);