All: Get rid of most deprecations

9 files changed, 16 insertions, 16 deletions

diff --git a/src/librygel-server/rygel-content-directory.vala b/src/librygel-server/rygel-content-directory.vala
index 99f2b9c6..7c5c3ee1 100644
--- a/src/librygel-server/rygel-content-directory.vala
+++ b/src/librygel-server/rygel-content-directory.vala
@@ -276,7 +276,7 @@ public class Rygel.ContentDirectory: Service {
                             typeof (int64),
                             import.bytes_total);
 
-            action.return ();
+            action.return_success ();
         } catch (Error error) {
             action.return_error (error.code, error.message);
         }
@@ -295,7 +295,7 @@ public class Rygel.ContentDirectory: Service {
             var import = find_import_for_action (action);
             import.cancellable.cancel ();
 
-            action.return ();
+            action.return_success ();
         } catch (Error error) {
             action.return_error (error.code, error.message);
         }
@@ -313,7 +313,7 @@ public class Rygel.ContentDirectory: Service {
         /* Set action return arguments */
         action.set ("Id", typeof (uint32), this.system_update_id);
 
-        action.return ();
+        action.return_success ();
     }
 
     /* Query GetSystemUpdateID */
@@ -350,7 +350,7 @@ public class Rygel.ContentDirectory: Service {
         /* Set action return arguments */
         action.set ("SearchCaps", typeof (string), plugin.search_caps);
 
-        action.return ();
+        action.return_success ();
     }
 
     /* Query SearchCapabilities */
@@ -377,7 +377,7 @@ public class Rygel.ContentDirectory: Service {
         /* Set action return arguments */
         action.set ("SortCaps", typeof (string), MediaObjects.SORT_CAPS);
 
-        action.return ();
+        action.return_success ();
     }
 
     /* Query SortCapabilities */
@@ -402,7 +402,7 @@ public class Rygel.ContentDirectory: Service {
         /* Set action return arguments */
         action.set ("FeatureList", typeof (string), this.feature_list);
 
-        action.return ();
+        action.return_success ();
     }
 
     /* Query FeatureList */
@@ -693,7 +693,7 @@ public class Rygel.ContentDirectory: Service {
     private void get_service_reset_token_cb (Service       content_dir,
                                              ServiceAction action) {
         action.set ("ResetToken", typeof (string), this.service_reset_token);
-        action.return ();
+        action.return_success ();
     }
 
     private void query_service_reset_token (Service        content_dir,
@@ -793,6 +793,6 @@ public class Rygel.ContentDirectory: Service {
         }
 
         action.set ("SupportedUploadProfiles", typeof (string), builder.str);
-        action.return ();
+        action.return_success ();
     }
 }
