Changeset 11114

Timestamp:

Aug 4, 2010, 5:35:48 PM (12 years ago)

Author:

Longinus00

Message:

(trunk) #3185: Number on drop-down menu "Activity" - "Active" seems does not follow a change in torrent status correctly

Location:

trunk/gtk

Files:

• tr-core.c (modified) (8 diffs)
• tr-core.h (modified) (1 diff)

trunk/gtk/tr-core.c

@@ -559 +559 @@
 }
 
+static gboolean
+isTorrentActive( tr_torrent * tor )
+{
+    const tr_stat * st = tr_torrentStat( tor );
+    return ( st->peersSendingToUs > 0 )
+        || ( st->peersGettingFromUs > 0 )
+        || ( st->activity == TR_STATUS_CHECK );
+}
+
 #ifdef HAVE_GIO
 
@@ -786 +795 @@
                       G_TYPE_DOUBLE,    /* tr_stat.pieceUploadSpeed_KBps */
                       G_TYPE_DOUBLE,    /* tr_stat.pieceDownloadSpeed_KBps */
+                      G_TYPE_BOOLEAN,   /* filter.c:ACTIVITY_FILTER_ACTIVE */
                       G_TYPE_INT,       /* tr_stat.activity */
                       G_TYPE_UCHAR,     /* tr_stat.finished */
@@ -907 +917 @@
                                        MC_SPEED_UP,      st->pieceUploadSpeed_KBps,
                                        MC_SPEED_DOWN,    st->pieceDownloadSpeed_KBps,
+                                       MC_ACTIVE,        isTorrentActive( tor ),
                                        MC_ACTIVITY,      st->activity,
                                        MC_FINISHED,      st->finished,
@@ -1305 +1316 @@
     double oldUpSpeed, newUpSpeed;
     double oldDownSpeed, newDownSpeed;
+    gboolean oldActive, newActive;
     const tr_stat * st;
     TrTorrent * gtor;
@@ -1312 +1324 @@
     gtk_tree_model_get( model, iter,
                         MC_TORRENT, &gtor,
+                        MC_ACTIVE, &oldActive,
                         MC_ACTIVITY, &oldActivity,
                         MC_FINISHED, &oldFinished,
@@ -1323 +1336 @@
     tor = tr_torrent_handle( gtor );
     st = tr_torrentStat( tor );
+    newActive = isTorrentActive( tor );
     newActivity = st->activity;
     newFinished = st->finished;
@@ -1332 +1346 @@
     /* updating the model triggers off resort/refresh,
        so don't do it unless something's actually changed... */
-    if( ( newActivity  != oldActivity  )
+    if( ( newActive != oldActive )
+        || ( newActivity  != oldActivity )
         || ( newFinished != oldFinished )
         || ( newPriority != oldPriority )
@@ -1340 +1355 @@
     {
         gtk_list_store_set( GTK_LIST_STORE( model ), iter,
+                            MC_ACTIVE, newActive,
                             MC_ACTIVITY, newActivity,
                             MC_FINISHED, newFinished,

trunk/gtk/tr-core.h

@@ -196 +196 @@
     MC_SPEED_UP,
     MC_SPEED_DOWN,
+    MC_ACTIVE,
     MC_ACTIVITY,
     MC_FINISHED,