From: Kaj-Michael Lang <milang@onion.tal.org>
Date: Wed, 16 Jan 2008 13:42:06 +0000 (+0200)
Subject: Move _curl_sid
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ed1c6e6e5769c192b3eb80316c5cc290a86f68f;p=mapper

Move _curl_sid
---

diff --git a/src/gps.h b/src/gps.h
index 78693ac..f30e73f 100644
--- a/src/gps.h
+++ b/src/gps.h
@@ -44,8 +44,6 @@ guint _input_sid;
 
 /** The Source ID of the "Connect Later" idle. */
 guint _clater_sid;
-/** The Source ID of the CURL Multi Download timeout. */
-guint _curl_sid;
 
 gint _gmtoffset;
 
diff --git a/src/map-download.c b/src/map-download.c
index 9e80eaa..a713021 100644
--- a/src/map-download.c
+++ b/src/map-download.c
@@ -531,4 +531,8 @@ if (_curl_multi) {
 	g_hash_table_destroy(_pui_by_easy);
 }
 
+if (_curl_sid) {
+    g_source_remove(_curl_sid);
+    _curl_sid = 0;
+}  
 }
diff --git a/src/map-download.h b/src/map-download.h
index ab58330..3163d1a 100644
--- a/src/map-download.h
+++ b/src/map-download.h
@@ -9,6 +9,9 @@
 
 #define INITIAL_DOWNLOAD_RETRIES (3)
 
+/** The Source ID of the CURL Multi Download timeout. */
+guint _curl_sid;
+
 CURLM *_curl_multi;
 GQueue *_curl_easy_queue;
 GTree *_pui_tree;
diff --git a/src/mapper.c b/src/mapper.c
index c4fcab4..d6e2177 100644
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -127,10 +127,6 @@ config_save();
 config_save_repo();
 rcvr_disconnect();
 map_download_deinit();
-if (_curl_sid) {
-	g_source_remove(_curl_sid);
-	_curl_sid = 0;
-}
 #if defined (WITH_GST) && defined (WITH_ESPEAK)
 speak_deinit();
 #endif