diff --git a/src/librygel-server/rygel-import-resource.vala b/src/librygel-server/rygel-import-resource.vala
index 78f9a6d7..a0c6ee6b 100644
--- a/src/librygel-server/rygel-import-resource.vala
+++ b/src/librygel-server/rygel-import-resource.vala
@@ -207,7 +207,7 @@ internal class Rygel.ImportResource : GLib.Object, Rygel.StateMachine {
         this.bytes_total = message.response_headers.get_content_length ();
 
         if (message.status_code >= 200 && message.status_code <= 299) {
-            this.action.return ();
+            this.action.return_success ();
         } else {
             this.handle_transfer_error (message);
         }
diff --git a/src/librygel-server/rygel-item-destroyer.vala b/src/librygel-server/rygel-item-destroyer.vala
index be43da3f..8244955c 100644
--- a/src/librygel-server/rygel-item-destroyer.vala
+++ b/src/librygel-server/rygel-item-destroyer.vala
@@ -55,7 +55,7 @@ internal class Rygel.ItemDestroyer: GLib.Object, Rygel.StateMachine {
 
             yield this.remove_object ();
 
-            this.action.return ();
+            this.action.return_success ();
 
             debug (_("Successfully destroyed object “%s”"), this.object_id);
         } catch (Error error) {
diff --git a/src/librygel-server/rygel-item-updater.vala b/src/librygel-server/rygel-item-updater.vala
index 2e0c3c88..6c8f1f58 100644
--- a/src/librygel-server/rygel-item-updater.vala
+++ b/src/librygel-server/rygel-item-updater.vala
@@ -76,7 +76,7 @@ internal class Rygel.ItemUpdater: GLib.Object, Rygel.StateMachine {
 
             yield this.update_object ();
 
-            this.action.return ();
+            this.action.return_success ();
 
             debug (_("Successfully updated object “%s”"), this.object_id);
         } catch (Error error) {
diff --git a/src/librygel-server/rygel-media-query-action.vala b/src/librygel-server/rygel-media-query-action.vala
index e3a0edec..af4c2083 100644
--- a/src/librygel-server/rygel-media-query-action.vala
+++ b/src/librygel-server/rygel-media-query-action.vala
@@ -228,7 +228,7 @@ internal abstract class Rygel.MediaQueryAction : GLib.Object, StateMachine {
                              typeof (uint),
                              this.update_id);
 
-        this.action.return ();
+        this.action.return_success ();
         this.completed ();
     }
 
diff --git a/src/librygel-server/rygel-media-receiver-registrar.vala b/src/librygel-server/rygel-media-receiver-registrar.vala
index 790c656c..aeab1d43 100644
--- a/src/librygel-server/rygel-media-receiver-registrar.vala
+++ b/src/librygel-server/rygel-media-receiver-registrar.vala
@@ -65,7 +65,7 @@ internal class Rygel.MediaReceiverRegistrar: Service {
 
         action.set ("Result", typeof (int), 1);
 
-        action.return ();
+        action.return_success ();
     }
 
     private void query_state (Service        registrar,
diff --git a/src/librygel-server/rygel-object-creator.vala b/src/librygel-server/rygel-object-creator.vala
index 86dda358..e7ddd982 100644
--- a/src/librygel-server/rygel-object-creator.vala
+++ b/src/librygel-server/rygel-object-creator.vala
@@ -445,7 +445,7 @@ internal class Rygel.ObjectCreator: GLib.Object, Rygel.StateMachine {
         this.action.set ("ObjectID", typeof (string), this.object.id,
                          "Result", typeof (string), didl);
 
-        this.action.return ();
+        this.action.return_success ();
         this.completed ();
     }
 
diff --git a/src/librygel-server/rygel-reference-creator.vala b/src/librygel-server/rygel-reference-creator.vala
index 4fc7a487..d328c586 100644
--- a/src/librygel-server/rygel-reference-creator.vala
+++ b/src/librygel-server/rygel-reference-creator.vala
@@ -74,7 +74,7 @@ internal class Rygel.ReferenceCreator : GLib.Object, Rygel.StateMachine {
                                                         this.cancellable);
 
             this.action.set ("NewID", typeof (string), new_id);
-            this.action.return ();
+            this.action.return_success ();
             this.completed ();
         } catch (Error error) {
             if (error is ContentDirectoryError) {
diff --git a/src/librygel-server/rygel-xbox-hacks.vala b/src/librygel-server/rygel-xbox-hacks.vala
index 26aae8b2..f42f2b48 100644
--- a/src/librygel-server/rygel-xbox-hacks.vala
+++ b/src/librygel-server/rygel-xbox-hacks.vala
@@ -88,7 +88,7 @@ internal class Rygel.XBoxHacks : ClientHacks {
         var desc_path = template_path.replace ("v1.xml", "xbox.xml");
         description_file.save (desc_path);
 
-        var server_path = "/" + device.get_relative_location ();
+        var server_path = "/" + device.get_description_document_name ();
         device.context.host_path_for_agent (desc_path,
                                             server_path,
                                             this.agent_regex);