Commit 654419be authored by Jeremy Bicha's avatar Jeremy Bicha

Revert "Add debian/patches/drop-default-value.patch from upstream"

This reverts commit aea3b61a.

This patch was included in 0.36.2
parent 48734996
From d7d65545555e149457fff1d689e21079bae3116a Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Thu, 19 Apr 2018 21:14:41 +0200
Subject: [PATCH] Drop default value of non-automatic property for newer vala
---
.../rygel-basic-management-test-nslookup.vala | 6 ++----
.../rygel-basic-management-test-ping.vala | 16 ++++------------
.../rygel-basic-management-test-traceroute.vala | 16 ++++------------
.../rygel-default-player-controller.vala | 6 ++----
4 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/src/librygel-core/rygel-basic-management-test-nslookup.vala b/src/librygel-core/rygel-basic-management-test-nslookup.vala
index b93c3d97..4265c559 100644
--- a/src/librygel-core/rygel-basic-management-test-nslookup.vala
+++ b/src/librygel-core/rygel-basic-management-test-nslookup.vala
@@ -154,7 +154,7 @@ internal class Rygel.BasicManagementTestNSLookup : BasicManagementTest {
public string host_name { construct; private get; default = ""; }
public string? name_server { construct; private get; default = null; }
- private uint _interval_time_out;
+ private uint _interval_time_out = DEFAULT_INTERVAL_TIMEOUT;
public uint interval_time_out {
construct {
this._interval_time_out = value;
@@ -164,10 +164,9 @@ internal class Rygel.BasicManagementTestNSLookup : BasicManagementTest {
private get {
return this._interval_time_out;
}
- default = DEFAULT_INTERVAL_TIMEOUT;
}
- private uint _repetitions;
+ private uint _repetitions = DEFAULT_REPETITIONS;
public uint repetitions {
construct {
this.iterations = 1;
@@ -180,7 +179,6 @@ internal class Rygel.BasicManagementTestNSLookup : BasicManagementTest {
private get {
return this._repetitions;
}
- default = DEFAULT_REPETITIONS;
}
private Result[] results;
diff --git a/src/librygel-core/rygel-basic-management-test-ping.vala b/src/librygel-core/rygel-basic-management-test-ping.vala
index a0f278d8..46d6ab93 100644
--- a/src/librygel-core/rygel-basic-management-test-ping.vala
+++ b/src/librygel-core/rygel-basic-management-test-ping.vala
@@ -67,7 +67,7 @@ internal class Rygel.BasicManagementTestPing : BasicManagementTest {
public string host { construct; get; default = ""; }
- private uint _repeat_count;
+ private uint _repeat_count = DEFAULT_REPEAT_COUNT;
public uint repeat_count {
construct {
this._repeat_count = value;
@@ -79,11 +79,9 @@ internal class Rygel.BasicManagementTestPing : BasicManagementTest {
get {
return this._repeat_count;
}
-
- default = DEFAULT_REPEAT_COUNT;
}
- private uint _data_block_size;
+ private uint _data_block_size = DEFAULT_DATA_BLOCK_SIZE;
public uint data_block_size {
construct {
this._data_block_size = value;
@@ -95,11 +93,9 @@ internal class Rygel.BasicManagementTestPing : BasicManagementTest {
get {
return this._data_block_size;
}
-
- default = DEFAULT_DATA_BLOCK_SIZE;
}
- private uint _dscp;
+ private uint _dscp = DEFAULT_DSCP;
public uint dscp {
construct {
this._dscp = value;
@@ -111,11 +107,9 @@ internal class Rygel.BasicManagementTestPing : BasicManagementTest {
get {
return this._dscp;
}
-
- default = DEFAULT_DSCP;
}
- private uint32 _interval_time_out;
+ private uint32 _interval_time_out = DEFAULT_REQUEST_INTERVAL_TIMEOUT;
public uint32 interval_time_out {
construct {
this._interval_time_out = value;
@@ -127,8 +121,6 @@ internal class Rygel.BasicManagementTestPing : BasicManagementTest {
get {
return _interval_time_out;
}
-
- default = DEFAULT_REQUEST_INTERVAL_TIMEOUT;
}
diff --git a/src/librygel-core/rygel-basic-management-test-traceroute.vala b/src/librygel-core/rygel-basic-management-test-traceroute.vala
index 9e0a6d15..4c700085 100644
--- a/src/librygel-core/rygel-basic-management-test-traceroute.vala
+++ b/src/librygel-core/rygel-basic-management-test-traceroute.vala
@@ -70,7 +70,7 @@ internal class Rygel.BasicManagementTestTraceroute : BasicManagementTest {
public string host { construct; get; default = ""; }
- private uint32 _wait_time_out;
+ private uint32 _wait_time_out = DEFAULT_TIMEOUT;
public uint32 wait_time_out {
construct {
this._wait_time_out = value;
@@ -82,11 +82,9 @@ internal class Rygel.BasicManagementTestTraceroute : BasicManagementTest {
get {
return this._wait_time_out;
}
-
- default = DEFAULT_TIMEOUT;
}
- private uint _data_block_size;
+ private uint _data_block_size = DEFAULT_DATA_BLOCK_SIZE;
public uint data_block_size {
construct {
this._data_block_size = value;
@@ -98,11 +96,9 @@ internal class Rygel.BasicManagementTestTraceroute : BasicManagementTest {
get {
return this._data_block_size;
}
-
- default = DEFAULT_DATA_BLOCK_SIZE;
}
- private uint _max_hop_count;
+ private uint _max_hop_count = DEFAULT_HOPS;
public uint max_hop_count {
construct {
this._max_hop_count = value;
@@ -114,11 +110,9 @@ internal class Rygel.BasicManagementTestTraceroute : BasicManagementTest {
get {
return this._max_hop_count;
}
-
- default = DEFAULT_HOPS;
}
- private uint _dscp;
+ private uint _dscp = DEFAULT_DSCP;
public uint dscp {
construct {
this._dscp = value;
@@ -130,8 +124,6 @@ internal class Rygel.BasicManagementTestTraceroute : BasicManagementTest {
get {
return this._dscp;
}
-
- default = DEFAULT_DSCP;
}
private Regex regex;
diff --git a/src/librygel-renderer/rygel-default-player-controller.vala b/src/librygel-renderer/rygel-default-player-controller.vala
index 933e820e..7e0c8ef9 100644
--- a/src/librygel-renderer/rygel-default-player-controller.vala
+++ b/src/librygel-renderer/rygel-default-player-controller.vala
@@ -70,7 +70,6 @@ internal class Rygel.DefaultPlayerController : Rygel.PlayerController, Object {
this.notify_property ("n-tracks");
}
}
- default = 0;
}
[CCode (notify = false)]
@@ -83,7 +82,6 @@ internal class Rygel.DefaultPlayerController : Rygel.PlayerController, Object {
this.notify_property ("track");
}
}
- default = 0;
}
public string uri { owned get; protected set; default = ""; }
@@ -218,8 +216,8 @@ internal class Rygel.DefaultPlayerController : Rygel.PlayerController, Object {
private MediaCollection next_collection;
// Private property variables
- private uint _n_tracks;
- private uint _track;
+ private uint _n_tracks = 0U;
+ private uint _track = 0U;
private string _playback_state = "NO_MEDIA_PRESENT";
private string _play_mode = "NORMAL";
--
2.18.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment