dead code removal.

NEWS

@@ -8,6 +8,8 @@ http://trac.transmissionbt.com/query?group=component&milestone=1.30&order=severi
    + Status strings are toggled from the action button (they are no longer clickable)
 - GTK+
    + Add preferences options to inhibit hibernation and to toggle the tray icon
+- Daemon
+   + Redesigned & rewritten to use json over http
 
 1.21 (2008/05/21)
 http://trac.transmissionbt.com/query?group=component&milestone=1.21&order=severity

gtk/tr-core.c

@@ -506,8 +506,7 @@ tr_core_init( GTypeInstance * instance, gpointer g_class UNUSED )
         G_TYPE_STRING,    /* hash string */
         TR_TORRENT_TYPE,  /* TrTorrent object */
         G_TYPE_POINTER,   /* tr_torrent* */
-        G_TYPE_INT,       /* tr_stat()->status */
-        G_TYPE_INT        /* tr_torrentId() */
+        G_TYPE_INT        /* tr_stat()->status */
     };
 
     p = self->priv = G_TYPE_INSTANCE_GET_PRIVATE( self,
@@ -683,7 +682,6 @@ tr_core_add_torrent( TrCore * self, TrTorrent * gtor )
                                        MC_TORRENT,       gtor,
                                        MC_TORRENT_RAW,   tor,
                                        MC_STATUS,        torStat->status,
-                                       MC_ID,            tr_torrentId( tor ),
                                        -1);
 
     /* cleanup */

gtk/tr-core.h

@@ -185,7 +185,6 @@ enum
     MC_TORRENT,
     MC_TORRENT_RAW,
     MC_STATUS,
-    MC_ID,
     MC_ROW_COUNT
 };
 

libtransmission/tracker.c

@@ -35,14 +35,6 @@ enum
     /* seconds between tracker pulses */
     PULSE_INTERVAL_MSEC = 1000,
 
-    /* maximum number of concurrent tracker socket connections */
-    MAX_TRACKER_SOCKETS = 16,
-
-    /* maximum number of concurrent tracker socket connections during shutdown.
-     * all the peer connections should be gone by now, so we can hog more 
-     * connections to send `stop' messages to the trackers */
-    MAX_TRACKER_SOCKETS_DURING_SHUTDOWN = 64,
-
     /* unless the tracker says otherwise, rescrape this frequently */
     DEFAULT_SCRAPE_INTERVAL_SEC = (60 * 15),
 
@@ -69,7 +61,10 @@ struct tr_tracker
 
     uint8_t randOffset;
 
-    tr_session * session;
+    /* sent as the "key" argument in tracker requests
+       to verify us if our IP address changes.
+       This is immutable for the life of the tracker object. */
+    char key_param[KEYLEN+1];
 
     /* these are set from the latest scrape or tracker response */
     int announceIntervalSec;
@@ -80,10 +75,7 @@ struct tr_tracker
     /* index into the torrent's tr_info.trackers array */
     int trackerIndex;
 
-    /* sent as the "key" argument in tracker requests
-       to verify us if our IP address changes.
-       This is immutable for the life of the tracker object. */
-    char key_param[KEYLEN+1];
+    tr_session * session;
 
     tr_publisher_t * publisher;
 
@@ -547,9 +539,9 @@ enum
 
 struct tr_tracker_request
 {
-    char * url;
-    int reqtype; /* TR_REQ_* */
     uint8_t torrent_hash[SHA_DIGEST_LENGTH];
+    int reqtype; /* TR_REQ_* */
+    char * url;
     tr_web_done_func * done_func;
     tr_session * session;
 };