[rygel] media-export: fix compiler warning
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] media-export: fix compiler warning
- Date: Tue, 19 Jul 2011 20:48:49 +0000 (UTC)
commit 09bf4ec0fc9cdf56844cc961efc1c91b0459b730
Author: Thijs Vermeir <thijsvermeir gmail com>
Date: Tue Jul 19 22:48:01 2011 +0200
media-export: fix compiler warning
unreachable catch clause detected
https://bugzilla.gnome.org/show_bug.cgi?id=654833
.../rygel-media-export-media-cache.vala | 40 ++++++++-----------
1 files changed, 17 insertions(+), 23 deletions(-)
---
diff --git a/src/plugins/media-export/rygel-media-export-media-cache.vala b/src/plugins/media-export/rygel-media-export-media-cache.vala
index 1c19560..1d1dea8 100644
--- a/src/plugins/media-export/rygel-media-export-media-cache.vala
+++ b/src/plugins/media-export/rygel-media-export-media-cache.vala
@@ -343,30 +343,24 @@ public class Rygel.MediaExport.MediaCache : Object {
Database.RowCallback callback = (statement) => {
var child_id = statement.column_text (DetailColumn.ID);
var parent_id = statement.column_text (DetailColumn.PARENT);
- try {
- if (parent == null || parent_id != parent.id) {
- parent = new NullContainer ();
- parent.id = parent_id;
- }
-
- if (parent != null) {
- children.add (get_object_from_statement (parent,
- child_id,
- statement));
- children.last ().parent_ref = parent;
- } else {
- warning ("Inconsistent database: item %s " +
- "has no parent %s",
- child_id,
- parent_id);
- }
-
- return true;
- } catch (DatabaseError error) {
- warning ("Failed to get parent item: %s", error.message);
+ if (parent == null || parent_id != parent.id) {
+ parent = new NullContainer ();
+ parent.id = parent_id;
+ }
- return false;
+ if (parent != null) {
+ children.add (get_object_from_statement (parent,
+ child_id,
+ statement));
+ children.last ().parent_ref = parent;
+ } else {
+ warning ("Inconsistent database: item %s " +
+ "has no parent %s",
+ child_id,
+ parent_id);
}
+
+ return true;
};
var sql = this.sql.make (SQLString.GET_OBJECTS_BY_FILTER);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]