Changeset 11546

Timestamp:

Dec 19, 2010, 9:33:02 AM (12 years ago)

Author:

charles

Message:

(trunk gtk) #3838 "Unselected active torrents not counted for quit check" -- fixed.

Location:

trunk/gtk

Files:

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

trunk/gtk/main.c

@@ -340 +340 @@
 
     {
-        const int total = tr_core_get_torrent_count( data->core );
-        const int active = tr_core_get_active_torrent_count( data->core );
+        const size_t total = tr_core_get_torrent_count( data->core );
+        const size_t active = tr_core_get_active_torrent_count( data->core );
         action_sensitize( "pause-all-torrents", active != 0 );
         action_sensitize( "start-all-torrents", active != total );
@@ -965 +965 @@
 shouldConfirmBeforeExiting( struct cbdata * data )
 {
-    if( !pref_flag_get( PREF_KEY_ASKQUIT ) )
-        return FALSE;
-    else {
-        struct counts_data counts;
-        getTorrentCounts( data, &counts );
-        return counts.activeCount > 0;
-    }
+    return pref_flag_get( PREF_KEY_ASKQUIT )
+        && tr_core_get_active_torrent_count( data->core );
 }
 

trunk/gtk/tr-core.c

@@ -1762 +1762 @@
 }
 
-int
+size_t
 tr_core_get_torrent_count( TrCore * core )
 {
@@ -1768 +1768 @@
 }
 
-int
+size_t
 tr_core_get_active_torrent_count( TrCore * core )
 {
     GtkTreeIter iter;
     GtkTreeModel * model = tr_core_model( core );
-    int activeCount = 0;
+    size_t activeCount = 0;
 
     if( gtk_tree_model_get_iter_first( model, &iter ) ) do

trunk/gtk/tr-core.h

@@ -84 +84 @@
 tr_session *   tr_core_session( TrCore * self );
 
-int            tr_core_get_active_torrent_count( TrCore * self );
-
-int            tr_core_get_torrent_count( TrCore * self );
+size_t         tr_core_get_active_torrent_count( TrCore * self );
+
+size_t         tr_core_get_torrent_count( TrCore * self );
 
 /******