Changeset 3586

Timestamp:

Oct 26, 2007, 11:29:18 PM (15 years ago)

Author:

charles

Message:

(gtk) if two torrents are selected -- one running, one paused -- both "pause" and "resume" buttons should be enabled. reported by glyphobet.

Location:

branches/0.9x

Files:

• gtk/main.c (modified) (2 diffs)
• libtransmission/transmission.c (modified) (1 diff)

branches/0.9x/gtk/main.c

@@ -165 +165 @@
 fatalsig(int sig);
 
+struct counts_data
+{
+    int totalCount;
+    int activeCount;
+    int inactiveCount;
+};
+
 static void
 accumulateStatusForeach (GtkTreeModel * model,
                          GtkTreePath  * path UNUSED,
                          GtkTreeIter  * iter,
-                         gpointer       accumulated_status)
+                         gpointer       user_data )
 {
     int status = 0;
+    struct counts_data * counts = user_data;
+
+    ++counts->totalCount;
+
     gtk_tree_model_get( model, iter, MC_STAT, &status, -1 );
-    *(int*)accumulated_status |= status;
+    if( TR_STATUS_IS_ACTIVE( status ) )
+        ++counts->activeCount;
+    else
+        ++counts->inactiveCount;
 }
 
@@ -192 +206 @@
 refreshTorrentActions( GtkTreeSelection * s )
 {
-    int status = 0;
-    gtk_tree_selection_selected_foreach( s, accumulateStatusForeach, &status );
-    action_sensitize( "pause-torrent", TR_STATUS_IS_ACTIVE(status) );
-    action_sensitize( "start-torrent", !TR_STATUS_IS_ACTIVE(status) );
-    action_sensitize( "remove-torrent", status != 0);
-    action_sensitize( "verify-torrent", status != 0);
-    action_sensitize( "show-torrent-details", status != 0);
-
-    status = 0;
-    gtk_tree_selection_selected_foreach( s, accumulateCanUpdateForeach, &status );
-    action_sensitize( "update-tracker", status != 0);
+    int canUpdate;
+    struct counts_data counts;
+
+    counts.activeCount = 0;
+    counts.inactiveCount = 0;
+    counts.totalCount = 0;
+    gtk_tree_selection_selected_foreach( s, accumulateStatusForeach, &counts );
+    action_sensitize( "pause-torrent", counts.activeCount!=0 );
+    action_sensitize( "start-torrent", counts.inactiveCount!=0 );
+    action_sensitize( "remove-torrent", counts.totalCount!=0 );
+    action_sensitize( "verify-torrent", counts.totalCount!=0 );
+    action_sensitize( "show-torrent-details", counts.totalCount!=0 );
+
+    canUpdate = 0;
+    gtk_tree_selection_selected_foreach( s, accumulateCanUpdateForeach, &canUpdate );
+    action_sensitize( "update-tracker", canUpdate!=0 );
 }
 

branches/0.9x/libtransmission/transmission.c

@@ -323 +323 @@
     free( h->tag );
     free( h );
-    fprintf( stderr, "libtransmission closed cleanly.\n" );
 }