[rygel] media-export: Fix deprecation warnings with libgee



commit 3dce37df5e7d58077dff7ac14f47afaf2f0d150a
Author: Jens Georg <mail jensge org>
Date:   Mon Aug 2 21:07:43 2010 +0300

    media-export: Fix deprecation warnings with libgee

 .../media-export/rygel-media-export-harvester.vala |    6 +++---
 .../rygel-media-export-recursive-file-monitor.vala |    2 +-
 2 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 134565e..d77d89f 100644
--- a/src/plugins/media-export/rygel-media-export-harvester.vala
+++ b/src/plugins/media-export/rygel-media-export-harvester.vala
@@ -81,10 +81,10 @@ internal class Rygel.MediaExport.Harvester : GLib.Object {
      * @param file file cancel the current run for
      */
     public void cancel (File file) {
-        if (this.tasks.contains (file)) {
+        if (this.tasks.has_key (file)) {
             var task = this.tasks[file];
             task.completed.disconnect (this.on_file_harvested);
-            this.tasks.remove (file);
+            this.tasks.unset (file);
             task.cancellable.cancel ();
         }
     }
@@ -100,7 +100,7 @@ internal class Rygel.MediaExport.Harvester : GLib.Object {
         var file = task.origin;
         message (_("'%s' harvested"), file.get_uri ());
 
-        this.tasks.remove (file);
+        this.tasks.unset (file);
     }
 
     /**
diff --git a/src/plugins/media-export/rygel-media-export-recursive-file-monitor.vala b/src/plugins/media-export/rygel-media-export-recursive-file-monitor.vala
index 28d290a..27f6b0f 100644
--- a/src/plugins/media-export/rygel-media-export-recursive-file-monitor.vala
+++ b/src/plugins/media-export/rygel-media-export-recursive-file-monitor.vala
@@ -46,7 +46,7 @@ public class Rygel.MediaExport.RecursiveFileMonitor : Object {
                 if (file_monitor != null) {
                     debug (_("Directory %s gone, removing watch"),
                            file.get_uri ());
-                    this.monitors.remove (file);
+                    this.monitors.unset (file);
                     file_monitor.cancel ();
                     file_monitor.changed.disconnect (this.on_monitor_changed);
                 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]