From 30699c54515b65f9a845e2eb5c741823b75520af Mon Sep 17 00:00:00 2001 From: Kaj-Michael Lang Date: Fri, 19 Oct 2007 01:59:31 +0300 Subject: [PATCH] Remove ifdefs. We now have simple stubs if no connection manager is used. --- src/map-download.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) 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) { -- 2.39.5