kuri pushed a commit to branch master.
commit 6aab5a96900c27c759dccedb2738c92ae1eb54ba
Author: Guillaume Friloux <[email protected]>
Date: Wed Jul 17 16:20:45 2013 +0200
This patch is a port of commit 4b885b9b24de9e188c861422d7d2738b49359d22.
It fixes ecore_con_server_timeout_set().
---
ChangeLog | 4 ++++
NEWS | 1 +
src/lib/ecore_con/ecore_con.c | 2 ++
3 files changed, 7 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 136b1d0..381f666 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-17 Guillaume Friloux
+ * Fix ecore_con_server_timeout_set(). It was changing the
+ timeout value, but not the timer.
+
2013-07-17 Mike Blumenkrantz
* Ecore-X: add error messages for xlib, ECORE_X_ATOM_XDND_DIRECTSAVE0
diff --git a/NEWS b/NEWS
index 597f86d..18b22d5 100644
--- a/NEWS
+++ b/NEWS
@@ -331,6 +331,7 @@ Fixes:
ecore_con_client_uptime_get() is working.
- Fix srv->start_time (initialization missing). So now
ecore_con_server_uptime_get() is working for plain TCP connections.
+ - Fix ecore_con_server_timeout_set(). It will now reset the timer.
* Ecore_Evas:
- Fix build of Ecore_Evas_Extn on Solaris.
- Fix many memory problems with ecore_evas_extn.
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 5265896..6b90306 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -555,6 +555,8 @@ ecore_con_server_timeout_set(Ecore_Con_Server *svr,
svr->client_disconnect_time = timeout;
else
svr->disconnect_time = timeout;
+
+ _ecore_con_server_timer_update(svr);
}
EAPI double
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
