Network Menu

Merge lp:~unity-api-team/indicator-network/increase-dbus-timeouts into lp:indicator-network/14.09

  1. increase-dbus-timeouts
  2. Merge into trunk.14.09
Proposed by Antti Kaijanmäki
Status: Merged
Approved by: Antti Kaijanmäki
Approved revision: 459
Merged at revision: 461
Proposed branch: lp:~unity-api-team/indicator-network/increase-dbus-timeouts
Merge into: lp:indicator-network/14.09
Diff against target: 204 lines (+21/-21)
4 files modified
src/connectivity-cpp/dbus-cpp/services/nm.h (+6/-6)
src/connectivity-cpp/dbus-cpp/services/urfkill.h (+3/-3)
src/dbus-cpp/services/connectivity.h (+1/-1)
src/dbus-cpp/services/ofono.h (+11/-11)
To merge this branch: bzr merge lp:~unity-api-team/indicator-network/increase-dbus-timeouts
Reviewer Review Type Date Requested Status
Antti Kaijanmäki (community) Approve
Review via email: mp+240096@code.launchpad.net

Commit message

Increase the default timeouts to match industry standards.

To post a comment you must log in.
Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

approved in https://code.launchpad.net/~unity-api-team/indicator-network/increase-dbus-timeouts/+merge/239505

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/connectivity-cpp/dbus-cpp/services/nm.h'
2--- src/connectivity-cpp/dbus-cpp/services/nm.h 2014-10-09 11:15:16 +0000
3+++ src/connectivity-cpp/dbus-cpp/services/nm.h 2014-10-30 10:51:10 +0000
4@@ -442,7 +442,7 @@
5
6 static std::chrono::milliseconds default_timeout()
7 {
8- return std::chrono::seconds{1};
9+ return std::chrono::seconds{30};
10 }
11 };
12 };
13@@ -508,7 +508,7 @@
14
15 static std::chrono::milliseconds default_timeout()
16 {
17- return std::chrono::seconds{1};
18+ return std::chrono::seconds{30};
19 }
20 };
21 };
22@@ -655,7 +655,7 @@
23
24 static std::chrono::milliseconds default_timeout()
25 {
26- return std::chrono::seconds{1};
27+ return std::chrono::seconds{30};
28 }
29 };
30 };
31@@ -752,7 +752,7 @@
32
33 static std::chrono::milliseconds default_timeout()
34 {
35- return std::chrono::seconds{1};
36+ return std::chrono::seconds{30};
37 }
38 };
39
40@@ -769,7 +769,7 @@
41
42 static std::chrono::milliseconds default_timeout()
43 {
44- return std::chrono::seconds{1};
45+ return std::chrono::seconds{30};
46 }
47 };
48
49@@ -786,7 +786,7 @@
50
51 static std::chrono::milliseconds default_timeout()
52 {
53- return std::chrono::seconds{1};
54+ return std::chrono::seconds{30};
55 }
56 };
57
58
59=== modified file 'src/connectivity-cpp/dbus-cpp/services/urfkill.h'
60--- src/connectivity-cpp/dbus-cpp/services/urfkill.h 2014-09-26 12:31:22 +0000
61+++ src/connectivity-cpp/dbus-cpp/services/urfkill.h 2014-10-30 10:51:10 +0000
62@@ -162,7 +162,7 @@
63
64 static std::chrono::milliseconds default_timeout()
65 {
66- return std::chrono::seconds{15};
67+ return std::chrono::seconds{30};
68 }
69 };
70
71@@ -179,7 +179,7 @@
72
73 static std::chrono::milliseconds default_timeout()
74 {
75- return std::chrono::seconds{15};
76+ return std::chrono::seconds{30};
77 }
78 };
79
80@@ -196,7 +196,7 @@
81
82 static std::chrono::milliseconds default_timeout()
83 {
84- return std::chrono::seconds{5};
85+ return std::chrono::seconds{30};
86 }
87 };
88 };
89
90=== modified file 'src/dbus-cpp/services/connectivity.h'
91--- src/dbus-cpp/services/connectivity.h 2014-08-07 21:14:42 +0000
92+++ src/dbus-cpp/services/connectivity.h 2014-10-30 10:51:10 +0000
93@@ -126,7 +126,7 @@
94
95 static std::chrono::milliseconds default_timeout()
96 {
97- return std::chrono::seconds{1};
98+ return std::chrono::seconds{30};
99 }
100 };
101 };
102
103=== modified file 'src/dbus-cpp/services/ofono.h'
104--- src/dbus-cpp/services/ofono.h 2014-10-09 10:58:30 +0000
105+++ src/dbus-cpp/services/ofono.h 2014-10-30 10:51:10 +0000
106@@ -61,7 +61,7 @@
107
108 static std::chrono::milliseconds default_timeout()
109 {
110- return std::chrono::seconds{1};
111+ return std::chrono::seconds{30};
112 }
113 };
114 };
115@@ -277,7 +277,7 @@
116
117 static std::chrono::milliseconds default_timeout()
118 {
119- return std::chrono::seconds{1};
120+ return std::chrono::seconds{30};
121 }
122 };
123 struct SetProperty
124@@ -293,7 +293,7 @@
125
126 static std::chrono::milliseconds default_timeout()
127 {
128- return std::chrono::seconds{1};
129+ return std::chrono::seconds{30};
130 }
131 };
132
133@@ -310,7 +310,7 @@
134
135 static std::chrono::milliseconds default_timeout()
136 {
137- return std::chrono::seconds{1};
138+ return std::chrono::seconds{30};
139 }
140 };
141
142@@ -327,7 +327,7 @@
143
144 static std::chrono::milliseconds default_timeout()
145 {
146- return std::chrono::seconds{1};
147+ return std::chrono::seconds{30};
148 }
149 };
150
151@@ -344,7 +344,7 @@
152
153 static std::chrono::milliseconds default_timeout()
154 {
155- return std::chrono::seconds{1};
156+ return std::chrono::seconds{30};
157 }
158 };
159
160@@ -361,7 +361,7 @@
161
162 static std::chrono::milliseconds default_timeout()
163 {
164- return std::chrono::seconds{1};
165+ return std::chrono::seconds{30};
166 }
167 };
168
169@@ -378,7 +378,7 @@
170
171 static std::chrono::milliseconds default_timeout()
172 {
173- return std::chrono::seconds{1};
174+ return std::chrono::seconds{30};
175 }
176 };
177 };
178@@ -814,7 +814,7 @@
179
180 static std::chrono::milliseconds default_timeout()
181 {
182- return std::chrono::seconds{1};
183+ return std::chrono::seconds{30};
184 }
185 };
186 struct SetProperty
187@@ -830,7 +830,7 @@
188
189 static std::chrono::milliseconds default_timeout()
190 {
191- return std::chrono::seconds{1};
192+ return std::chrono::seconds{30};
193 }
194 };
195 };
196@@ -1204,7 +1204,7 @@
197
198 static std::chrono::milliseconds default_timeout()
199 {
200- return std::chrono::seconds{1};
201+ return std::chrono::seconds{30};
202 }
203 };
204 };

Subscribers

People subscribed via source and target branches