diff options
| author | Marco Pesenti Gritti <marco@marcopg.org> | 2008-12-18 20:01:54 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@marcopg.org> | 2008-12-18 20:01:54 (GMT) |
| commit | 347cc9413b2021ddc54911d02aa1a8f9eb90f0cf (patch) | |
| tree | 6f985200d33f5c8e55f8f57d1f3eeedf62e399cb /src/sugar/gsm-client-xsmp.c | |
| parent | 5b57e1a6cd1ea327ac79667b4a3c06e6985f1d33 (diff) | |
| parent | 2937a09ead08858a6bb4176ecafb4c1bf7dff735 (diff) | |
Merge branch 'master' of git://git.sugarlabs.org/sugar-toolkit/mainline
Diffstat (limited to 'src/sugar/gsm-client-xsmp.c')
| -rw-r--r-- | src/sugar/gsm-client-xsmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sugar/gsm-client-xsmp.c b/src/sugar/gsm-client-xsmp.c index dcacc6f..04c7de4 100644 --- a/src/sugar/gsm-client-xsmp.c +++ b/src/sugar/gsm-client-xsmp.c @@ -110,7 +110,7 @@ gsm_client_xsmp_new (IceConn ice_conn) client_iochannel_watch, xsmp); g_io_channel_unref (channel); - xsmp->protocol_timeout = g_timeout_add (5000, client_protocol_timeout, xsmp); + xsmp->protocol_timeout = g_timeout_add_seconds (5, client_protocol_timeout, xsmp); set_description (xsmp); g_debug ("New client '%s'", xsmp->description); |