Changeset 6935

Timestamp:

Oct 20, 2008, 5:54:56 PM (12 years ago)

Author:

charles

Message:

#1369: clarify the different torrent status & callbacks' APIs and typenames

Location:

trunk

Files:

• cli/cli.c (modified) (7 diffs)
• gtk/dialogs.c (modified) (1 diff)
• gtk/main.c (modified) (1 diff)
• gtk/torrent-cell-renderer.c (modified) (6 diffs)
• gtk/tr-core.c (modified) (6 diffs)
• gtk/tr-core.h (modified) (1 diff)
• gtk/tr-torrent.c (modified) (2 diffs)
• gtk/tr-window.c (modified) (1 diff)
• libtransmission/completion.c (modified) (1 diff)
• libtransmission/completion.h (modified) (1 diff)
• libtransmission/rpcimpl.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (11 diffs)
• libtransmission/torrent.h (modified) (2 diffs)
• libtransmission/transmission.h (modified) (8 diffs)
• macosx/Torrent.m (modified) (8 diffs)

trunk/cli/cli.c

@@ -174 +174 @@
 
 static void
-torrentStateChanged( tr_torrent   * torrent   UNUSED,
-                     cp_status_t    status    UNUSED,
-                     void         * user_data UNUSED )
+torrentCompletenessChanged( tr_torrent       * torrent       UNUSED,
+                            tr_completeness    completeness  UNUSED,
+                            void             * user_data     UNUSED )
 {
     system( finishCall );
@@ -185 +185 @@
 static void
 scrapeDoneFunc( struct tr_handle    * session UNUSED,
-                long                          response_code,
-                const void *                  response,
-                size_t                        response_byte_count,
-                void *                        host )
+                long                  response_code,
+                const void *          response,
+                size_t                response_byte_count,
+                void *                host )
 {
     tr_benc top, *files;
@@ -261 +261 @@
               size_t          buflen )
 {
-    if( st->status & TR_STATUS_CHECK_WAIT )
+    if( st->activity & TR_STATUS_CHECK_WAIT )
     {
         tr_snprintf( buf, buflen, "Waiting to verify local files" );
     }
-    else if( st->status & TR_STATUS_CHECK )
+    else if( st->activity & TR_STATUS_CHECK )
     {
         tr_snprintf( buf, buflen,
@@ -272 +272 @@
                      100.0 * st->percentDone );
     }
-    else if( st->status & TR_STATUS_DOWNLOAD )
+    else if( st->activity & TR_STATUS_DOWNLOAD )
     {
         char ratioStr[80];
@@ -288 +288 @@
             ratioStr );
     }
