Changeset 5218

Timestamp:

Mar 7, 2008, 7:05:00 PM (14 years ago)

Author:

charles

Message:

(gtk) minor r5216 cleanup

File:

• trunk/gtk/dialogs.c (modified) (5 diffs)

trunk/gtk/dialogs.c

@@ -293 +293 @@
     GList * torrents;
     TrCore * core;
-    int busyCount;
 };
 
@@ -321 +320 @@
 
 static void
-tabulateTorrents( gpointer gtor, gpointer gdata )
-{
-    struct DeleteData * data = gdata;
+countBusyTorrents( gpointer gtor, gpointer busyCount )
+{
     const tr_stat * stat = tr_torrent_stat( gtor );
 
     if( stat->leftUntilDone || stat->peersConnected )
-        ++data->busyCount;
+        ++(*(int*)busyCount);
 }
 
@@ -338 +336 @@
     GtkWidget * d;
     struct DeleteData * dd;
+    int busyCount;
     const int count = g_list_length( torrents );
     const char * primary_text;
@@ -350 +349 @@
     dd->delete_files = delete_files;
 
-    g_list_foreach( torrents, tabulateTorrents, dd );
-
-    if( !dd->busyCount && !delete_files ) /* don't prompt boring torrents */
+    busyCount = 0;
+    g_list_foreach( torrents, countBusyTorrents, &busyCount );
+
+    if( !busyCount && !delete_files ) /* don't prompt boring torrents */
     {
         removeTorrents( dd );
@@ -366 +366 @@
                                  count );
 
-    if( dd->busyCount > 1 )
+    if( busyCount > 1 )
         secondary_text = _( "Some of these torrents are incomplete or connected to peers." );
-    else if( dd->busyCount == 0 )
+    else if( busyCount == 0 )
         secondary_text = NULL;
     else