From 7917bdb0a773b7f931307a2c3f61fff04a5562d6 Mon Sep 17 00:00:00 2001 From: mardy Date: Mon, 4 Feb 2008 21:15:59 +0000 Subject: [PATCH] Workaround connectivity problems in Scratchbox. Fixes: #2098. git-svn-id: svn+ssh://garage/var/lib/gforge/svnroot/maemo-mapper/trunk@153 6c538b50-5814-0410-93ad-8bdf4c0149d1 --- src/main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main.c b/src/main.c index da13166..df73b24 100644 --- a/src/main.c +++ b/src/main.c @@ -88,7 +88,7 @@ conic_conn_event(ConIcConnection *connection, ConIcConnectionEvent *event) status = con_ic_connection_event_get_status(event); - if((_conic_is_connected = (status == CON_IC_CONNECTION_ERROR_NONE))) + if((_conic_is_connected = (status == CON_IC_STATUS_CONNECTED))) { /* We're connected. */ _conic_conn_failed = FALSE; @@ -116,7 +116,7 @@ conic_recommend_connected() { printf("%s()\n", __PRETTY_FUNCTION__); -#ifndef DEBUG +#ifdef __arm__ g_mutex_lock(_conic_connection_mutex); if(!_conic_is_connecting) { @@ -135,7 +135,7 @@ conic_ensure_connected() { printf("%s()\n", __PRETTY_FUNCTION__); -#ifndef DEBUG +#ifdef __arm__ while(_window && !_conic_is_connected) { g_mutex_lock(_conic_connection_mutex); @@ -150,6 +150,8 @@ conic_ensure_connected() g_cond_wait(_conic_connection_cond, _conic_connection_mutex); g_mutex_unlock(_conic_connection_mutex); } +#else + _conic_is_connected = TRUE; #endif vprintf("%s(): return %d\n", __PRETTY_FUNCTION__, -- 2.45.0