From: btb <bradleyb@u.washington.edu>
Date: Thu, 29 May 2008 04:12:44 +0000 (+0000)
Subject: previous commit probably broke workaround of r153, fixing
X-Git-Tag: fremantle/3.0+alpha0~148
X-Git-Url: http://git.itanic.dy.fi/?p=maemo-mapper;a=commitdiff_plain;h=2b5a620c96ea39fa19727594f6af9227a128d6ab

previous commit probably broke workaround of r153, fixing


git-svn-id: svn+ssh://garage/var/lib/gforge/svnroot/maemo-mapper/trunk@188 6c538b50-5814-0410-93ad-8bdf4c0149d1
---

diff --git a/src/main.c b/src/main.c
index 55d383c..9e44dbe 100644
--- a/src/main.c
+++ b/src/main.c
@@ -126,7 +126,7 @@ conic_recommend_connected()
 {
     printf("%s()\n", __PRETTY_FUNCTION__);
 
-#ifdef CONIC
+#if defined(__arm__) && defined(CONIC)
     g_mutex_lock(_conic_connection_mutex);
     if(!_conic_is_connecting)
     {
@@ -145,7 +145,7 @@ conic_ensure_connected()
 {
     printf("%s()\n", __PRETTY_FUNCTION__);
 
-#ifdef CONIC
+#if defined(__arm__) && defined(CONIC)
     while(_window && !_conic_is_connected)
     {   
         g_mutex_lock(_conic_connection_mutex);