[rygel] media-export: Clarify which queue we want
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [rygel] media-export: Clarify which queue we want
- Date: Mon, 21 Sep 2009 11:54:48 +0000 (UTC)
commit bcd8bcd201831279cd593cbfaa1bb0f6c529bd47
Author: Jens Georg <mail jensge org>
Date: Thu Sep 17 10:47:04 2009 +0200
media-export: Clarify which queue we want
Seems libgee now features a queue as well; this fixes compilation error due
to name clash
.../media-export/rygel-media-export-harvester.vala | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/plugins/media-export/rygel-media-export-harvester.vala b/src/plugins/media-export/rygel-media-export-harvester.vala
index cd82669..985c829 100644
--- a/src/plugins/media-export/rygel-media-export-harvester.vala
+++ b/src/plugins/media-export/rygel-media-export-harvester.vala
@@ -56,8 +56,8 @@ internal class Rygel.FileQueueEntry {
public class Rygel.MediaExportHarvester : GLib.Object {
private MetadataExtractor extractor;
private MediaDB media_db;
- private Queue<MediaContainer> containers;
- private Queue<FileQueueEntry?> files;
+ private GLib.Queue<MediaContainer> containers;
+ private GLib.Queue<FileQueueEntry?> files;
private File origin;
private MediaContainer parent;
private MediaExportRecursiveFileMonitor monitor;
@@ -71,8 +71,8 @@ public class Rygel.MediaExportHarvester : GLib.Object {
this.media_db = media_db;
this.extractor.extraction_done.connect (on_extracted_cb);
this.extractor.error.connect (on_extractor_error_cb);
- this.files = new Queue<FileQueueEntry?> ();
- this.containers = new Queue<DummyContainer> ();
+ this.files = new GLib.Queue<FileQueueEntry?> ();
+ this.containers = new GLib.Queue<DummyContainer> ();
this.origin = null;
this.monitor = monitor;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]