Merge lp:~thomas-voss/dbus-cpp/fix-1361642 into lp:dbus-cpp

Proposed by Thomas Voß
Status: Merged
Merged at revision: 84
Proposed branch: lp:~thomas-voss/dbus-cpp/fix-1361642
Merge into: lp:dbus-cpp
Diff against target: 29 lines (+3/-3)
1 file modified
include/core/dbus/interfaces/properties.h (+3/-3)
To merge this branch: bzr merge lp:~thomas-voss/dbus-cpp/fix-1361642
Reviewer Review Type Date Requested Status
Antti Kaijanmäki (community) Needs Fixing
Jussi Pakkanen (community) Needs Fixing
PS Jenkins bot continuous-integration Approve
Review via email: mp+236820@code.launchpad.net

Commit message

Relax timeout on org.freedesktop.Properties::{GetAll, Get, Set}.

Description of the change

Relax timeout on org.freedesktop.Properties::{GetAll, Get, Set}.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Jussi Pakkanen (jpakkane) wrote :

Instead of a magic number replicated in three different places, could you instead put it in a named constant?

review: Needs Fixing
Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

Let's fix the magic numbers later.

review: Approve
Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

Please, update the timeouts to 30 seconds, as that is what both qdbus and gdbus use by default.

Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

as agreed on irc, the timeouts should be increased to 30 secs to follow gdbus and qdbus.

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'include/core/dbus/interfaces/properties.h'
--- include/core/dbus/interfaces/properties.h 2014-01-20 21:22:02 +0000
+++ include/core/dbus/interfaces/properties.h 2014-10-02 06:29:29 +0000
@@ -45,7 +45,7 @@
45 };45 };
46 inline static const std::chrono::milliseconds default_timeout()46 inline static const std::chrono::milliseconds default_timeout()
47 {47 {
48 return std::chrono::seconds{1};48 return std::chrono::seconds{10};
49 }49 }
50 };50 };
5151
@@ -59,7 +59,7 @@
59 };59 };
60 inline static const std::chrono::milliseconds default_timeout()60 inline static const std::chrono::milliseconds default_timeout()
61 {61 {
62 return std::chrono::seconds{1};62 return std::chrono::seconds{10};
63 }63 }
64 };64 };
6565
@@ -73,7 +73,7 @@
73 };73 };
74 inline static const std::chrono::milliseconds default_timeout()74 inline static const std::chrono::milliseconds default_timeout()
75 {75 {
76 return std::chrono::seconds{1};76 return std::chrono::seconds{10};
77 }77 }
78 };78 };
7979

Subscribers

People subscribed via source and target branches