[rygel/wip/basic-management: 94/95] core: return false in BasicManagement finish_iteration() source func
- From: Jussi Kukkonen <jussik src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel/wip/basic-management: 94/95] core: return false in BasicManagement finish_iteration() source func
- Date: Fri, 11 Oct 2013 13:02:12 +0000 (UTC)
commit 390ead0c580c4876f865114f6635d5efaa3d823d
Author: Jussi Kukkonen <jussi kukkonen intel com>
Date: Tue Oct 8 15:05:16 2013 +0300
core: return false in BasicManagement finish_iteration() source func
.../rygel-basic-management-test-nslookup.vala | 4 ++--
.../rygel-basic-management-test-ping.vala | 4 ++--
src/librygel-core/rygel-basic-management-test.vala | 4 +++-
3 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/src/librygel-core/rygel-basic-management-test-nslookup.vala
b/src/librygel-core/rygel-basic-management-test-nslookup.vala
index 855852f..f579c32 100644
--- a/src/librygel-core/rygel-basic-management-test-nslookup.vala
+++ b/src/librygel-core/rygel-basic-management-test-nslookup.vala
@@ -252,7 +252,7 @@ internal class Rygel.BasicManagementTestNSLookup : BasicManagementTest {
this.timer.start ();
}
- protected override void finish_iteration () {
+ protected override bool finish_iteration () {
switch (this.init_state) {
case InitState.SPAWN_FAILED:
/* quitting early */
@@ -278,7 +278,7 @@ internal class Rygel.BasicManagementTestNSLookup : BasicManagementTest {
break;
}
- base.finish_iteration ();
+ return base.finish_iteration ();
}
protected override void handle_error (string line) {
diff --git a/src/librygel-core/rygel-basic-management-test-ping.vala
b/src/librygel-core/rygel-basic-management-test-ping.vala
index 9639e76..4698a7e 100644
--- a/src/librygel-core/rygel-basic-management-test-ping.vala
+++ b/src/librygel-core/rygel-basic-management-test-ping.vala
@@ -217,13 +217,13 @@ internal class Rygel.BasicManagementTestPing : BasicManagementTest {
}
}
- protected override void finish_iteration () {
+ protected override bool finish_iteration () {
if (this.init_state == InitState.SPAWN_FAILED) {
this.status = Status.ERROR_INTERNAL;
this.additional_info = "Failed to spawn ping";
}
- base.finish_iteration ();
+ return base.finish_iteration ();
}
protected override void handle_error (string line) {
diff --git a/src/librygel-core/rygel-basic-management-test.vala
b/src/librygel-core/rygel-basic-management-test.vala
index 316a804..15020e4 100644
--- a/src/librygel-core/rygel-basic-management-test.vala
+++ b/src/librygel-core/rygel-basic-management-test.vala
@@ -93,7 +93,7 @@ internal abstract class Rygel.BasicManagementTest : Object {
protected virtual void handle_error (string line) {
warning ("%s stderr: %s", command[0], line);
}
- protected virtual void finish_iteration () {
+ protected virtual bool finish_iteration () {
this.current_iteration++;
/* No more iterations if
@@ -113,6 +113,8 @@ internal abstract class Rygel.BasicManagementTest : Object {
} else {
this.run_iteration ();
}
+
+ return false;
}
private void child_setup () {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]