all: Adapt to upcoming changes in Vala 0.14

7 files changed, 25 insertions, 20 deletions

diff --git a/src/plugins/external/rygel-external-plugin-factory.vala b/src/plugins/external/rygel-external-plugin-factory.vala
index cceb77d4..88647540 100644
--- a/src/plugins/external/rygel-external-plugin-factory.vala
+++ b/src/plugins/external/rygel-external-plugin-factory.vala
@@ -41,9 +41,9 @@ public class Rygel.External.PluginFactory {
     private const string SERVICE_PREFIX = "org.gnome.UPnP.MediaServer2.";
     private const string GRILO_UPNP_PREFIX = SERVICE_PREFIX + "grl_upnp";
 
-    DBusObject   dbus_obj;
-    PluginLoader loader;
-    IconFactory  icon_factory;
+    FreeDesktop.DBusObject dbus_obj;
+    PluginLoader           loader;
+    IconFactory            icon_factory;
 
     public PluginFactory (PluginLoader loader) throws IOError, DBusError {
         this.icon_factory = new IconFactory ();
@@ -84,10 +84,10 @@ public class Rygel.External.PluginFactory {
         this.dbus_obj.name_owner_changed.connect (this.name_owner_changed);
     }
 
-    private void name_owner_changed (DBusObject dbus_obj,
-                                     string     name,
-                                     string     old_owner,
-                                     string     new_owner) {
+    private void name_owner_changed (FreeDesktop.DBusObject dbus_obj,
+                                     string                 name,
+                                     string                 old_owner,
+                                     string                 new_owner) {
         var plugin = this.loader.get_plugin_by_name (name);
 
         if (plugin != null) {
diff --git a/src/plugins/media-export/rygel-media-export-harvester.vala b/src/plugins/media-export/rygel-media-export-harvester.vala
index 3ca53868..b86cd2a2 100644
--- a/src/plugins/media-export/rygel-media-export-harvester.vala
+++ b/src/plugins/media-export/rygel-media-export-harvester.vala
@@ -250,7 +250,7 @@ internal class Rygel.MediaExport.Harvester : GLib.Object {
         };
 
         var timeout = Timeout.add_seconds (FILE_CHANGE_DEFAULT_GRACE_PERIOD,
-                                           callback);
+                                           (owned) callback);
         this.extraction_grace_timers[file] = timeout;
     }
 }
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 1d1dea89..f0572c68 100644
--- a/src/plugins/media-export/rygel-media-export-media-cache.vala
+++ b/src/plugins/media-export/rygel-media-export-media-cache.vala
@@ -343,6 +343,7 @@ 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);
+
             if (parent == null || parent_id != parent.id) {
                 parent = new NullContainer ();
                 parent.id = parent_id;
@@ -751,13 +752,12 @@ public class Rygel.MediaExport.MediaCache : Object {
                 throw new MediaCacheError.UNSUPPORTED_SEARCH (message);
         }
 
-        if (&collate != null) {
-            if (use_collation) {
-                collate = "COLLATE CASEFOLD";
-            } else {
-                collate = "";
-            }
+        if (use_collation) {
+            collate = "COLLATE CASEFOLD";
+        } else {
+            collate = "";
         }
+
         return column;
     }
 
diff --git a/src/plugins/media-export/rygel-media-export-root-container.vala b/src/plugins/media-export/rygel-media-export-root-container.vala
index c5b9efc0..b2c80e55 100644
--- a/src/plugins/media-export/rygel-media-export-root-container.vala
+++ b/src/plugins/media-export/rygel-media-export-root-container.vala
@@ -282,6 +282,8 @@ public class Rygel.MediaExport.RootContainer : Rygel.MediaExport.DBContainer {
         RelationalExpression virtual_expression = null;
         QueryContainer query_container;
 
+        container = null;
+
         if (!(expression is LogicalExpression)) {
             return false;
         }
diff --git a/src/plugins/mediathek/rygel-mediathek-video-item-factory.vala b/src/plugins/mediathek/rygel-mediathek-video-item-factory.vala
index 88d6ab67..5c89a64b 100644
--- a/src/plugins/mediathek/rygel-mediathek-video-item-factory.vala
+++ b/src/plugins/mediathek/rygel-mediathek-video-item-factory.vala
@@ -105,6 +105,7 @@ internal class Rygel.Mediathek.VideoItemFactory : Object {
                                         throws VideoItemError {
         var title_node = XMLUtils.get_element (item, "title");
         var group = XMLUtils.get_element (item, "group");
+        playlist_url = null;
 
         if (title_node == null) {
             throw new VideoItemError.XML_PARSE_ERROR ("No 'title' element");
diff --git a/src/plugins/mpris/rygel-mpris-plugin-factory.vala b/src/plugins/mpris/rygel-mpris-plugin-factory.vala
index 2a9ad6c5..3c0a5a3c 100644
--- a/src/plugins/mpris/rygel-mpris-plugin-factory.vala
+++ b/src/plugins/mpris/rygel-mpris-plugin-factory.vala
@@ -44,8 +44,8 @@ public class Rygel.MPRIS.PluginFactory {
     private const string SERVICE_PREFIX = "org.mpris.MediaPlayer2.";
     private const string MEDIA_PLAYER_PATH = "/org/mpris/MediaPlayer2";
 
-    DBusObject   dbus_obj;
-    PluginLoader loader;
+    FreeDesktop.DBusObject dbus_obj;
+    PluginLoader           loader;
 
     public PluginFactory (PluginLoader loader) throws IOError {
         this.dbus_obj = Bus.get_proxy_sync
@@ -84,10 +84,10 @@ public class Rygel.MPRIS.PluginFactory {
         this.dbus_obj.name_owner_changed.connect (this.name_owner_changed);
     }
 
-    private void name_owner_changed (DBusObject dbus_obj,
-                                     string     name,
-                                     string     old_owner,
-                                     string     new_owner) {
+    private void name_owner_changed (FreeDesktop.DBusObject dbus_obj,
+                                     string                 name,
+                                     string                 old_owner,
+                                     string                 new_owner) {
         var plugin = this.loader.get_plugin_by_name (name);
 
         if (plugin != null) {
diff --git a/src/plugins/tracker/rygel-tracker-search-container.vala b/src/plugins/tracker/rygel-tracker-search-container.vala
index 7c6c0860..9017fe8f 100644
--- a/src/plugins/tracker/rygel-tracker-search-container.vala
+++ b/src/plugins/tracker/rygel-tracker-search-container.vala
@@ -182,6 +182,8 @@ public class Rygel.Tracker.SearchContainer : SimpleContainer {
 
             return tokens[1];
         } else {
+            parent_id = null;
+
             return null;
         }
     }