From 7d47ed54ebf3b51955b35f583edf32b34e316a19 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Sun, 3 Aug 2008 15:32:15 +0000
Subject: [PATCH] removed connecting_to_tracker state

---
 ChangeLog                             | 1 +
 docs/manual.html                      | 5 -----
 docs/manual.rst                       | 4 ----
 include/libtorrent/torrent_handle.hpp | 1 -
 src/torrent.cpp                       | 8 ++------
 5 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8e2610a5a..b6fdb6da4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 
+	* Removed 'connecting_to_tracker' torrent state
 	* Fix bug where FAST pieces were cancelled on choke
 	* Fixed problems with restoring piece states when hash failed.
 	* Minimum peer reconnect time fix. Peers with no failures would
diff --git a/docs/manual.html b/docs/manual.html
index 5967bd01e..98a97d79e 100644
--- a/docs/manual.html
+++ b/docs/manual.html
@@ -2286,7 +2286,6 @@ struct torrent_status
         {
                 queued_for_checking,
                 checking_files,
-                connecting_to_tracker,
                 downloading_metadata,
                 downloading,
                 finished,
@@ -2382,10 +2381,6 @@ This torrent will wait for its turn.</td>
 <td>The torrent has not started its download yet, and is
 currently checking existing files.</td>
 </tr>
-<tr><td><tt class="docutils literal"><span class="pre">connecting_to_tracker</span></tt></td>
-<td>The torrent has sent a request to the tracker and is
-currently waiting for a response</td>
-</tr>
 <tr><td><tt class="docutils literal"><span class="pre">downloading_metadata</span></tt></td>
 <td>The torrent is trying to download metadata from peers.
 This assumes the metadata_transfer extension is in use.</td>
diff --git a/docs/manual.rst b/docs/manual.rst
index df48a0dd4..6c9e75bee 100644
--- a/docs/manual.rst
+++ b/docs/manual.rst
@@ -2241,7 +2241,6 @@ It contains the following fields::
 		{
 			queued_for_checking,
 			checking_files,
-			connecting_to_tracker,
 			downloading_metadata,
 			downloading,
 			finished,
@@ -2331,9 +2330,6 @@ current task is in the ``state`` member, it will be one of the following:
 |``checking_files``        |The torrent has not started its download yet, and is      |
 |                          |currently checking existing files.                        |
 +--------------------------+----------------------------------------------------------+
-|``connecting_to_tracker`` |The torrent has sent a request to the tracker and is      |
-|                          |currently waiting for a response                          |
-+--------------------------+----------------------------------------------------------+
 |``downloading_metadata``  |The torrent is trying to download metadata from peers.    |
 |                          |This assumes the metadata_transfer extension is in use.   |
 +--------------------------+----------------------------------------------------------+
diff --git a/include/libtorrent/torrent_handle.hpp b/include/libtorrent/torrent_handle.hpp
index 22d01ab90..97d8edb37 100644
--- a/include/libtorrent/torrent_handle.hpp
+++ b/include/libtorrent/torrent_handle.hpp
@@ -126,7 +126,6 @@ namespace libtorrent
 		{
 			queued_for_checking,
 			checking_files,
-			connecting_to_tracker,
 			downloading_metadata,
 			downloading,
 			finished,
diff --git a/src/torrent.cpp b/src/torrent.cpp
index 86d5c5990..f852bc3e1 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -3272,7 +3272,7 @@ namespace libtorrent
 		TORRENT_ASSERT(m_torrent_file->is_valid());
 		INVARIANT_CHECK;
 
-		set_state(torrent_status::connecting_to_tracker);
+		set_state(torrent_status::downloading);
 
 		if (!is_seed())
 		{
@@ -4368,11 +4368,7 @@ namespace libtorrent
 
 		if (!valid_metadata())
 		{
-			if (m_got_tracker_response == false && m_connections.empty())
-				st.state = torrent_status::connecting_to_tracker;
-			else
-				st.state = torrent_status::downloading_metadata;
-
+			st.state = torrent_status::downloading_metadata;
 			st.progress = m_progress;
 			st.block_size = 0;
 			return st;