-    else if( st->status & TR_STATUS_SEED )
+    else if( st->activity & TR_STATUS_SEED )
     {
         char ratioStr[80];
@@ -474 +474 @@
     signal( SIGHUP, sigHandler );
 #endif
-    tr_torrentSetStatusCallback( tor, torrentStateChanged, NULL );
+    tr_torrentSetCompletenessCallback( tor, torrentCompletenessChanged, NULL );
     tr_torrentStart( tor );
 
@@ -513 +513 @@
 
         st = tr_torrentStat( tor );
-        if( st->status & TR_STATUS_STOPPED )
+        if( st->activity & TR_STATUS_STOPPED )
             break;
 

trunk/gtk/dialogs.c

@@ -71 +71 @@
                      gpointer             activeTorrentCount )
 {
-    int status = -1;
-
-    gtk_tree_model_get( model, iter, MC_STATUS, &status, -1 );
-    if( status != TR_STATUS_STOPPED )
+    int activity = -1;
+    gtk_tree_model_get( model, iter, MC_ACTIVITY, &activity, -1 );
+    if( activity != TR_STATUS_STOPPED )
         *(int*)activeTorrentCount += 1;
     return FALSE; /* keep iterating */

trunk/gtk/main.c

@@ -179 +179 @@
                          gpointer            user_data )
 {
-    int                  status = 0;
+    int                  activity = 0;
     struct counts_data * counts = user_data;
 
     ++counts->totalCount;
 
-    gtk_tree_model_get( model, iter, MC_STATUS, &status, -1 );
-
-    if( TR_STATUS_IS_ACTIVE( status ) )
+    gtk_tree_model_get( model, iter, MC_ACTIVITY, &activity, -1 );
+
+    if( TR_STATUS_IS_ACTIVE( activity ) )
         ++counts->activeCount;
     else

trunk/gtk/torrent-cell-renderer.c

@@ -80 +80 @@
 
     /* add time when downloading */
-    if( torStat->status == TR_STATUS_DOWNLOAD )
+    if( torStat->activity == TR_STATUS_DOWNLOAD )
     {
         const int eta = torStat->eta;
@@ -139 +139 @@
     GString * gstr = g_string_new( NULL );
 
-    switch( torStat->status )
+    switch( torStat->activity )
     {
         case TR_STATUS_STOPPED:
@@ -160 +160 @@
         {
             char buf[128];
-            if( torStat->status != TR_STATUS_DOWNLOAD )
+            if( torStat->activity != TR_STATUS_DOWNLOAD )
             {
                 tr_strlratio( buf, torStat->ratio, sizeof( buf ) );
@@ -181 +181 @@
 getStatusString( const tr_stat * torStat )
 {
-    const int isActive = torStat->status != TR_STATUS_STOPPED;
-    const int isChecking = torStat->status == TR_STATUS_CHECK
-                           || torStat->status == TR_STATUS_CHECK_WAIT;
+    const int isActive = torStat->activity != TR_STATUS_STOPPED;
+    const int isChecking = torStat->activity == TR_STATUS_CHECK
+                        || torStat->activity == TR_STATUS_CHECK_WAIT;
 
     GString * gstr = g_string_new( NULL );
@@ -191 +191 @@
         g_string_assign( gstr, torStat->errorString );
     }
-    else switch( torStat->status )
+    else switch( torStat->activity )
         {
             case TR_STATUS_STOPPED:
@@ -377 +377 @@
         int                                 w, h;
         struct TorrentCellRendererPrivate * p = self->priv;
-        GtkCellRenderer *                   text_renderer =
-            torStat->error != 0
-            ? p->
-            text_renderer_err
-            : p->
-            text_renderer;
-        const gboolean                      isActive = torStat->status !=
-                                                       TR_STATUS_STOPPED;
+        GtkCellRenderer * text_renderer = torStat->error != 0
+                                        ? p->text_renderer_err
+                                        : p->text_renderer;
+        const gboolean isActive = torStat->activity != TR_STATUS_STOPPED;
 
         my_bg = *background_area;

trunk/gtk/tr-core.c

@@ -378 +378 @@
 
     /* first by state */
-    gtk_tree_model_get( model, a, MC_STATUS, &sa, -1 );
-    gtk_tree_model_get( model, b, MC_STATUS, &sb, -1 );
+    gtk_tree_model_get( model, a, MC_ACTIVITY, &sa, -1 );
+    gtk_tree_model_get( model, b, MC_ACTIVITY, &sb, -1 );
     ret = sa - sb;
 
@@ -715 +715 @@
 
 static gboolean
-statsForeach( GtkTreeModel *      model,
+statsForeach( GtkTreeModel * model,
               GtkTreePath  * path UNUSED,
-              GtkTreeIter *       iter,
-              gpointer            gstats )
+              GtkTreeIter  * iter,
+              gpointer       gstats )
 {
     tr_torrent *        tor;
     struct core_stats * stats = gstats;
-    int                 status;
+    int                 activity;
 
     gtk_tree_model_get( model, iter, MC_TORRENT_RAW, &tor, -1 );
-    status = tr_torrentGetStatus( tor );
-
-    if( status == TR_STATUS_DOWNLOAD )
+    activity = tr_torrentGetActivity( tor );
+
+    if( activity == TR_STATUS_DOWNLOAD )
         ++stats->downloadCount;
-    else if( status == TR_STATUS_SEED )
+    else if( activity == TR_STATUS_SEED )
         ++stats->seedingCount;
 
@@ -796 +796 @@
                                        MC_TORRENT,       gtor,
                                        MC_TORRENT_RAW,   tor,
-                                       MC_STATUS,        torStat->status,
+                                       MC_ACTIVITY,      torStat->activity,
                                        -1 );
 
@@ -1010 +1010 @@
                 gpointer       data UNUSED )
 {
-    int         oldStatus;
-    int         newStatus;
+    int         oldActivity;
+    int         newActivity;
     TrTorrent * gtor;
 
@@ -1017 +1017 @@
     gtk_tree_model_get( model, iter,
                         MC_TORRENT, &gtor,
-                        MC_STATUS, &oldStatus,
+                        MC_ACTIVITY, &oldActivity,
                         -1 );
-    newStatus = tr_torrentGetStatus( tr_torrent_handle( gtor ) );
-    if( newStatus != oldStatus )
+    newActivity = tr_torrentGetActivity( tr_torrent_handle( gtor ) );
+    if( newActivity != oldActivity )
         gtk_list_store_set( GTK_LIST_STORE( model ), iter,
-                            MC_STATUS, newStatus,
+                            MC_ACTIVITY, newActivity,
                             -1 );
 
@@ -1186 +1186 @@
         tr_torrent * tor = NULL;
         while(( tor = tr_torrentNext( session, tor )))
-            if(( active = ( tr_torrentGetStatus( tor ) != TR_STATUS_STOPPED )))
+            if(( active = ( tr_torrentGetActivity( tor ) != TR_STATUS_STOPPED )))
                 break;
         if( !active )

trunk/gtk/tr-core.h

@@ -218 +218 @@
     MC_TORRENT,
     MC_TORRENT_RAW,
-    MC_STATUS,
+    MC_ACTIVITY,
     MC_ROW_COUNT
 };

trunk/gtk/tr-torrent.c

@@ -163 +163 @@
 
 static void
-statusChangedCallback( tr_torrent   * tor UNUSED,
-                       cp_status_t        status,
-                       void *             user_data )
-{
-    if( status == TR_CP_COMPLETE )
+completenessChangedCallback( tr_torrent       * tor UNUSED,
+                             tr_completeness    completeness,
+                             void *             user_data )
+{
+    if( completeness == TR_CP_COMPLETE )
         g_idle_add( notifyInMainThread, user_data );
 }
 
 static TrTorrent *
-maketorrent( tr_torrent * handle )
-{
-    TrTorrent * tor = g_object_new( TR_TORRENT_TYPE, NULL );
-
-    tor->priv->handle = handle;
-    tr_torrentSetStatusCallback( handle, statusChangedCallback, tor );
-    return tor;
+maketorrent( tr_torrent * tor )
+{
+    TrTorrent * gtor = g_object_new( TR_TORRENT_TYPE, NULL );
+
+    gtor->priv->handle = tor;
+    tr_torrentSetCompletenessCallback( tor, completenessChangedCallback, gtor );
+    return gtor;
 }
 
@@ -259 +259 @@
     const int       eta = st->eta;
 
-    switch( st->status )
+    switch( st->activity )
     {
         case TR_STATUS_CHECK_WAIT:

trunk/gtk/tr-window.c

@@ -319 +319 @@
     {
         case FILTER_MODE_DOWNLOADING:
-            ret = tr_torrentGetStatus( tor ) == TR_STATUS_DOWNLOAD;
+            ret = tr_torrentGetActivity( tor ) == TR_STATUS_DOWNLOAD;
             break;
 
         case FILTER_MODE_SEEDING:
-            ret = tr_torrentGetStatus( tor ) == TR_STATUS_SEED;
+            ret = tr_torrentGetActivity( tor ) == TR_STATUS_SEED;
             break;
 
         case FILTER_MODE_PAUSED:
-            ret = tr_torrentGetStatus( tor ) == TR_STATUS_STOPPED;
+            ret = tr_torrentGetActivity( tor ) == TR_STATUS_STOPPED;
             break;
 

trunk/libtransmission/completion.c

@@ -293 +293 @@
 }
 
-cp_status_t
+tr_completeness
 tr_cpGetStatus( const tr_completion * cp )
 {

trunk/libtransmission/completion.h

@@ -37 +37 @@
 /* General */
 
-cp_status_t                tr_cpGetStatus( const tr_completion * );
+tr_completeness            tr_cpGetStatus( const tr_completion * );
 
 uint64_t                   tr_cpHaveTotal( const tr_completion * );

trunk/libtransmission/rpcimpl.c

@@ -378 +378 @@
         tr_bencDictAddInt( d, key, st->startDate );
     else if( !strcmp( key, "status" ) )
-        tr_bencDictAddInt( d, key, st->status );
+        tr_bencDictAddInt( d, key, st->activity );
     else if( !strcmp( key, "swarmSpeed" ) )
         tr_bencDictAddInt( d, key, (int)( st->swarmSpeed * 1024 ) );

trunk/libtransmission/torrent.c

@@ -544 +544 @@
     }
 
-    tor->cpStatus = tr_cpGetStatus( tor->completion );
+    tor->completeness = tr_cpGetStatus( tor->completion );
 
     tor->tracker = tr_trackerNew( tor );
@@ -740 +740 @@
 }
 
-tr_torrent_status
-tr_torrentGetStatus( tr_torrent * tor )
+tr_torrent_activity
+tr_torrentGetActivity( tr_torrent * tor )
 {
     tr_torrentRecheckCompleteness( tor );
@@ -751 +751 @@
     if( !tor->isRunning )
         return TR_STATUS_STOPPED;
-    if( tor->cpStatus == TR_CP_INCOMPLETE )
+    if( tor->completeness == TR_CP_INCOMPLETE )
         return TR_STATUS_DOWNLOAD;
 
@@ -774 +774 @@
     s = &tor->stats;
     s->id = tor->uniqueId;
-    s->status = tr_torrentGetStatus( tor );
+    s->activity = tr_torrentGetActivity( tor );
     s->error  = tor->error;
     memcpy( s->errorString, tor->errorString,
@@ -809 +809 @@
     s->sizeWhenDone = tr_cpSizeWhenDone( tor->completion );
 
-    s->recheckProgress = s->status == TR_STATUS_CHECK
-                         ? 1.0 -
+    s->recheckProgress = s->activity == TR_STATUS_CHECK
+                       ? 1.0 -
                          ( tr_torrentCountUncheckedPieces( tor ) /
                            (double) tor->info.pieceCount )
-                         : 0.0;
+                       : 0.0;
 
     s->swarmSpeed = tr_rcRate( tor->swarmSpeed );
@@ -1102 +1102 @@
     *tor->errorString = '\0';
     tr_torrentResetTransferStats( tor );
-    tor->cpStatus = tr_cpGetStatus( tor->completion );
+    tor->completeness = tr_cpGetStatus( tor->completion );
     tr_torrentSaveResume( tor );
     tor->startDate = time( NULL );
@@ -1226 +1226 @@
         tr_globalLock( handle );
 
-        tr_torrentClearStatusCallback( tor );
+        tr_torrentClearCompletenessCallback( tor );
         tr_runInEventThread( handle, closeTorrent, tor );
 
@@ -1266 +1266 @@
 
 static void
-fireStatusChange( tr_torrent * tor,
-                  cp_status_t  status )
+fireCompletenessChange( tr_torrent       * tor,
+                        tr_completeness    status )
 {
     assert( tor );
-    assert(
-        status == TR_CP_INCOMPLETE || status == TR_CP_DONE || status ==
-        TR_CP_COMPLETE );
-
-    if( tor->status_func )
-        tor->status_func( tor, status, tor->status_func_user_data );
-}
-
-void
-tr_torrentSetStatusCallback( tr_torrent *           tor,
-                             tr_torrent_status_func func,
-                             void *                 user_data )
+    assert( ( status == TR_CP_INCOMPLETE )
+         || ( status == TR_CP_DONE )
+         || ( status == TR_CP_COMPLETE ) );
+
+    if( tor->completeness_func )
+        tor->completeness_func( tor, status, tor->completeness_func_user_data );
+}
+
+void
+tr_torrentSetCompletenessCallback( tr_torrent                    * tor,
+                                   tr_torrent_completeness_func    func,
+                                   void                          * user_data )
 {
     assert( tor );
-    tor->status_func = func;
-    tor->status_func_user_data = user_data;
-}
-
-void
-tr_torrentClearStatusCallback( tr_torrent * torrent )
-{
-    tr_torrentSetStatusCallback( torrent, NULL, NULL );
+    tor->completeness_func = func;
+    tor->completeness_func_user_data = user_data;
+}
+
+void
+tr_torrentClearCompletenessCallback( tr_torrent * torrent )
+{
+    tr_torrentSetCompletenessCallback( torrent, NULL, NULL );
 }
 
@@ -1297 +1297 @@
 tr_torrentRecheckCompleteness( tr_torrent * tor )
 {
-    cp_status_t cpStatus;
+    tr_completeness completeness;
 
     tr_torrentLock( tor );
 
-    cpStatus = tr_cpGetStatus( tor->completion );
-
-    if( cpStatus != tor->cpStatus )
+    completeness = tr_cpGetStatus( tor->completion );
+
+    if( completeness != tor->completeness )
     {
         const int recentChange = tor->downloadedCur != 0;
@@ -1310 +1310 @@
         {
             tr_torinf( tor, _( "State changed from \"%1$s\" to \"%2$s\"" ),
-                      getCompletionString( tor->cpStatus ),
-                      getCompletionString( cpStatus ) );
+                      getCompletionString( tor->completeness ),
+                      getCompletionString( completeness ) );
         }
 
-        tor->cpStatus = cpStatus;
-        fireStatusChange( tor, cpStatus );
-
-        if( recentChange && ( cpStatus == TR_CP_COMPLETE ) )
+        tor->completeness = completeness;
+        fireCompletenessChange( tor, completeness );
+
+        if( recentChange && ( completeness == TR_CP_COMPLETE ) )
         {
             tr_trackerCompleted( tor->tracker );
@@ -1333 +1333 @@
 tr_torrentIsSeed( const tr_torrent * tor )
 {
-    return tor->cpStatus == TR_CP_COMPLETE || tor->cpStatus == TR_CP_DONE;
+    return tor->completeness == TR_CP_COMPLETE || tor->completeness == TR_CP_DONE;
 }
 

trunk/libtransmission/torrent.h

@@ -195 +195 @@
 
     struct tr_bitfield *       checkedPieces;
-    cp_status_t                cpStatus;
+    tr_completeness            completeness;
 
     struct tr_tracker *        tracker;
@@ -212 +212 @@
     time_t                     startDate;
 
-    tr_torrent_status_func *   status_func;
-    void *                     status_func_user_data;
+    tr_torrent_completeness_func *   completeness_func;
+    void *                     completeness_func_user_data;
 
     unsigned int               isRunning  : 1;

trunk/libtransmission/transmission.h

@@ -390 +390 @@
     TR_RPC_TORRENT_STOPPED,
     TR_RPC_TORRENT_REMOVING,
-    TR_RPC_TORRENT_CHANGED,
+    TR_RPC_TORRENT_CHANGED, /* catch-all for the "torrent-set" rpc method */
     TR_RPC_SESSION_CHANGED
 }
@@ -408 +408 @@
 tr_rpc_callback_status;
 
-typedef tr_rpc_callback_status ( *tr_rpc_func )( tr_session *
-                                                                      handle,
-                                                 tr_rpc_callback_type type,
-                                                 struct tr_torrent *
-                                                                      tor_or_null,
-                                                 void *
-                                                                      user_data );
-
-void          tr_sessionSetRPCCallback( tr_session * handle,
-                                        tr_rpc_func  func,
-                                        void *       user_data );
+typedef tr_rpc_callback_status (*tr_rpc_func)(tr_session          * session,
+                                              tr_rpc_callback_type  type,
+                                              struct tr_torrent   * tor_or_null,
+                                              void                * user_data );
+
+/**
+ * Register to be notified whenever something is changed via RPC,
+ * such as a torrent being added, removed, started, stopped, etc.
+ *
+ * func is invoked FROM LIBTRANSMISSION'S THREAD!
+ * This means func must be fast (to avoid blocking peers),
+ * shouldn't call libtransmission functions (to avoid deadlock),
+ * and shouldn't modify client-level memory without using a mutex!
+ */
+void tr_sessionSetRPCCallback( tr_session   * session,
+                               tr_rpc_func    func,
+                               void         * user_data );
 
 /**
@@ -970 +976 @@
 {
     TR_CP_INCOMPLETE,   /* doesn't have all the desired pieces */
-    TR_CP_DONE,         /* has all the pieces but the DND ones */
+    TR_CP_DONE,         /* has all the desired pieces, but not all pieces */
     TR_CP_COMPLETE      /* has every piece */
 }
-cp_status_t;
-
-typedef void ( tr_torrent_status_func )( tr_torrent * torrent,
-                                         cp_status_t  status,
-                                         void *       user_data );
-
-/**
- * Register to be notified whenever a torrent's state changes.
+tr_completeness;
+
+typedef void ( tr_torrent_completeness_func )( tr_torrent       * torrent,
+                                               tr_completeness    completeness,
+                                               void             * user_data );
+
+/**
+ * Register to be notified whenever a torrent's "completeness"
+ * changes.  This will be called, for example, when a torrent
+ * finishes downloading and changes from TR_CP_INCOMPLETE to
+ * either TR_CP_COMPLETE or TR_CP_DONE.
  *
  * func is invoked FROM LIBTRANSMISSION'S THREAD!
@@ -986 +995 @@
  * shouldn't call libtransmission functions (to avoid deadlock),
  * and shouldn't modify client-level memory without using a mutex!
- */
-void tr_torrentSetStatusCallback( tr_torrent *           torrent,
-                                  tr_torrent_status_func func,
-                                  void *                 user_data );
-
-void tr_torrentClearStatusCallback( tr_torrent * torrent );
+ *
+ * @see tr_completeness
+ */
+void tr_torrentSetCompletenessCallback(
+         tr_torrent                    * torrent,
+         tr_torrent_completeness_func    func,
+         void                          * user_data );
+
+void tr_torrentClearCompletenessCallback( tr_torrent * torrent );
 
 
@@ -1155 +1167 @@
 };
 
+/**
+ * What the torrent is doing right now.
+ *
+ * Note: these values will become a straight enum at some point in the future.
+ * Do not rely on their current `bitfield' implementation
+ */
 typedef enum
 {
@@ -1163 +1181 @@
     TR_STATUS_STOPPED      = ( 1 << 4 )  /* Torrent is stopped */
 }
-tr_torrent_status;
+tr_torrent_activity;
 
 #define TR_STATUS_IS_ACTIVE( s ) ( ( s ) != TR_STATUS_STOPPED )
@@ -1175 +1193 @@
 tr_lockfile_state_t;
 
-tr_torrent_status tr_torrentGetStatus( tr_torrent * );
+tr_torrent_activity tr_torrentGetActivity( tr_torrent * );
 
 enum
@@ -1199 +1217 @@
     int    id;
 
-    /** The torrent's current status */
-    tr_torrent_status    status;
+    /** What is this torrent doing right now? */
+    tr_torrent_activity activity;
 
     /** Our current announce URL, or NULL if none.

trunk/macosx/Torrent.m

@@ -61 +61 @@
 @end
 
-void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void * torrentData)
+void completenessChangeCallback(tr_torrent * torrent, tr_completeness status, void * torrentData)
 {
     [(Torrent *)torrentData performSelectorOnMainThread: @selector(completenessChange:)
@@ -951 +951 @@
 - (BOOL) isActive
 {
-    return fStat->status != TR_STATUS_STOPPED;
+    return fStat->activity != TR_STATUS_STOPPED;
 }
 
 - (BOOL) isSeeding
 {
-    return fStat->status == TR_STATUS_SEED;
+    return fStat->activity == TR_STATUS_SEED;
 }
 
 - (BOOL) isChecking
 {
-    return fStat->status == TR_STATUS_CHECK || fStat->status == TR_STATUS_CHECK_WAIT;
+    return fStat->activity == TR_STATUS_CHECK || fStat->activity == TR_STATUS_CHECK_WAIT;
 }
 
 - (BOOL) isCheckingWaiting
 {
-    return fStat->status == TR_STATUS_CHECK_WAIT;
+    return fStat->activity == TR_STATUS_CHECK_WAIT;
 }
 
@@ -1108 +1108 @@
     
     //add time when downloading
-    if (fStat->status == TR_STATUS_DOWNLOAD || ([self isSeeding]
+    if (fStat->activity == TR_STATUS_DOWNLOAD || ([self isSeeding]
         && (fRatioSetting == NSOnState || (fRatioSetting == NSMixedState && [fDefaults boolForKey: @"RatioCheck"]))))
     {
-        int eta = fStat->status == TR_STATUS_DOWNLOAD ? [self eta] : [self etaRatio];
+        int eta = fStat->activity == TR_STATUS_DOWNLOAD ? [self eta] : [self etaRatio];
         string = [string stringByAppendingFormat: @" - %@", [self etaString: eta]];
     }
@@ -1131 +1131 @@
     else
     {
-        switch (fStat->status)
+        switch (fStat->activity)
         {
             case TR_STATUS_STOPPED:
@@ -1194 +1194 @@
     if ([self isActive] && ![self isChecking])
     {
-        if (fStat->status == TR_STATUS_DOWNLOAD)
+        if (fStat->activity == TR_STATUS_DOWNLOAD)
             string = [string stringByAppendingFormat: @" - %@: %@, %@: %@",
                         NSLocalizedString(@"DL", "Torrent -> status string"), [NSString stringForSpeed: [self downloadRate]],
@@ -1210 +1210 @@
     NSString * string;
     
-    switch (fStat->status)
+    switch (fStat->activity)
     {
         case TR_STATUS_STOPPED:
@@ -1260 +1260 @@
 - (NSString *) stateString
 {
-    switch (fStat->status)
+    switch (fStat->activity)
     {
         case TR_STATUS_STOPPED:
@@ -1708 +1708 @@
     }
     
-    tr_torrentSetStatusCallback(fHandle, completenessChangeCallback, self);
+    tr_torrentSetCompletenessCallback(fHandle, completenessChangeCallback, self);
     
     fNameString = [[NSString alloc] initWithUTF8String: fInfo->name];