From: Kaj-Michael Lang <milang@onion.tal.org>
Date: Thu, 18 Oct 2007 22:59:31 +0000 (+0300)
Subject: Remove ifdefs. We now have simple stubs if no connection manager is used.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30699c54515b65f9a845e2eb5c741823b75520af;p=mapper

Remove ifdefs. We now have simple stubs if no connection manager is used.
---

diff --git a/src/map-download.c b/src/map-download.c
index 1476349..fa292fa 100644
--- a/src/map-download.c
+++ b/src/map-download.c
@@ -34,6 +34,7 @@
 #include "latlon.h"
 #include "gpx.h"
 #include "map-download.h"
+#include "iap.h"
 
 static guint _num_downloads=0;
 static guint _curr_download=0;
@@ -370,11 +371,7 @@ else {
 		/* removal automatically calls progress_update_info_free(). */
 		g_tree_steal(_downloading_tree, pui);
 		g_tree_insert(_pui_tree, pui, pui);
-#ifdef WITH_OSSO
 		if (iap_is_connected() && !_curl_sid)
-#else
-		if (!_curl_sid)
-#endif
 			_curl_sid = g_timeout_add(100,(GSourceFunc)map_download_timeout, NULL);
 		/* Don't do anything else. */
 		return FALSE;
@@ -409,9 +406,7 @@ map_initiate_download(guint tilex, guint tiley, guint zoom, gint retries)
 {
 ProgressUpdateInfo *pui;
 
-#ifdef WITH_OSSO
 iap_connect();
-#endif
 
 pui = g_slice_new(ProgressUpdateInfo);
 pui->tilex = tilex;
@@ -433,11 +428,7 @@ pui->dest_str = NULL;
 pui->file = NULL;
 
 g_tree_insert(_pui_tree, pui, pui);
-#ifdef WITH_OSSO
 if (iap_is_connected() && !_curl_sid)
-#else
-if (!_curl_sid)
-#endif
 	_curl_sid = g_timeout_add(100, (GSourceFunc) map_download_timeout, NULL);
 
 if (!_num_downloads++ && !_download_banner) {